From 3b8f9eaa550172ec455bba3a9c52809f67b2c9ee Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 16:58:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/DeviceMapper.xml | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index e58d369..9509b45 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -50,12 +50,27 @@
</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
+ </select>
<!--鎵归噺鍒犻櫎-->
<update id="delAllDevice">
update mom_ocean.device
--
Gitblit v1.9.3