From ea81424035cc84d97cd114b82918bcbda73d7460 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:41:38 +0800
Subject: [PATCH] screen-manage 型号查询功能完善
---
screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java | 4 ++++
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 6 ++++++
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 2 ++
screen-manage/src/main/resources/mapper/VersionMapper.xml | 4 +++-
4 files changed, 15 insertions(+), 1 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 9a16d4d..4f895ba 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,4 +84,10 @@
@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/pojo/vo/Version/VersionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
index 1bc7352..4840368 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,6 +89,8 @@
vo.setName(sensor.getName());
vo.setCode(sensor.getCode());
vo.setUnit(sensor.getUnit());
+ vo.setMaxValue(sensor.getMaxValue());
+ vo.setMinValue(sensor.getMinValue());
vo.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 ad550c1..ae9e4e8 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
@@ -31,4 +31,8 @@
private String unitKey;
+ private Integer maxValue;
+
+ private Integer minValue;
+
}
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index bf5d5e5..78ec004 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -25,12 +25,14 @@
<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>
</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
+ 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`
FROM
`version` v
JOIN
--
Gitblit v1.8.0