From e525cffa5ae93048d0ac1208d100e08bc69a4a3a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 06 一月 2022 14:52:51 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 9e159e4..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,9 +1,11 @@
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.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.*;
@@ -18,20 +20,27 @@
public class AirDataController {
private final AirDataService airDataService;
- @GetMapping
- public ResponseVO<Object> listAirData() {
- 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("/listAirEquipmentMAC")
public ResponseVO<Object> listAirEquipmentMAC() {
List<String> list = airDataService.listAirEquipmentMAC();
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
}
--
Gitblit v1.9.3