From 6124565fc7edeb1ff49aebd87711c176a6f2f38e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 31 十二月 2021 16:48:37 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 c734ea9..944e7ee 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,19 +20,31 @@
@GetMapping
public ResponseVO<Object> listAirData() {
- List<AirData> list = airDataService.listAirData();
- return ResponseUtil.successPage(list);
+ List<AirDataBo> list = airDataService.listAirData();
+ return ResponseUtil.success(list);
}
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
*
+ * @param keyword 鍏抽敭瀛�
* @return
*/
@GetMapping("/listAirDataByKeyword/{keyword}")
public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
- List<AirData> list = airDataService.listAirDataByKeyword(keyword);
- return ResponseUtil.successPage(list);
+ List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
+ return ResponseUtil.success(list);
+ }
+
+ /**
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+ *
+ * @return
+ */
+ @GetMapping("/listAirEquipmentMAC")
+ public ResponseVO<Object> listAirEquipmentMAC() {
+ List<String> list = airDataService.listAirEquipmentMAC();
+ return ResponseUtil.success(list);
}
}
--
Gitblit v1.9.3