From 2611d27616bdbea6331f75a0147bd67c95f2eb0e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 13:56:34 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..eee4acf 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());
@@ -222,7 +223,7 @@
if (!permissionConfig.check(MenuEnum.UNBIND.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = poleService.unBindPole(poleId, param.getDeviceCode());
+ boolean result = poleService.unBindPole(poleId, param.getDeviceCode(), param.getDeviceType());
if (result) {
//璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�, 10鐔欒, 11鍐滆��
switch (param.getDeviceType().toString()) {
@@ -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().isEmpty()) {
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