From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据
---
screen-manage/src/main/resources/mapper/VersionMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index 5df3891..4d76182 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -23,6 +23,7 @@
<id property="id" column="sid"></id>
<result property="name" column="sname"></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>
@@ -31,7 +32,7 @@
<select id="queryVersionsAndSensorUnitByIds" resultMap="VersionSensorUnitMap">
SELECT
- 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
+ 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
@@ -41,7 +42,7 @@
LEFT JOIN
sensor s
ON
- s.`id` = vsu.`sensor_id` AND s.`is_delete` = 0
+ s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
LEFT JOIN
(
SELECT
--
Gitblit v1.8.0