From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 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..a0c2e83 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,33 @@
@RequestMapping("/v1/admin/waterqualitydata")
public class WaterQualityDataController {
private final WaterQualityDataService waterQualityDataService;
+ private PermissionConfig permissionConfig;
- @GetMapping
- public ResponseVO<Object> listWaterQualityData() {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
+ /**
+ * 姘磋川鏁版嵁鏌ヨ
+ *
+ * @returnlistWaterQualityData
+ */
+ @GetMapping("/listWaterQualityData")
+ public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", 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);
}
- /**
- * 妯＄硦鏌ヨ
- *
- * @return
- */
- @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
- public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(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);
+ if(waterQualityDataDto != null){
+ return ResponseUtil.success(waterQualityDataDto);
+ }else{
+ return ResponseUtil.fail("姘磋川璁惧鍙蜂笉姝ｇ‘鎴栨按璐ㄦ暟鎹В鏋愬嚭閿�");
+ }
}
}
--
Gitblit v1.9.3