From a0d2c6cd651c547fd07fb3639a23ca700d3b2091 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 17:03:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 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 4da3f81..9bd92c3 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
@@ -14,10 +14,12 @@
import com.sandu.ximon.admin.dto.DeviceStatusDto;
import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.security.PermissionConfig;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.admin.service.IpVolumeService;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -118,6 +120,7 @@
/**
* 鍦ㄧ嚎鏁伴噺
*/
+// @AnonymousAccess
@GetMapping("/online")
public ResponseVO<Object> online() {
return ResponseUtil.success(poleService.poleCount());
@@ -295,9 +298,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");
@@ -386,7 +389,7 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌璇虹摝
*/
- @GetMapping("/pushAidDataToNova")
+ @PostMapping("/pushAidDataToNova")
public ResponseVO<Object> pushAirDataToNova(@RequestBody @Validated PushAirDataToNovaParam param) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_NOVA.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
@@ -394,7 +397,12 @@
if (param.getDuration() <= 0 || param.getDuration() > 86400000) {
throw new BusinessException("鎾斁鏃堕棿闇�澶т簬闆朵笖灏忎簬86400000 !");
}
- return ResponseUtil.success(poleService.pushAirDataToNova(param));
+ VnnoxResult vnnoxResult = poleService.pushAirDataToNova(param);
+ if (vnnoxResult.getSuccess().size() != 0) {
+ return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
+ } else {
+ return ResponseUtil.fail("鎺ㄩ�佸け璐�");
+ }
}
/**
@@ -408,4 +416,12 @@
return ResponseUtil.success(poleService.pushAirDataToXiXun(poleId));
}
+
+ @AnonymousAccess
+ @PostMapping("/setRedis")
+ public ResponseVO<Object> pushAirDataToXiXun() {
+ poleService.setRedis();
+ return ResponseUtil.success("鏇存柊鐘舵�佸畬鎴�");
+ }
+
}
--
Gitblit v1.9.3