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/resources/mapper/VersionMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
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