kaiyu
2021-05-27 044418513c4c1a838ad2f22684d6b7d0e6c50f00
screen-manage
修改字典数据更新逻辑
3 files deleted
3 files modified
115 ■■■■■ changed files
screen-manage/src/main/java/com/moral/api/controller/SysDictController.java 18 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java 4 ●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataDeleteVO.java 27 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataInsertVO.java 30 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataUpdateVO.java 26 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/SysDictController.java
@@ -9,9 +9,6 @@
import com.moral.api.pojo.form.sysDictType.SysDictTypeDeleteForm;
import com.moral.api.pojo.form.sysDictType.SysDictTypeInsertForm;
import com.moral.api.pojo.form.sysDictType.SysDictTypeUpdateForm;
import com.moral.api.pojo.vo.sysDictData.SysDictDataDeleteVO;
import com.moral.api.pojo.vo.sysDictData.SysDictDataInsertVO;
import com.moral.api.pojo.vo.sysDictData.SysDictDataUpdateVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeDeleteVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeInsertVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeQueryVO;
@@ -71,10 +68,7 @@
        //处理插入业务
        SysDictDataDTO dto = sysDictDataService.insertData(form);
        //转换前端所需参数
        SysDictDataInsertVO vo = SysDictDataInsertVO.convert(dto);
        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }
    @PostMapping("data/update")
@@ -87,10 +81,7 @@
        //处理更新业务
        SysDictDataDTO dto = sysDictDataService.updateData(form);
        //转换前端所需参数
        SysDictDataUpdateVO vo = SysDictDataUpdateVO.convert(dto);
        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }
    @PostMapping("data/delete")
@@ -103,10 +94,7 @@
        //处理删除业务
        SysDictDataDTO dto = sysDictDataService.deleteData(form);
        //转换前端所需参数
        SysDictDataDeleteVO vo = SysDictDataDeleteVO.convert(dto);
        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }
    @GetMapping("type/query")
screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java
@@ -21,9 +21,7 @@
    private String value;
    public boolean valid() {
        if (ObjectUtils.isEmpty(id) ||
                ObjectUtils.isEmpty(key) ||
                ObjectUtils.isEmpty(value))
        if (ObjectUtils.isEmpty(id))
            return false;
        return true;
    }
screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataDeleteVO.java
File was deleted
screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataInsertVO.java
File was deleted
screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataUpdateVO.java
File was deleted
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
@@ -51,7 +51,7 @@
        SysDictDataDTO dto = new SysDictDataDTO();
        //取参
        Integer id = form.getId();
        //判断是否存在
        //查询要删除的数据,用于插入日志
        QueryWrapper existWrapper = new QueryWrapper();
        existWrapper.eq("is_delete", Constants.NOT_DELETE);
        existWrapper.eq("id", id);
@@ -64,7 +64,6 @@
        //删除缓存
        CacheUtils.clearDictionariesCache();
        //封装返回对象
        dto.setSysDictData(existData);
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
@@ -82,6 +81,7 @@
        SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
        //判断key是否重复
        String key = sysDictData.getDataKey();
        if (!ObjectUtils.isEmpty(key)) {
        QueryWrapper<SysDictData> wrapper = new QueryWrapper<>();
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.eq("dataKey", key);
@@ -92,12 +92,12 @@
            dto.setMsg(ResponseCodeEnum.DICTDATA_KEY_EXIST.getMsg());
            return dto;
        }
        }
        //执行更新
        sysDictDataMapper.updateById(sysDictData);
        //清除缓存
        CacheUtils.clearDictionariesCache();
        //封装返回结果
        dto.setSysDictData(sysDictData);
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
@@ -115,7 +115,7 @@
        SysDictDataDTO dto = new SysDictDataDTO();
        //取参
        SysDictData sysDictData = form.formConvertEntity();
        //判断类型是否存在
        //取出类型用于插入日志使用
        SysDictType type = sysDictTypeService.getDictTypeById(sysDictData.getDictTypeId());
        if (ObjectUtils.isEmpty(type)) {
            dto.setCode(ResponseCodeEnum.DICTTYPE_NOT_EXIST.getCode());
@@ -139,8 +139,6 @@
        //清除缓存
        CacheUtils.clearDictionariesCache();
        //封装返回结果
        dto.setSysDictData(sysDictData);
        dto.setSysDictType(type);
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;