From 2dbc49184bd74845c8da694c20d6fd03d7ac87e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 九月 2023 16:16:21 +0800
Subject: [PATCH] 修改 9.21
---
base-server/src/main/resources/mapper/DeviceMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index e58d369..f8f6a0e 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -8,7 +8,7 @@
WHERE d.state = 1
AND d.type = #{type}
<if test="search_class !=null and search_class != ''">
- AND d.`name` like concat('%',#{search_class},'%')
+ AND d.`father` like concat('%',#{search_class},'%')
</if>
</select>
<!--鏌ヨ璁惧缁存姢 鍙充晶鍒楄〃灞曠ず璇ヨ澶囩粍涓嬬殑鎵�鏈夎澶�-->
@@ -30,7 +30,7 @@
</if>
<if test="message!=null and message!=''">
and code like concat('%',#{message},'%')
- or name like concat('%',#{message},'%')
+ and device.name like concat('%',#{message},'%')
</if>
</select>
<!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
@@ -41,20 +41,38 @@
and father = #{deviceGroup}
and device_status in (1, 5)
</select>
- <!--閫夋嫨璁惧缁�-->
+ <!--閫夋嫨鐢熶骇璁惧缁�-->
<select id="chooseDevGroup" resultType="java.util.Map">
select distinct father
from mom_ocean.device
where state = 1
and device_status in (1, 5)
+ and type = 1
</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)
+ and type = 2
+ </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">
--
Gitblit v1.9.3