From 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/DeviceMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/DeviceMapper.xml b/standard-server/src/main/resources/mapper/DeviceMapper.xml
index 38e63fd..af9dd90 100644
--- a/standard-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/standard-server/src/main/resources/mapper/DeviceMapper.xml
@@ -59,7 +59,14 @@
<select id="getDeviceNameByGroup" resultType="java.util.Map">
select id, name
from mom_ocean.device
- where state=1
- and father=#{deviceGroup}
+ where state = 1
+ 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)
</select>
</mapper>
--
Gitblit v1.9.3