From ad5903565064f5262282a5b9d7b8bff657874022 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 07 九月 2023 16:57:58 +0800
Subject: [PATCH] 修改bug2.0  9.7

---
 base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

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 b4e582b..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
@@ -40,19 +40,6 @@
         return deviceMapper.selectTreeDevice(type, father, deviceStatus, message);
     }
 
-    //鏌ヨ鎵�鏈夎澶�
-    @Override
-    public List<Device> selectDevice() {
-        return deviceMapper.selectList(new QueryWrapper<>());
-    }
-
-    //鏍规嵁璁惧id鑾峰彇璁惧鍚嶇О
-    @Override
-    public String getDeviceNameById(Integer id) {
-        Device device = deviceMapper.selectById(id);
-        return device.getName();
-    }
-
     //鏂板浠櫒璁惧
     @Override
     public Integer addDevice(DeviceDto deviceDto) {
@@ -90,4 +77,16 @@
     public void delAllDevice(String ids) {
         deviceMapper.delAllDevice(ids);
     }
+
+    //鍘熸潗鏂欐楠�-->閫夋嫨璁惧
+    @Override
+    public List<Map<String, Object>> chooseDevice() {
+        return deviceMapper.chooseDevice();
+    }
+
+    //鏂板浠櫒璁惧锛氳澶囩粍涓嬫媺妗�
+    @Override
+    public List<String> listGroup() {
+        return deviceMapper.listGroup();
+    }
 }

--
Gitblit v1.9.3