From f214709cf1d896e7c9743f206b7a708f020e5322 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 17:54:03 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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..a88ed9d 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,7 +4,7 @@
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;
@@ -12,8 +12,6 @@
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* 鍒嗙粍鍒楄〃鍔熻兘
@@ -29,32 +27,46 @@
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) {
+ 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