From ba1482bb35c4f44deb069eb086acd7ec3b536548 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 31 十二月 2021 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 ba6dc20..43100b3 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
@@ -2,18 +2,18 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.service.AirDataService;
+import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.service.WaterQualityDataService;
-import com.sandu.ximon.dao.domain.AirData;
+import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
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;
+/**
+ * 姘磋川鏁版嵁
+ */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/waterqualitydata")
@@ -22,8 +22,8 @@
@GetMapping
public ResponseVO<Object> listWaterQualityData() {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
- return ResponseUtil.successPage(list);
+ List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityData();
+ return ResponseUtil.success(list);
}
/**
@@ -33,8 +33,14 @@
*/
@GetMapping("/listWaterQualityDataByKeyword/{keyword}")
public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
- return ResponseUtil.successPage(list);
+ List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
+ return ResponseUtil.success(list);
+ }
+
+ @PostMapping("/getWaterQualityDataInfo/{waterQualityEquipmentCode}")
+ public ResponseVO<Object> getWaterQualityDataInfo(@PathVariable String waterQualityEquipmentCode) {
+ WaterQualityDataDto waterQualityDataDto = waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipmentCode);
+ return ResponseUtil.success(waterQualityDataDto);
}
}
--
Gitblit v1.9.3