From 29febf388aa86d87198fe82e4af7eb88567d0d65 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期二, 18 一月 2022 16:59:23 +0800
Subject: [PATCH] 权限管理
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 0285f8c..3a02c8b 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
@@ -49,8 +49,9 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listPole(@RequestParam String keyword) {
- LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class);
+ public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class).orderByDesc(Pole::getId);
if (StrUtil.isNotBlank(keyword)) {
wrapper.like(Pole::getPoleCode, keyword)
.or(lampPostLambdaQueryWrapper -> {
@@ -58,12 +59,13 @@
});
}
List<Pole> list = poleService.list(wrapper);
- return ResponseUtil.success(list);
+ return ResponseUtil.successPage(list);
}
@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);
}
@@ -72,9 +74,9 @@
/**
* 璁剧疆涓夊厓鐮�
*/
- @PostMapping("/setMac/{poleId}")
- public ResponseVO<Object> setMac(@PathVariable Long poleId) {
- return ResponseUtil.success(poleService.setMac(poleId));
+ @PostMapping("/setMac/{baseMac}")
+ public ResponseVO<Object> setMac(@PathVariable String baseMac) {
+ return ResponseUtil.success(poleService.setMac(baseMac));
}
/**
@@ -100,13 +102,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);
}
+ @GetMapping("/ClientBindingPole")
+ public ResponseVO<Object> ClientBindingPole(@RequestParam long clientId, @RequestParam int poleId) {
+
+ return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleId));
+ }
+
}
--
Gitblit v1.9.3