From 83e42707519f5e2d886618ea55c30e8c3ab381ac Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 09 Aug 2023 09:13:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
index 9db7b99..255ce4d 100644
--- a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -41,4 +41,17 @@
where id = #{id}
</update>
+ <select id="selectAllAdjust" resultType="com.moral.api.pojo.dto.adjust.AdjustDTO">
+ SELECT de.`name` ,
+ ds.id,
+ de.mac,
+ ds.`value`
+ FROM
+ device AS de
+ LEFT JOIN device_adjust_value AS ds ON ds.mac = de.mac AND ds.sensor_code = #{code} AND ds.is_delete =0
+ WHERE
+ de.monitor_point_id = #{id}
+ AND de.is_delete = 0
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0