From 90472ee0b00263614f9760a6ad5974d0c0fd25fc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 15 二月 2022 10:13:25 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 944e7ee..3ff676f 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,7 +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.admin.utils.AtmoAPIUtils;
+import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.admin.service.AirDataService;
import lombok.AllArgsConstructor;
@@ -18,22 +22,16 @@
public class AirDataController {
private final AirDataService airDataService;
- @GetMapping
- public ResponseVO<Object> listAirData() {
- List<AirDataBo> list = airDataService.listAirData();
- return ResponseUtil.success(list);
- }
-
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
*
* @param keyword 鍏抽敭瀛�
* @return
*/
- @GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
- List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
- return ResponseUtil.success(list);
+ @GetMapping("/listAirData")
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
+ return ResponseUtil.successPage(list);
}
/**
@@ -47,4 +45,14 @@
return ResponseUtil.success(list);
}
+ @PostMapping("/updateAirEquipmentInfo")
+ public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
+ AtmoAPIUtils atmoAPIUtils = new AtmoAPIUtils();
+ for (String macString : listMac) {
+ LogUtils.error(macString);
+ atmoAPIUtils.queryHeartBeat(macString);
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3