From d7e7a651810d74e1d0d474090cb9fd78ffd5427b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 09:09:53 +0800
Subject: [PATCH] screen-manage 更新版本获取因子接口以及分配因子接口
---
screen-manage/src/main/resources/mapper/VersionMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index 78ec004..61a7fc0 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -22,7 +22,6 @@
<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>
@@ -32,18 +31,18 @@
<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.`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
+ s.`id` = vsu.`sensor_id` AND s.`is_delete` = 0
+ LEFT JOIN
(
SELECT
sdd.datakey,sdd.dataValue,sdd.is_delete
--
Gitblit v1.8.0