From 81d00b6d3079d721b8c0d2ffa6ef51c10a433eae Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 18 二月 2022 18:09:21 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 f2b7920..e83dc7b 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
@@ -62,9 +62,10 @@
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());
+
List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
return ResponseUtil.successPage(poles);
}
@@ -75,7 +76,9 @@
*/
@PostMapping("/setMac/{baseMac}")
public ResponseVO<Object> setMac(@PathVariable String baseMac) {
+ //public ResponseVO<Object> setMac() {
return ResponseUtil.success(poleService.setMac(baseMac));
+ // return ResponseUtil.success(poleService.setMac());
}
/**
@@ -101,13 +104,25 @@
}
@PostMapping("/listStatusByDeviceCode")
- public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList){
- if(ArrayUtil.isEmpty(deviceCodeList)) {
+ public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList) {
+ for (String s : deviceCodeList) {
+ if (s == null) {
+ return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ }
+ if (ArrayUtil.isEmpty(deviceCodeList)) {
return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
}
List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(CollectionUtil.toList(deviceCodeList));
return ResponseUtil.success(statusList);
}
+ @PostMapping("/ClientBindingPole")
+ public ResponseVO<Object> ClientBindingPole(@RequestBody long clientId, @RequestBody int[] poleIds) {
+
+ return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleIds));//////////////
+ }
+
}
--
Gitblit v1.9.3