From 8cff320349e232e3f27820d8d8c4c33a3f0fe17c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 02 三月 2022 18:24:50 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 9 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 555e65f..d6cf828 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
@@ -10,16 +10,21 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
+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.service.AirEquipmentService;
+import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.dao.domain.Pole;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotEmpty;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 鐏潌妯″潡浠ュ強璁剧疆鍒嗙粍鍒板搴旂伅鏉�
@@ -32,6 +37,8 @@
public class PoleController {
private final PoleService poleService;
+ private MonitorService monitorService;
+ private AirEquipmentService airEquipmentService;
@PostMapping("/add")
public ResponseVO<Object> addPole(@RequestBody @Validated PoleParam param) {
@@ -62,7 +69,7 @@
return ResponseUtil.successPage(list);
}
- @GetMapping("listPoleAndState")
+ @GetMapping("/listPoleAndState")
public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -74,11 +81,11 @@
/**
* 璁剧疆涓夊厓鐮�
*/
- @PostMapping("/setMac")
+ @PostMapping("/setMac/{baseMac}")
public ResponseVO<Object> setMac(@PathVariable String baseMac) {
- //public ResponseVO<Object> setMac() {
+ //public ResponseVO<Object> setMac() {
return ResponseUtil.success(poleService.setMac(baseMac));
- // return ResponseUtil.success(poleService.setMac());
+ // return ResponseUtil.success(poleService.setMac());
}
/**
@@ -89,7 +96,7 @@
return ResponseUtil.success(poleService.poleReset(poleId));
}
-
+//TODO 璁惧鐨勭粦瀹氳В缁戦兘瑕佸崟鐙噸鏂板鐞�
/**
* 鐏潌缁戝畾璁惧
*/
@@ -97,9 +104,76 @@
public ResponseVO<Object> bindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
boolean result = poleService.bindPole(poleId, param);
if (result) {
+ //璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�
+ switch (param.getDeviceType()) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ break;
+ case 3:
+ break;
+ case 4:
+ break;
+ case 5:
+ break;
+ case 6:
+ break;
+ case 7:
+ monitorService.updateBingdingState(true, param.getDeviceCode());
+ break;
+ case 8:
+ break;
+ case 9:
+ break;
+ default:
+ break;
+ }
+
return ResponseUtil.success("缁戝畾鎴愬姛");
} else {
return ResponseUtil.fail("缁戝畾澶辫触");
+ }
+ }
+
+ /**
+ * 鐏潌缁戝畾璁惧
+ */
+ @PostMapping("/unBind/{poleId}")
+ public ResponseVO<Object> unBindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
+ boolean result = poleService.unBindPole(param.getDeviceCode());
+ if (result) {
+ //璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�
+ switch (param.getDeviceType()) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ break;
+ case 3:
+ break;
+ case 4:
+ break;
+ case 5:
+ break;
+ case 6:
+ break;
+ case 7:
+ monitorService.updateBingdingState(false, param.getDeviceCode());
+ break;
+ case 8:
+ break;
+ case 9:
+ break;
+ default:
+ break;
+ }
+
+ return ResponseUtil.success("瑙ｇ粦鎴愬姛");
+ } else {
+ return ResponseUtil.fail("瑙ｇ粦澶辫触");
}
}
@@ -118,10 +192,9 @@
return ResponseUtil.success(statusList);
}
- @GetMapping("/ClientBindingPole")
- public ResponseVO<Object> ClientBindingPole(@RequestParam long clientId, @RequestParam int poleId) {
-
- return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleId));
+ @PostMapping("/ClientBindingPole")
+ public ResponseVO<Object> ClientBindingPole(@RequestBody PoleBindParam param) {
+ return ResponseUtil.success(poleService.ClientBindingPole(param.getClientId(), param.getPoleIds()));//////////////
}
--
Gitblit v1.9.3