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/AirDataController.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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 33f69b2..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,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")
@@ -19,29 +19,32 @@
private final AirDataService airDataService;
@GetMapping
- public ResponseVO<Object> listMonitor() {
- List<AirData> list = airDataService.listAirData();
- return ResponseUtil.successPage(list);
+ public ResponseVO<Object> listAirData() {
+ List<AirDataBo> list = airDataService.listAirData();
+ return ResponseUtil.success(list);
}
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
*
+ * @param keyword 鍏抽敭瀛�
* @return
*/
@GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listMonitorByKeyword(@PathVariable String keyword) {
- List<AirData> list = airDataService.listAirDataByKeyword(keyword);
- return ResponseUtil.successPage(list);
+ public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
+ List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
+ return ResponseUtil.success(list);
}
- @PostMapping("/delete/{id}")
- public ResponseVO<Object> deleteMonitor(@PathVariable Long id) {
- boolean result = airDataService.deleteAirData(id);
- if (result) {
- return ResponseUtil.success(null);
- } else {
- return ResponseUtil.fail("鎿嶄綔澶辫触");
- }
+ /**
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+ *
+ * @return
+ */
+ @GetMapping("/listAirEquipmentMAC")
+ public ResponseVO<Object> listAirEquipmentMAC() {
+ List<String> list = airDataService.listAirEquipmentMAC();
+ return ResponseUtil.success(list);
}
+
}
--
Gitblit v1.9.3