From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 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 1c04965..530f8d7 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
@@ -4,9 +4,11 @@
 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.GroupParam;
 import com.sandu.ximon.admin.param.PoleGroupRelationParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.PoleGroupService;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -24,31 +26,49 @@
 public class PoleGroupController {
 
     private final PoleGroupService poleGroupService;
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
-    public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
+    public ResponseVO<Object> addGroup(@RequestBody @Validated GroupParam 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) {
+    public ResponseVO<Object> updateGroup(@PathVariable Long groupId, @RequestBody @Validated GroupParam 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) {
-        return ResponseUtil.success(poleGroupService.deleteGroup(groupId));
+    @PostMapping("/delete")
+    public ResponseVO<Object> delGroup(@RequestBody List<Long> groupIds) {
+        if (!permissionConfig.check(MenuEnum.GROUP_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(poleGroupService.deleteGroup(groupIds));
     }
 
     @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