From d5c71f3c85e9370100559e86e1081c44b1cc15df Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 05 一月 2022 10:37:34 +0800
Subject: [PATCH] 摄像头查询
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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..ff26e09 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,10 +1,11 @@
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.service.WaterQualityDataService;
-import com.sandu.ximon.dao.domain.WaterQualityData;
+import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,20 +20,14 @@
public class WaterQualityDataController {
private final WaterQualityDataService waterQualityDataService;
- @GetMapping
- public ResponseVO<Object> listWaterQualityData() {
- List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
- return ResponseUtil.successPage(list);
- }
-
/**
- * 妯＄硦鏌ヨ
+ * 姘磋川鏁版嵁鏌ヨ
*
* @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) {
+ List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
--
Gitblit v1.9.3