From 78cfab6f94517b93fa6218987f1a1e87fac0034c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 31 十二月 2021 16:30:41 +0800
Subject: [PATCH] 水质   大气

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
index 9e159e4..2f334d0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -2,8 +2,8 @@
 
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.dao.bo.AirDataBo;
 import com.sandu.ximon.admin.service.AirDataService;
-import com.sandu.ximon.dao.domain.AirData;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,12 +20,25 @@
 
     @GetMapping
     public ResponseVO<Object> listAirData() {
-        List<AirData> list = airDataService.listAirData();
+        List<AirDataBo> list = airDataService.listAirData();
+        return ResponseUtil.successPage(list);
+    }
+
+    /**
+     * 鏌ヨ澶ф皵鏁版嵁妯$硦鏌ヨ
+     *
+     * @param keyword 鍏抽敭瀛�
+     * @return
+     */
+    @GetMapping("/listAirDataByKeyword/{keyword}")
+    public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
+        List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
         return ResponseUtil.successPage(list);
     }
 
     /**
      * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+     *
      * @return
      */
     @GetMapping("/listAirEquipmentMAC")

--
Gitblit v1.9.3