From ab9a92d2e54d1fbc8da41f0850987b973985b45e Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Thu, 25 May 2023 10:45:31 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-25=2010:41:18=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/psdc/service/IPsdcDeviceService.java  |  3 +++
 .../psdc/service/impl/PsdcDeviceServiceImpl.java   |  5 +++++
 .../controller/manager/PsdcDeviceController.java   | 14 ++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java
index 3c9b91a..4cf6224 100644
--- a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java
+++ b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java
@@ -26,6 +26,9 @@ public interface IPsdcDeviceService {
 
     List<PsdcDevice> queryByModel(String model);
 
+    List<PsdcDevice> selalldevModel();
+
+
     /**
      * 查询所有设备状态
      * @return
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
index e7495c8..63f3c3f 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
@@ -69,6 +69,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
         return psdcDeviceMapper.queryByModel(SecurityUtils.getUserId(), model);
     }
 
+    @Override
+    public List<PsdcDevice> selalldevModel() {
+        return psdcDeviceMapper.queryByUserId(null, null);
+    }
+
     public List<DeviceStatusVo> queryDeviceStatus() {
         List<PsdcDevice> psdcDevices = psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), 0);
         return psdcDevices.stream().map(psdcDevice -> {
diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java
index 9ea4bd9..af0c45a 100644
--- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java
@@ -90,6 +90,20 @@ public class PsdcDeviceController extends BaseController {
         return AjaxResult.success("用户下拉列表", maps);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:device:list')")
+    @RequestMapping(value = "/selmodels", method = RequestMethod.GET)
+    public AjaxResult selAllModels()  {
+        List<Map> maps = new ArrayList<>();
+        List<PsdcDevice> list = psdcDeviceService.selalldevModel();
+        for (PsdcDevice dd : list){
+            Map<String, Object> map = new HashMap<>();
+            map.put("label", dd.getDeviceModel());
+            map.put("value", dd.getDeviceModel());
+            maps.add(map);
+        }
+        return AjaxResult.success("模型下拉列表", maps);
+    }
+
     @PreAuthorize("@ss.hasPermi('system:device:list')")
     @RequestMapping(value = "/devicesList", method = RequestMethod.POST)
     public TableDataInfo controlLogList(@RequestBody JSONObject jsonObject) {