From ec63fb17c5ba3e5b2a5a4106c25b4e249a2f980f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 22 十一月 2022 18:44:51 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
index c57fc6a..d983488 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
@@ -4,9 +4,11 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +22,7 @@
@RequestMapping("/v1/admin/waterqualityequipment")
public class WaterQualityEquipmentController {
private final WaterQualityEquipmentService waterQualityEquipmentService;
+ private PermissionConfig permissionConfig;
/**
* 姘磋川璁惧鍒楄〃鏌ヨ
@@ -27,21 +30,28 @@
* @return
*/
@GetMapping("/listWaterQualityEquipment")
- public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
/**
* 鍒犻櫎姘磋川璁惧
+ *
* @param id
* @return
*/
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_DETELE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鎴愬姛鍒犻櫎姘磋川璁惧");
} else {
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
@@ -49,9 +59,12 @@
@PostMapping("/add")
public ResponseVO<Object> addQualityEquipment(@RequestBody WaterQualityEquipment waterQualityEquipment) {
+ if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = waterQualityEquipmentService.addWaterQualityEquipment(waterQualityEquipment);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鎴愬姛娣诲姞姘磋川璁惧");
} else {
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
--
Gitblit v1.9.3