From d65594e37be2179b60cdc1730819ff156b39639c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
index 04365ab..1c04965 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
@@ -41,13 +41,14 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "groupid", required = false) Long groupid) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword));
+ return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
}
@PostMapping("/bind/{groupId}")
- public ResponseVO<Object> bindPole(@PathVariable Long groupId, PoleGroupRelationParam param) {
+ public ResponseVO<Object> bindPole(@PathVariable Long groupId,@RequestBody PoleGroupRelationParam param) {
return ResponseUtil.success(poleGroupService.bindPole(groupId,param.getPoleIdList()));
}
}
--
Gitblit v1.9.3