From 31e798604209979bb9e93652dc0b0ac8d4d61538 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 17:54:16 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
index 0df60df..326ee12 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
@@ -1,14 +1,15 @@
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.dto.WaterQualityDataDto;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.WaterQualityDataService;
-import com.sandu.ximon.dao.domain.WaterQualityData;
+import com.sandu.ximon.dao.bo.WaterQualityDataBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -20,22 +21,29 @@
@RequestMapping("/v1/admin/waterqualitydata")
public class WaterQualityDataController {
private final WaterQualityDataService waterQualityDataService;
-
- @GetMapping
- public ResponseVO<Object> listWaterQualityData() {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
- return ResponseUtil.successPage(list);
- }
+ private PermissionConfig permissionConfig;
/**
- * 妯＄硦鏌ヨ
+ * 姘磋川鏁版嵁鏌ヨ
*
* @return
*/
- @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
- public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
+ @GetMapping("/listWaterQualityData")
+ public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.WATER_DATA_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
+ @PostMapping("/getWaterQualityDataInfo/{waterQualityEquipmentCode}")
+ public ResponseVO<Object> getWaterQualityDataInfo(@PathVariable String waterQualityEquipmentCode) {
+ if (!permissionConfig.check(MenuEnum.WATER_DATA_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ WaterQualityDataDto waterQualityDataDto = waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipmentCode);
+ return ResponseUtil.success(waterQualityDataDto);
+ }
+
}
--
Gitblit v1.9.3