From dfe3eb2327962d2cace6ca85acd1dea629033886 Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期一, 17 十月 2022 16:21:22 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 a1317c0..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
@@ -26,10 +26,10 @@
/**
* 姘磋川鏁版嵁鏌ヨ
*
- * @return
+ * @returnlistWaterQualityData
*/
@GetMapping("/listWaterQualityData")
- public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.WATER_DATA_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -39,8 +39,15 @@
@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);
+ if(waterQualityDataDto != null){
+ return ResponseUtil.success(waterQualityDataDto);
+ }else{
+ return ResponseUtil.fail("姘磋川璁惧鍙蜂笉姝ｇ‘鎴栨按璐ㄦ暟鎹В鏋愬嚭閿�");
+ }
}
}
--
Gitblit v1.9.3