From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
index be23d1c..3bd431b 100644
--- a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -5,7 +5,7 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.DeviceAdjustValue">
<id column="id" property="id" />
- <result column="device_id" property="deviceId" />
+ <result column="mac" property="mac" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
<result column="sensor_code" property="sensorCode" />
@@ -15,4 +15,44 @@
<result column="is_delete" property="isDelete" />
</resultMap>
+ <sql id="Base_Column_List">
+ das.id,das.mac,das.start_time,das.end_time,das.sensor_code,das.value,das.create_time,das.update_time,das.is_delete
+ </sql>
+
+ <update id="updateDeviceAdjustValue" parameterType="java.util.Map">
+ update device_adjust_value
+ <set>
+ <if test="mac != null">
+ name = #{mac},
+ </if>
+ <if test="start_time != null">
+ start_time = #{start_time},
+ </if>
+ <if test="end_time != null">
+ end_time = #{end_time},
+ </if>
+ <if test="value != null">
+ value = #{value},
+ </if>
+ <if test="is_delete != null">
+ is_delete = #{is_delete},
+ </if>
+ </set>
+ 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
+ order by de.dev_num,de.id
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0