From f0c2d7252b960e5224de90d554b0f5a8d2ee50bb Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 28 Aug 2020 11:13:40 +0800 Subject: [PATCH] 1.增加最后一次扣费后,将诊断id写入redis 2.注册的时候,职称转换后超过50位长度自动截断 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java | 61 +++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 11 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java index 7b5ad28..56ef37f 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDictionariesServiceImpl.java @@ -1,18 +1,20 @@ package com.kidgrow.usercenter.service.impl; -import org.springframework.stereotype.Service; -import com.kidgrow.common.model.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kidgrow.common.model.PageResult; +import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.service.impl.SuperServiceImpl; - -import java.util.List; -import java.util.Map; -import org.apache.commons.collections4.MapUtils; -import lombok.extern.slf4j.Slf4j; - -import com.kidgrow.usercenter.model.SysDictionaries; import com.kidgrow.usercenter.mapper.SysDictionariesMapper; +import com.kidgrow.usercenter.model.SysDictionaries; import com.kidgrow.usercenter.service.ISysDictionariesService; +import com.kidgrow.usercenter.vo.SysDictionariesVo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.cglib.beans.BeanCopier; +import org.springframework.stereotype.Service; + +import java.util.*; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -31,10 +33,26 @@ * @return */ @Override - public PageResult<SysDictionaries> findList(Map<String, Object> params){ + public PageResult findList(Map<String, Object> params){ Page<SysDictionaries> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); List<SysDictionaries> list = baseMapper.findList(page, params); - return PageResult.<SysDictionaries>builder().data(list).code(0).count(page.getTotal()).build(); + List<SysDictionariesVo> listvo = new ArrayList<>(); + for (SysDictionaries dictionaries:list + ) { + SysDictionariesVo sysDictionariesVo=new SysDictionariesVo(); + BeanCopier beanCopier = BeanCopier.create(SysDictionaries.class, SysDictionariesVo.class, false); + beanCopier.copy(dictionaries,sysDictionariesVo,null); + if(StringUtils.isNotBlank(dictionaries.getDictionariesClassId())){ + Map<String, Object> paramsTemp=new HashMap<>(); + paramsTemp.put("dictionaries_key",dictionaries.getDictionariesClassId()); + List<SysDictionaries> dicList = baseMapper.selectByMap(paramsTemp); + if(dicList!=null&&dicList.size()>0){ + sysDictionariesVo.setDictionariesClassName(dicList.get(0).getDictionariesName()); + } + } + listvo.add(sysDictionariesVo); + } + return PageResult.<SysDictionariesVo>builder().data(listvo).code(0).count(page.getTotal()).build(); } /** @@ -46,4 +64,25 @@ public SysDictionaries findByObject(SysDictionaries sysDictionaries){ return baseMapper.findByObject(sysDictionaries); } + + @Override + public ResultBody updateEnabled(Map<String, Object> params) { + Long id = MapUtils.getLong(params, "id"); + SysDictionaries dictionaries = baseMapper.selectById(id); + if(dictionaries!=null){ + Integer enabled = MapUtils.getInteger( params,"enabled"); + dictionaries.setEnabled(enabled); + dictionaries.setUpdateTime(new Date()); + int i = baseMapper.updateById(dictionaries); + return ResultBody.ok(0,"更新成功"); + }else { + return ResultBody.failed("更新成功"); + } + + } + + @Override + public List<SysDictionaries> findAll(Map<String, Object> params) { + return baseMapper.findAll(params); + } } -- Gitblit v1.8.0