From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 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 3ff676f..aa0497b 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,17 +1,22 @@
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.manager.iot.frame.A5Frame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.service.AirDataService;
+import com.sandu.ximon.dao.bo.AirDataBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 澶ф皵鏁版嵁
@@ -47,12 +52,51 @@
@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;
+ AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
+
+// WrapResponseCommonFrame<A5AtmosphereHeartbeatReportInnerFrame> wrapResponseCommonFrame =
+// MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), a5Frame, A5AtmosphereHeartbeatReportInnerFrame.class);
+
+ List<String> success = new ArrayList<>();
+ List<String> failed = new ArrayList<>();
+
+ listMac.parallelStream().forEach(macStr -> {
+// System.out.println(System.currentTimeMillis()+" -------------");
+ try {
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+ if (commonFrame != null) {
+ success.add(macStr);
+ } else {
+ failed.add(macStr);
+ }
+ } catch (Exception e) {
+ failed.add(macStr);
+ }
+// System.out.println(System.currentTimeMillis());
+ });
+
+
+// for (String macStr : listMac) {
+// System.out.println(System.currentTimeMillis()+" -------------");
+// try {
+// CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+// if (commonFrame != null) {
+// success.add(macStr);
+// } else {
+// failed.add(macStr);
+// }
+// } catch (Exception e) {
+// failed.add(macStr);
+// }
+// System.out.println(System.currentTimeMillis());
+// }
+
+ Map<String, List> resultMap = new HashMap<>();
+ resultMap.put("success", success);
+ resultMap.put("failed", failed);
+
+ return ResponseUtil.success(resultMap);
}
}
--
Gitblit v1.9.3