From be2418237b5701d1a59ac32cdfa0e3e7005a8458 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 19 四月 2022 18:29:44 +0800
Subject: [PATCH] 灯杆换绑灯的时候修改设备号
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 04365ab..539133e 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
@@ -6,7 +6,9 @@
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.*;
@@ -24,6 +26,7 @@
public class PoleGroupController {
private final PoleGroupService poleGroupService;
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addGroup(@RequestBody @Validated PoleGroupParam param) {
@@ -41,13 +44,17 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ 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));
+ 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) {
+ return ResponseUtil.success(poleGroupService.bindPole(groupId, param.getPoleIdList()));
}
}
--
Gitblit v1.9.3