From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 21a7f9e..d03f491 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
@@ -119,6 +119,7 @@
     /**
      * 鍦ㄧ嚎鏁伴噺
      */
+//    @AnonymousAccess
     @GetMapping("/online")
     public ResponseVO<Object> online() {
         return ResponseUtil.success(poleService.poleCount());
@@ -296,9 +297,9 @@
     @AnonymousAccess
     @PostMapping("/isRegisterByCode")
     public ResponseVO<Object> getStatusByCode() {
-/*//        if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
-//            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-//        }*/
+        if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         ArrayList<String> deviceCodeList = new ArrayList<>();
         deviceCodeList.add("baseDevice01");
         deviceCodeList.add("baseDevice02");
@@ -396,7 +397,7 @@
             throw new BusinessException("鎾斁鏃堕棿闇�澶т簬闆朵笖灏忎簬86400000 !");
         }
         VnnoxResult vnnoxResult = poleService.pushAirDataToNova(param);
-        if (vnnoxResult.getSuccess().size() != 0) {
+        if (vnnoxResult == null && vnnoxResult.getSuccess() != null && vnnoxResult.getSuccess().size() != 0) {
             return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
         } else {
             return ResponseUtil.fail("鎺ㄩ�佸け璐�");
@@ -414,4 +415,12 @@
         return ResponseUtil.success(poleService.pushAirDataToXiXun(poleId));
     }
 
+
+    @AnonymousAccess
+    @PostMapping("/setRedis")
+    public ResponseVO<Object> pushAirDataToXiXun() {
+        poleService.setRedis();
+        return ResponseUtil.success("鏇存柊鐘舵�佸畬鎴�");
+    }
+
 }

--
Gitblit v1.9.3