From 727a69f859060093e685582fa10e5de82dcc138a Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:37:49 +0800
Subject: [PATCH] 放假备份。完成集中控制器对接。
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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 823041d..60a29fa 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
@@ -6,20 +6,19 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.dto.DeviceStatusDto;
-import com.sandu.ximon.admin.param.PoleBindParam;
-import com.sandu.ximon.admin.param.PoleBindingParam;
-import com.sandu.ximon.admin.param.PoleParam;
-import com.sandu.ximon.admin.param.PoleStatesParam;
+import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.security.PermissionConfig;
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;
@@ -63,12 +62,12 @@
return ResponseUtil.success(poleService.updatePole(poleId, param));
}
- @PostMapping("/delete/{poleId}")
- public ResponseVO<Object> deletePole(@PathVariable Long poleId) {
+ @PostMapping("/delete")
+ public ResponseVO<Object> deletePole(@RequestBody List<Long> poleIds) {
if (!permissionConfig.check(MenuEnum.POLE_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(poleService.deletePole(poleId));
+ return ResponseUtil.success(poleService.deletePole(poleIds));
}
@PostMapping("/listDetail")
@@ -120,6 +119,7 @@
/**
* 鍦ㄧ嚎鏁伴噺
*/
+// @AnonymousAccess
@GetMapping("/online")
public ResponseVO<Object> online() {
return ResponseUtil.success(poleService.poleCount());
@@ -171,9 +171,11 @@
}
boolean result = poleService.bindPole(poleId, param);
if (result) {
- //璁惧绫诲瀷锛�0璺伅锛�1nove锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�, 10鐔欒, 11鍐滆��
+ //璁惧绫诲瀷锛�0璺伅锛�1nove锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�
+ // 9涓�閿晳鍔�, 10鐔欒, 11鍐滆��,12鏈湴璇虹摝锛�13PLC
switch (param.getDeviceType().toString()) {
case PoleBindingEnums.LIGHT:
+ case PoleBindingEnums.PLC:
Pole pole = poleService.getById(poleId);
if (pole != null) {
pole.setPoleName(param.getDeviceName());
@@ -223,7 +225,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()) {
@@ -297,9 +299,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");
@@ -388,12 +390,20 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌璇虹摝
*/
- @GetMapping("/pushAidDataToNova/{poleId}")
- public ResponseVO<Object> pushAirDataToNova(@PathVariable Long poleId) {
+ @PostMapping("/pushAidDataToNova")
+ public ResponseVO<Object> pushAirDataToNova(@RequestBody @Validated PushAirDataToNovaParam param) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_NOVA.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(poleService.pushAirDataToNova(poleId));
+ if (param.getDuration() <= 0 || param.getDuration() > 86400000) {
+ throw new BusinessException("鎾斁鏃堕棿闇�澶т簬闆朵笖灏忎簬86400000 !");
+ }
+ VnnoxResult vnnoxResult = poleService.pushAirDataToNova(param);
+ if (vnnoxResult != null && vnnoxResult.getSuccess() != null && !vnnoxResult.getSuccess().isEmpty()) {
+ return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
+ } else {
+ return ResponseUtil.fail("鎺ㄩ�佸け璐�");
+ }
}
/**
@@ -407,4 +417,12 @@
return ResponseUtil.success(poleService.pushAirDataToXiXun(poleId));
}
+
+ @AnonymousAccess
+ @PostMapping("/setRedis")
+ public ResponseVO<Object> pushAirDataToXiXun() {
+ poleService.setRedis();
+ return ResponseUtil.success("鏇存柊鐘舵�佸畬鎴�");
+ }
+
}
--
Gitblit v1.9.3