From 881b19b376d4df2e82badff6691f27c5827c7c57 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 04 一月 2022 09:55:26 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 4cd1e23..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
@@ -4,6 +4,7 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.service.WaterQualityDataService;
+import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,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);
}
/**
@@ -32,8 +33,8 @@
*/
@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}")
--
Gitblit v1.9.3