From 09a61ca5857ecaa6918f2e0c942e2f0f1f4aa830 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 16:06:53 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 4014cc6..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
@@ -18,8 +18,6 @@
import java.util.List;
import java.util.Map;
-import static jodd.util.ThreadUtil.sleep;
-
/**
* 澶ф皵鏁版嵁
*/
@@ -63,8 +61,8 @@
List<String> success = new ArrayList<>();
List<String> failed = new ArrayList<>();
- for (String macStr : listMac) {
-
+ listMac.parallelStream().forEach(macStr -> {
+// System.out.println(System.currentTimeMillis()+" -------------");
try {
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
if (commonFrame != null) {
@@ -75,19 +73,29 @@
} catch (Exception e) {
failed.add(macStr);
}
- System.out.println(System.currentTimeMillis());
- }
+// 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);
-// System.out.println("commonFrame"+commonFrame);
-// System.out.println(wrapResponseCommonFrame);
-
-// A5AtmosphereHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(wrapResponseCommonFrame.getPayload());
-
-// System.out.println(heartbeatReportInnerFrame);
-// return ResponseUtil.success(a5LightBrightnessRespInnerFrameWrapResponseCommonFrame);
return ResponseUtil.success(resultMap);
}
--
Gitblit v1.9.3