From fb7521b63ed150f6cddd86df95e7bf440ec6501f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 13 十二月 2021 11:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 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..c734ea9 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,7 +19,7 @@
private final AirDataService airDataService;
@GetMapping
- public ResponseVO<Object> listMonitor() {
+ public ResponseVO<Object> listAirData() {
List<AirData> list = airDataService.listAirData();
return ResponseUtil.successPage(list);
}
@@ -30,18 +30,9 @@
* @return
*/
@GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listMonitorByKeyword(@PathVariable String keyword) {
+ public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
List<AirData> list = airDataService.listAirDataByKeyword(keyword);
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