From 4784ba9b5fe0d2c9ada694834ac6b0d0b7474b89 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 12 Aug 2021 15:52:23 +0800
Subject: [PATCH] special_device、special_device_history相关文件，special_device查询接口
---
screen-manage/src/main/resources/mapper/VersionMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index b8f5a8b..4d76182 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -22,17 +22,17 @@
<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="code" column="code"></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 ,s.`code`,u.dataKey,u.dataValue,vsu.`upper` AS vupper ,vsu.`lower` AS vlower
FROM
`version` v
LEFT JOIN
--
Gitblit v1.8.0