From a98228c5e829bff75969b51a37652d7dbd6bee7e Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期二, 18 一月 2022 16:24:41 +0800
Subject: [PATCH] 权限管理

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index f2b7920..3a02c8b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -65,6 +65,7 @@
     @GetMapping("listPoleAndState")
     public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
         List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return ResponseUtil.successPage(poles);
     }
@@ -101,13 +102,25 @@
     }
 
     @PostMapping("/listStatusByDeviceCode")
-    public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList){
-        if(ArrayUtil.isEmpty(deviceCodeList)) {
+    public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList) {
+        for (String s : deviceCodeList) {
+            if (s == null) {
+                return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
+            }
+
+        }
+        if (ArrayUtil.isEmpty(deviceCodeList)) {
             return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
         }
         List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(CollectionUtil.toList(deviceCodeList));
         return ResponseUtil.success(statusList);
     }
 
+    @GetMapping("/ClientBindingPole")
+    public ResponseVO<Object> ClientBindingPole(@RequestParam long clientId, @RequestParam int poleId) {
+
+        return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleId));
+    }
+
 
 }

--
Gitblit v1.9.3