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
@@ -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/vo/Version/VersionQueryVO.java
@@ -89,8 +89,8 @@ vo.setName(sensor.getName()); 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/resources/mapper/VersionMapper.xml
@@ -24,14 +24,14 @@ <result property="name" column="sname"></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.`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
