From f673c7d56dd23407371243e48e5a241a42e0ed0b Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:36:48 +0800
Subject: [PATCH] 用户信息
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 79192fc..52356a2 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
@@ -18,6 +18,7 @@
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -57,7 +58,7 @@
@PostMapping("/list")
public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
- if(!permissionConfig.check("璺伅鍒楄〃")){
+ if(!permissionConfig.check(MenuEnum.POLE_LIST.getCode())){
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -79,6 +80,14 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),keyword,groupid);
return ResponseUtil.successPage(poles);
+ }
+
+ /**
+ * 鍦ㄧ嚎鏁伴噺
+ */
+ @GetMapping("/online")
+ public ResponseVO<Object> online() {
+ return ResponseUtil.success(poleService.poleCount());
}
@@ -208,11 +217,27 @@
/**
* 鏌ユ壘鑷繁鎷ユ湁鐨勭伅鏉�
*/
- @PostMapping("/getOwnerPole")
- public ResponseVO<Object> getOwnerPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- //public ResponseVO<Object> setMac() {
- return ResponseUtil.success(poleService.getOwnerPole(baseConditionVO,keyword));
- // return ResponseUtil.success(poleService.setMac());
+ @PostMapping("/getOwnerPole/{cilentId}")
+ public ResponseVO<Object> getOwnerPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
+ ,@PathVariable Long cilentId) {
+ List<Pole> results = poleService.getOwnerPole(baseConditionVO, keyword, cilentId);
+// CommonPage commonPage = CommonPage.restPage(results);
+// int size = results.size();
+// commonPage.setTotal((long) size);
+// commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
+// if (size % baseConditionVO.getPageSize() == 0) {
+// commonPage.setTotalPage(size / baseConditionVO.getPageSize());
+// }
+// return ResponseUtil.success(commonPage);
+ return ResponseUtil.success(results);
+ }
+
+ /**
+ * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
+ */
+ @PostMapping("/getPoleBindDevice/{poleId}")
+ public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
+ return ResponseUtil.success(poleService.getBindByPoleId(poleId));
}
--
Gitblit v1.9.3