From 516a56260c86e1b78f13d3889f4f37cfe67d555c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 16 三月 2024 08:48:29 +0800
Subject: [PATCH] 增加通道查询列表排序 增加按范围多边形查井
---
ard-work/src/main/resources/mapper/device/ArdChannelMapper.xml | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdChannelMapper.xml b/ard-work/src/main/resources/mapper/device/ArdChannelMapper.xml
index 333dbe6..dbac841 100644
--- a/ard-work/src/main/resources/mapper/device/ArdChannelMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdChannelMapper.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.channel.mapper.ArdChannelMapper">
-
+
<resultMap type="ArdChannel" id="ArdChannelResult">
- <result property="id" column="id" />
- <result property="name" column="name" />
- <result property="chanNo" column="chan_no" />
- <result property="deviceId" column="device_id" />
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="chanNo" column="chan_no"/>
+ <result property="deviceId" column="device_id"/>
</resultMap>
<sql id="selectArdChannelVo">
- select id, name, chan_no, device_id from ard_channel
+ select id, name, chan_no, device_id
+ from ard_channel
</sql>
<select id="selectArdChannelList" parameterType="ArdChannel" resultMap="ArdChannelResult">
@@ -20,13 +21,14 @@
<where>
<if test="deviceId!=null">device_id=#{deviceId}</if>
</where>
+ order by chan_no
</select>
-
+
<select id="selectArdChannelById" parameterType="String" resultMap="ArdChannelResult">
<include refid="selectArdChannelVo"/>
where id = #{id}
</select>
-
+
<insert id="insertArdChannel" parameterType="ArdChannel">
insert into ard_channel
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -34,13 +36,13 @@
<if test="name != null">name,</if>
<if test="chanNo != null">chan_no,</if>
<if test="deviceId != null">device_id,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="chanNo != null">#{chanNo},</if>
<if test="deviceId != null">#{deviceId},</if>
- </trim>
+ </trim>
</insert>
<update id="updateArdChannel" parameterType="ArdChannel">
@@ -54,16 +56,20 @@
</update>
<delete id="deleteArdChannelById" parameterType="String">
- delete from ard_channel where id = #{id}
+ delete
+ from ard_channel
+ where id = #{id}
</delete>
<delete id="deleteArdChannelByIds" parameterType="String">
- delete from ard_channel where id in
+ delete from ard_channel where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteArdChannelByDeviceId" parameterType="String">
- delete from ard_channel where device_id = #{deviceId}
+ delete
+ from ard_channel
+ where device_id = #{deviceId}
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3