From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/resources/mapper/SensorMapper.xml | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/SensorMapper.xml b/screen-manage/src/main/resources/mapper/SensorMapper.xml
index a5ec44d..772c1f1 100644
--- a/screen-manage/src/main/resources/mapper/SensorMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SensorMapper.xml
@@ -6,18 +6,18 @@
<resultMap id="BaseResultMap" type="com.moral.api.entity.Sensor">
<id column="id" property="id" />
<result column="name" property="name" />
- <result column="sensor_key" property="sensorKey" />
- <result column="unit" property="unit" />
+ <result column="desc" property="desc" />
+ <result column="code" property="code" />
<result column="upper" property="upper" />
<result column="lower" property="lower" />
+ <result column="default_unit_key" property="defaultUnitKey" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="is_delete" property="isDelete" />
- <result column="desc" property="desc" />
</resultMap>
<sql id="Base_Column_List">
- s.id,s.name,s.sensor_key,s.unit,s.upper,s.lower,s.create_time,s.update_time,s.id_delete,s.desc
+ s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_unit_key,s.create_time,s.update_time,s.is_delete
</sql>
<insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -26,11 +26,11 @@
<if test="name != null">
name,
</if>
- <if test="sensorKey != null">
- sensor_key,
+ <if test="code != null">
+ code,
</if>
- <if test="unit != null">
- unit,
+ <if test="desc != null">
+ `desc`,
</if>
<if test="upper != null">
upper,
@@ -38,19 +38,19 @@
<if test="lower != null">
lower,
</if>
- <if test="desc != null">
- `desc`,
+ <if test="defaultUnitKey != null">
+ default_unit_key,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">
#{name},
</if>
- <if test="sensorKey != null">
- #{sensorKey},
+ <if test="code != null">
+ #{code},
</if>
- <if test="unit != null">
- #{unit},
+ <if test="desc != null">
+ #{desc},
</if>
<if test="upper != null">
#{upper},
@@ -58,10 +58,55 @@
<if test="lower != null">
#{lower},
</if>
- <if test="desc != null">
- #{desc},
+ <if test="defaultUnitKey != null">
+ #{defaultUnitKey},
</if>
</trim>
</insert>
+ <select id="getSensorById" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"></include>
+ from sensor s
+ where s.id = #{id}
+ and s.is_delete = 0
+ </select>
+
+ <update id="updateSensor" parameterType="java.util.Map">
+ update sensor
+ <set>
+ <if test="name != null">
+ name = #{name},
+ </if>
+ <if test="desc != null">
+ `desc` = #{desc},
+ </if>
+ <if test="code != null">
+ code = #{code},
+ </if>
+ <if test="upper != null">
+ <if test="upper == ''">
+ upper = null,
+ </if>
+ <if test="upper != ''">
+ upper = #{upper},
+ </if>
+ </if>
+ <if test="lower != null">
+ <if test="lower == ''">
+ lower = null,
+ </if>
+ <if test="lower != ''">
+ lower = #{lower},
+ </if>
+ </if>
+ <if test="default_unit_key != null">
+ default_unit_key = #{default_unit_key},
+ </if>
+ <if test="isDelete != null">
+ is_delete = #{isDelete},
+ </if>
+ </set>
+ where id = #{id}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0