From 40f6aa11c2899ea8c13c7cf66bc1981bdd7d141a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 25 May 2021 13:51:50 +0800
Subject: [PATCH] screen-manage 更改数据库连接地址
---
screen-manage/src/main/resources/mapper/VersionMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index bf5d5e5..b8f5a8b 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -25,23 +25,25 @@
<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
+ LEFT JOIN
version_sensor_unit vsu
ON
v.`id` = vsu.`version_id` AND vsu.`is_delete` = 0
- JOIN
+ LEFT JOIN
sensor s
ON
s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
- JOIN
+ LEFT JOIN
(
SELECT
sdd.datakey,sdd.dataValue,sdd.is_delete
--
Gitblit v1.8.0