From 2c210559d8a1664129cfc8b05c89691f091224a4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 11:21:36 +0800
Subject: [PATCH] screen-manage 更新查询型号接口
---
screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java | 5 ++---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 6 ------
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 4 ++--
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 4 ++--
screen-manage/src/main/resources/mapper/VersionMapper.xml | 6 +++---
5 files changed, 9 insertions(+), 16 deletions(-)
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 52e0374..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
@@ -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/vo/Version/VersionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
index 6e93009..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
@@ -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;
}
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/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index 61a7fc0..5df3891 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/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
--
Gitblit v1.8.0