From 098dd2ed33b90a8a14ff0b04bace845ec119244c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 10:40:21 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 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 88513c4..2883350 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
@@ -1,9 +1,14 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+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.*;
@@ -17,31 +22,49 @@
@RequestMapping("/v1/admin/waterqualityequipment")
public class WaterQualityEquipmentController {
private final WaterQualityEquipmentService waterQualityEquipmentService;
+ private PermissionConfig permissionConfig;
- @GetMapping
- public ResponseVO<Object> listWaterQualityEquipment() {
- List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipment();
+ /**
+ * 姘磋川璁惧鍒楄〃鏌ヨ
+ *
+ * @return
+ */
+ @GetMapping("/listWaterQualityEquipment")
+ public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(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
*/
- @GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
- public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
- List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
- return ResponseUtil.successPage(list);
- }
-
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
if (result) {
- return ResponseUtil.success(null);
+ return ResponseUtil.success("鎴愬姛鍒犻櫎姘磋川璁惧");
} else {
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
}
+
+ @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("鎴愬姛娣诲姞姘磋川璁惧");
+ } else {
+ return ResponseUtil.fail("鎿嶄綔澶辫触");
+ }
+ }
+
}
--
Gitblit v1.9.3