From 084da21b87bddb997ab627a4ef1899230a3a293a Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:50:11 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 18 +++++++++++++-----
1 files changed, 13 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 c8b584c..555e65f 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
@@ -74,9 +74,11 @@
/**
* 璁剧疆涓夊厓鐮�
*/
- @PostMapping("/setMac/{baseMac}")
+ @PostMapping("/setMac")
public ResponseVO<Object> setMac(@PathVariable String baseMac) {
+ //public ResponseVO<Object> setMac() {
return ResponseUtil.success(poleService.setMac(baseMac));
+ // return ResponseUtil.success(poleService.setMac());
}
/**
@@ -102,19 +104,25 @@
}
@PostMapping("/listStatusByDeviceCode")
- public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList){
- for (String s: deviceCodeList) {
- if(s==null){
+ public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList) {
+ for (String s : deviceCodeList) {
+ if (s == null) {
return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
}
}
- if(ArrayUtil.isEmpty(deviceCodeList)) {
+ if (ArrayUtil.isEmpty(deviceCodeList)) {
return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
}
List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(CollectionUtil.toList(deviceCodeList));
return ResponseUtil.success(statusList);
}
+ @GetMapping("/ClientBindingPole")
+ public ResponseVO<Object> ClientBindingPole(@RequestParam long clientId, @RequestParam int poleId) {
+
+ return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleId));
+ }
+
}
--
Gitblit v1.9.3