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/java/com/yuanchu/mom/service/DeviceService.java | 6 ++++++
base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 6 ++++++
base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 3 +++
base-server/src/main/resources/mapper/DeviceMapper.xml | 19 +++++++++++++++++--
base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 6 ++++++
5 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index eea7575..50e5980 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -66,6 +66,12 @@
return Result.success(maps);
}
+ @ApiOperation(value = "鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�")
+ @GetMapping("/list_group")
+ public Result<?> listGroup() {
+ return Result.success(deviceService.listGroup());
+ }
+
@ApiOperation(value = "鏂板浠櫒璁惧")
@PostMapping("/add")
public Result<?> addDevice(@RequestBody DeviceDto deviceDto) {
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 2451288..d45d152 100644
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -34,4 +34,7 @@
//鍘熸潗鏂欐楠�-->閫夋嫨璁惧
List<Map<String, Object>> chooseDevice();
+ //鏂板--閫夋嫨璁惧缁�
+ List<String> listGroup();
+
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 9508727..ee9c1cc 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -71,4 +71,10 @@
* @return
*/
List<Map<String,Object>> chooseDevice();
+
+ /**
+ * 鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�
+ * @return
+ */
+ List<String> listGroup();
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index ee1d437..40841f0 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -83,4 +83,10 @@
public List<Map<String, Object>> chooseDevice() {
return deviceMapper.chooseDevice();
}
+
+ //鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�
+ @Override
+ public List<String> listGroup() {
+ return deviceMapper.listGroup();
+ }
}
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