From 3b8877b6d8c13e37f8c7769282a2751b0faeb499 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 18:30:54 +0800
Subject: [PATCH] 日志

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 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..c39a14e 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,10 +1,14 @@
 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;
+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.*;
@@ -22,29 +26,47 @@
 public class PoleGroupController {
 
     private final PoleGroupService poleGroupService;
+    private PermissionConfig permissionConfig;
 
-    @GetMapping("/add")
+    @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));
     }
 
-    @GetMapping("/delete/{groupId}")
+    @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));
     }
 
-    @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) {
+        if (!permissionConfig.check(MenuEnum.GROUP_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        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) {
-        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