From d2bf8caa38cc592cf5516bf64da27ad1ec8ea308 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 17 十二月 2021 17:30:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 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..9e159e4 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.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,19 @@
private final AirDataService airDataService;
@GetMapping
- public ResponseVO<Object> listMonitor() {
+ public ResponseVO<Object> listAirData() {
List<AirData> list = airDataService.listAirData();
return ResponseUtil.successPage(list);
}
/**
- * 妯＄硦鏌ヨ
- *
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
* @return
*/
- @GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listMonitorByKeyword(@PathVariable String keyword) {
- List<AirData> list = airDataService.listAirDataByKeyword(keyword);
+ @GetMapping("/listAirEquipmentMAC")
+ public ResponseVO<Object> listAirEquipmentMAC() {
+ List<String> list = airDataService.listAirEquipmentMAC();
return ResponseUtil.successPage(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("鎿嶄綔澶辫触");
- }
- }
}
--
Gitblit v1.9.3