From e217e2ae4e30304cd678fd8fee9e7e860aceae2a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 09 三月 2022 14:21:39 +0800
Subject: [PATCH] 普通用户登录fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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..b65653d 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,8 +1,10 @@
package com.sandu.ximon.admin.controller;
+import com.alibaba.fastjson.JSON;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
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;
@@ -17,8 +19,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import static jodd.util.ThreadUtil.sleep;
/**
* 澶ф皵鏁版嵁
@@ -56,17 +56,20 @@
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
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<>();
- for (String macStr : listMac) {
-
+ listMac.parallelStream().forEach(macStr -> {
try {
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+// //娴嬭瘯鐢ㄧ殑
+// String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101016666640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
+// CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
+// AirDataProcessor.getInstance().process("a1JsfPG4iKW",macStr,commonFrame1);
+ AirDataProcessor.getInstance().process("a1JsfPG4iKW",macStr,commonFrame);
if (commonFrame != null) {
success.add(macStr);
} else {
@@ -75,19 +78,12 @@
} 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