From cbf4b74927fe51c19c307d89b326ae999cb6a165 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 九月 2023 17:50:25 +0800
Subject: [PATCH] 修改 9.12
---
base-server/src/main/resources/mapper/DeviceMapper.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index e58d369..166307e 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -30,7 +30,7 @@
</if>
<if test="message!=null and message!=''">
and code like concat('%',#{message},'%')
- or name like concat('%',#{message},'%')
+ or device.name like concat('%',#{message},'%')
</if>
</select>
<!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
@@ -50,12 +50,28 @@
</select>
<!--鍘熸潗鏂欐楠�-閫夋嫨璁惧-->
- <select id="chooseDevice" resultType="java.util.Map">
- select id, name
+ <resultMap id="oneMap" type="map">
+ <result property="name" column="father"/>
+ <collection property="children" resultMap="twoMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="twoMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ </resultMap>
+ <select id="chooseDevice" resultMap="oneMap">
+ select id, father, name
from mom_ocean.device
where state = 1
and device_status in (1, 5)
</select>
+
+ <!--鏂板閫夋嫨璁惧缁�-->
+ <select id="listGroup" resultType="java.lang.String">
+ select distinct father
+ from mom_ocean.device
+ where state = 1
+ and type = #{type}
+ </select>
<!--鎵归噺鍒犻櫎-->
<update id="delAllDevice">
update mom_ocean.device
--
Gitblit v1.9.3