From b7cb5ffc4c21e69d846df29a5a641fcc8946a6e2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 30 六月 2022 11:27:39 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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 9202799..3fce68a 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
@@ -30,31 +30,45 @@
 
     @PostMapping("/add")
     public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
+        if (!permissionConfig.check(MenuEnum.GROUP_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(poleGroupService.addGroup(param));
     }
 
     @PostMapping("/update/{groupId}")
     public ResponseVO<Object> updateGroup(@PathVariable Long groupId, @RequestBody @Validated PoleGroupParam param) {
+        if (!permissionConfig.check(MenuEnum.GROUP_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(poleGroupService.updateGroup(groupId, param));
     }
 
     @PostMapping("/delete/{groupId}")
     public ResponseVO<Object> delGroup(@PathVariable Long groupId) {
+        if (!permissionConfig.check(MenuEnum.GROUP_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(poleGroupService.deleteGroup(groupId));
     }
 
     @GetMapping("/list")
-    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
-                                        @RequestParam(value = "groupid", required = false) Long groupid) {
+    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO,
+                                        @RequestParam(value = "keyword", required = false) String keyword,
+                                        @RequestParam(value = "order", required = false) Integer order,
+                                        @RequestParam(value = "seq", required = false) Integer seq) {
         if (!permissionConfig.check(MenuEnum.GROUP_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
+        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO, keyword, order, seq));
     }
 
     @PostMapping("/bind/{groupId}")
-    public ResponseVO<Object> bindPole(@PathVariable Long groupId,@RequestBody PoleGroupRelationParam param) {
-        return ResponseUtil.success(poleGroupService.bindPole(groupId,param.getPoleIdList()));
+    public ResponseVO<Object> bindPole(@PathVariable Long groupId, @RequestBody PoleGroupRelationParam param) {
+        if (!permissionConfig.check(MenuEnum.GROUP_BINDING_POLE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(poleGroupService.bindPole(groupId, param.getPoleIdList()));
     }
 }

--
Gitblit v1.9.3