From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java | 5 -
/dev/null | 26 --------
screen-manage/src/main/java/com/moral/api/controller/SystemController.java | 22 +------
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java | 32 +++++-----
screen-manage/src/main/java/com/moral/api/controller/SysDictController.java | 23 +------
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 6 --
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 1
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 8 +-
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 6 +-
screen-manage/src/main/resources/mapper/VersionMapper.xml | 9 +-
screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java | 4 -
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 6 +-
12 files changed, 39 insertions(+), 109 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java b/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java
index 149c423..f1e9d44 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SysDictController.java
+++ b/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")
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java b/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
index debe6d4..78b959c 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SystemController.java
+++ b/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
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
index c7bf6a6..7d9b70f 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
+++ b/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;
-
}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
index a4432ec..0802b5c 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
+++ b/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;
/**
* ������������
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java
index 3c252c3..4dc4ba7 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/sysDictData/SysDictDataUpdateForm.java
+++ b/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;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
index 81d74c7..85d4ae1 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
+++ b/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;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java
index ae9e4e8..8509cf8 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java
+++ b/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;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataDeleteVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataDeleteVO.java
deleted file mode 100644
index 8719800..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataDeleteVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.moral.api.pojo.vo.sysDictData;
-
-
-import com.moral.api.entity.SysDictData;
-import com.moral.api.pojo.dto.sysDictData.SysDictDataDTO;
-import com.moral.constant.ResponseCodeEnum;
-
-/**
- * @ClassName SysDictDataDeleteVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/4/16 13:46
- * @Version TODO
- **/
-public class SysDictDataDeleteVO extends SysDictDataVO{
-
- public static SysDictDataDeleteVO convert(SysDictDataDTO dto){
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- SysDictDataDeleteVO vo = new SysDictDataDeleteVO();
- SysDictData data = dto.getSysDictData();
- vo.setId(data.getId());
- vo.setKey(data.getDataKey());
- vo.setValue(data.getDataValue());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataInsertVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataInsertVO.java
deleted file mode 100644
index 6e8c7c8..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataInsertVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.moral.api.pojo.vo.sysDictData;
-
-import com.moral.api.entity.SysDictData;
-import com.moral.api.entity.SysDictType;
-import com.moral.api.pojo.dto.sysDictData.SysDictDataDTO;
-import com.moral.constant.ResponseCodeEnum;
-
-/**
- * @ClassName SysDictDataInsertVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/4/16 10:31
- * @Version TODO
- **/
-public class SysDictDataInsertVO extends SysDictDataVO {
-
- public static SysDictDataInsertVO convert(SysDictDataDTO dto){
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- SysDictDataInsertVO vo = new SysDictDataInsertVO();
- SysDictData data = dto.getSysDictData();
- SysDictType type = dto.getSysDictType();
- vo.setId(data.getId());
- vo.setKey(data.getDataKey());
- vo.setValue(data.getDataValue());
- vo.setTypeId(type.getId());
- vo.setTypeName(type.getName());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataUpdateVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataUpdateVO.java
deleted file mode 100644
index a6c9e57..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/sysDictData/SysDictDataUpdateVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.moral.api.pojo.vo.sysDictData;
-
-import com.moral.api.entity.SysDictData;
-import com.moral.api.pojo.dto.sysDictData.SysDictDataDTO;
-import com.moral.constant.ResponseCodeEnum;
-
-/**
- * @ClassName SysDictDataUpdateVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/4/16 11:48
- * @Version TODO
- **/
-public class SysDictDataUpdateVO extends SysDictDataVO{
-
- public static SysDictDataUpdateVO convert(SysDictDataDTO dto){
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- SysDictDataUpdateVO vo = new SysDictDataUpdateVO();
- SysDictData data = dto.getSysDictData();
- vo.setId(data.getId());
- vo.setKey(data.getDataKey());
- vo.setValue(data.getDataValue());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index 8e0b503..0bf6dc0 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/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);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
index 7f49f18..78aaf42 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
+++ b/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
*/
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index 88f87d2..07a42ce 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/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;
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index b8f5a8b..5df3891 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/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
--
Gitblit v1.8.0