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 | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 f33dd11..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,16 +2,16 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.MonitorParam;
+import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.admin.service.AirDataService;
-import com.sandu.ximon.admin.service.MonitorService;
-import com.sandu.ximon.dao.domain.AirData;
-import com.sandu.ximon.dao.domain.Monitor;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+/**
+ * 澶ф皵鏁版嵁
+ */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/airdata")
@@ -20,18 +20,30 @@
@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<AirData> list = airDataService.listAirDataByKeyword(keyword);
+ List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
+ return ResponseUtil.successPage(list);
+ }
+
+ /**
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+ *
+ * @return
+ */
+ @GetMapping("/listAirEquipmentMAC")
+ public ResponseVO<Object> listAirEquipmentMAC() {
+ List<String> list = airDataService.listAirEquipmentMAC();
return ResponseUtil.successPage(list);
}
--
Gitblit v1.9.3