From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..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
@@ -30,16 +30,25 @@
@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));
}
@@ -50,11 +59,14 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
+ return ResponseUtil.success(poleGroupService.groupList(baseConditionVO, keyword, groupid));
}
@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