From 61161b5b9f5b07e83dab7d5c03ae9ce9766bb663 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 11 Jun 2021 11:41:08 +0800
Subject: [PATCH] screen-manage 根据型号id获取因子添加code字段
---
screen-manage/src/main/resources/mapper/VersionMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index bf5d5e5..44aad20 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -22,26 +22,28 @@
<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="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
+ 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
- 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