From 34cc9fb821d30b64947c8a62d952f1621a515149 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 21 三月 2022 10:32:51 +0800
Subject: [PATCH] 普通用户修改密码

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 a4dda2f..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
@@ -1,6 +1,8 @@
 package com.sandu.ximon.admin.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.PoleGroupParam;
 import com.sandu.ximon.admin.param.PoleGroupRelationParam;
@@ -23,7 +25,7 @@
 
     private final PoleGroupService poleGroupService;
 
-    @GetMapping("/add")
+    @PostMapping("/add")
     public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
         return ResponseUtil.success(poleGroupService.addGroup(param));
     }
@@ -33,18 +35,20 @@
         return ResponseUtil.success(poleGroupService.updateGroup(groupId, param));
     }
 
-    @GetMapping("/delete/{groupId}")
+    @PostMapping("/delete/{groupId}")
     public ResponseVO<Object> delGroup(@PathVariable Long groupId) {
         return ResponseUtil.success(poleGroupService.deleteGroup(groupId));
     }
 
-    @PostMapping("/list")
-    public ResponseVO<Object> listGroup() {
-        return ResponseUtil.success(poleGroupService.groupList());
+    @GetMapping("/list")
+    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,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