From 9a46347d03f06ca89e0d12f0dcc10ade753d5b40 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 04 一月 2022 14:10:49 +0800
Subject: [PATCH] 大气数据查询
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 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..1d5e423 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
@@ -1,47 +1,46 @@
package com.sandu.ximon.admin.controller;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
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")
public class AirDataController {
private final AirDataService airDataService;
- @GetMapping
- public ResponseVO<Object> listMonitor() {
- List<AirData> list = airDataService.listAirData();
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
+ *
+ * @param keyword 鍏抽敭瀛�
+ * @return
+ */
+ @GetMapping("/listAirData")
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
/**
- * 妯＄硦鏌ヨ
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
*
* @return
*/
- @GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listMonitorByKeyword(@PathVariable String keyword) {
- List<AirData> list = airDataService.listAirDataByKeyword(keyword);
- return ResponseUtil.successPage(list);
+ @GetMapping("/listAirEquipmentMAC")
+ public ResponseVO<Object> listAirEquipmentMAC() {
+ List<String> list = airDataService.listAirEquipmentMAC();
+ 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("鎿嶄綔澶辫触");
- }
- }
}
--
Gitblit v1.9.3