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") @@ -131,10 +119,7 @@ //处理插入业务 SysDictTypeDTO dto = sysDictTypeService.insertType(form); //转换前端所需参数 SysDictTypeInsertVO vo = SysDictTypeInsertVO.convert(dto); return new ResultMessage(dto.getCode(), dto.getMsg(), vo); return new ResultMessage(dto.getCode(), dto.getMsg(),null); } @PostMapping("type/update") screen-manage/src/main/java/com/moral/api/controller/SystemController.java
@@ -2,28 +2,12 @@ import com.moral.api.entity.SysArea; import com.moral.api.pojo.dto.manageLog.ManageLogQueryDTO; import com.moral.api.pojo.dto.sysDictData.SysDictDataDTO; import com.moral.api.pojo.dto.sysDictType.SysDictTypeDTO; import com.moral.api.pojo.dto.sysDictType.SysDictTypeQueryDTO; import com.moral.api.pojo.form.sysDictData.SysDictDataDeleteForm; import com.moral.api.pojo.form.sysDictData.SysDictDataInsertForm; import com.moral.api.pojo.form.sysDictData.SysDictDataUpdateForm; 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.form.manageLog.*; 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; import com.moral.api.pojo.vo.sysDictType.SysDictTypeUpdateVO; import com.moral.api.pojo.vo.manageLog.*; import com.moral.api.service.ManageLogService; import com.moral.api.service.SysAreaService; import com.moral.api.service.SysDictDataService; import com.moral.api.service.SysDictTypeService; import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; import lombok.extern.slf4j.Slf4j; @@ -31,7 +15,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; /** * @ClassName SystemController screen-manage/src/main/java/com/moral/api/entity/Sensor.java
@@ -84,10 +84,4 @@ @TableField(exist = false) private String unitKey; @TableField(exist = false) private Integer maxValue; @TableField(exist = false) private Integer minValue; } screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
@@ -36,9 +36,9 @@ private Integer versionId; /** * 因子code * 因子Id */ private String sensorCode; private Integer sensorId; /** * 单位字典key @@ -48,12 +48,12 @@ /* * 上限值 * */ private Integer maxValue; private Double upper; /* * 下限值 * */ private Integer minValue; private Double lower; /** * 创建时间 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/Version/VersionQueryVO.java
@@ -87,10 +87,10 @@ private static SensorVO convertToSensorVO(Sensor sensor) { SensorVO vo = new SensorVO(); vo.setName(sensor.getName()); vo.setCode(sensor.getCode()); vo.setId(sensor.getId()); vo.setUnit(sensor.getUnit()); vo.setMaxValue(sensor.getMaxValue()); vo.setMinValue(sensor.getMinValue()); vo.setUpper(sensor.getUpper()); vo.setLower(sensor.getLower()); vo.setUnitKey(sensor.getUnitKey()); return vo; } screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java
@@ -11,7 +11,6 @@ * @Version TODO **/ @Data @JsonInclude(JsonInclude.Include.NON_EMPTY) public class SensorVO { private Integer id; @@ -31,8 +30,8 @@ private String unitKey; private Integer maxValue; private Double upper; private Integer minValue; private Double lower; } 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/SensorServiceImpl.java
@@ -138,12 +138,12 @@ content = content+"因子名:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";"; } if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){ QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>(); /*QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>(); wrapper_Version.eq("sensor_code",oldSensor.getCode()); wrapper_Version.eq("is_delete","0"); VersionSensorUnit versionSensorUnit = new VersionSensorUnit(); versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString()); versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version); versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);*/ content = content+"编号:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";"; } if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){ @@ -234,7 +234,7 @@ deleteSensor.setIsDelete(Constants.DELETE); sensorMapper.update(deleteSensor,wrapper); QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>(); wrapper_Version.eq("sensor_code",sensor.getCode()); wrapper_Version.eq("sensor_id",sensor.getId()); wrapper_Version.eq("is_delete","0"); VersionSensorUnit versionSensorUnit = new VersionSensorUnit(); versionSensorUnit.setIsDelete(Constants.DELETE); 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,22 +81,23 @@ SysDictData existData = sysDictDataMapper.selectOne(existWrapper); //判断key是否重复 String key = sysDictData.getDataKey(); QueryWrapper<SysDictData> wrapper = new QueryWrapper<>(); wrapper.eq("is_delete", Constants.NOT_DELETE); wrapper.eq("dataKey", key); wrapper.eq("dict_type_id", existData.getDictTypeId()); SysDictData existKeyData = sysDictDataMapper.selectOne(wrapper); if (!ObjectUtils.isEmpty(existKeyData)) { dto.setCode(ResponseCodeEnum.DICTDATA_KEY_EXIST.getCode()); dto.setMsg(ResponseCodeEnum.DICTDATA_KEY_EXIST.getMsg()); return dto; if (!ObjectUtils.isEmpty(key)) { QueryWrapper<SysDictData> wrapper = new QueryWrapper<>(); wrapper.eq("is_delete", Constants.NOT_DELETE); wrapper.eq("dataKey", key); wrapper.eq("dict_type_id", existData.getDictTypeId()); SysDictData existKeyData = sysDictDataMapper.selectOne(wrapper); if (!ObjectUtils.isEmpty(existKeyData)) { dto.setCode(ResponseCodeEnum.DICTDATA_KEY_EXIST.getCode()); 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; @@ -149,7 +147,7 @@ /** * @Description: 根据类型名字查询对应字典的数据 * @Param: [typeName] * @return: java.util.Map<java.lang.String , java.lang.Object> * @return: java.util.Map<java.lang.String , java.lang.Object> * @Author: 陈凯裕 * @Date: 2021/4/16 */ @@ -194,7 +192,7 @@ /** * @Description: 从数据库中根据字典类型读取字典数据，返回Map Key：类型名称 value：数据集合 * @Param: [] * @return: java.util.Map<java.lang.String , java.util.List < com.moral.api.entity.sysDictData>> * @return: java.util.Map<java.lang.String , java.util.List < com.moral.api.entity.sysDictData>> * @Author: 陈凯裕 * @Date: 2021/4/14 */ screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -134,7 +134,6 @@ //清除缓存 CacheUtils.clearDictionariesCache(); //封装返回对象 dto.setSysDictType(sysDictType); dto.setCode(ResponseCodeEnum.SUCCESS.getCode()); dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); return dto; screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -22,17 +22,16 @@ <collection property="sensors" column="id" ofType="com.moral.api.entity.Sensor"> <id property="id" column="sid"></id> <result property="name" column="sname"></result> <result property="code" column="scode"></result> <result property="unitKey" column="dataKey"></result> <result property="unit" column="dataValue"></result> <result property="maxValue" column="max_value"></result> <result property="minValue" column="min_value"></result> <result property="upper" column="vupper"></result> <result property="lower" column="vlower"></result> </collection> </resultMap> <select id="queryVersionsAndSensorUnitByIds" resultMap="VersionSensorUnitMap"> SELECT v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value` v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`upper` AS vupper ,vsu.`lower` AS vlower FROM `version` v LEFT JOIN @@ -42,7 +41,7 @@ LEFT JOIN sensor s ON s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0 s.`id` = vsu.`sensor_id` AND s.`is_delete` = 0 LEFT JOIN ( SELECT
