From 8cff320349e232e3f27820d8d8c4c33a3f0fe17c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 02 三月 2022 18:24:50 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 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 98e3b0e..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
@@ -3,20 +3,20 @@
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.frame.FrameBuilder;
-import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
+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.frame.inner.response.A5LightBrightnessRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
+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;
/**
* 澶ф皵鏁版嵁
@@ -52,14 +52,51 @@
@PostMapping("/updateAirEquipmentInfo")
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
+ AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
- IRequestFrame build = FrameBuilder.builderA5().innerFrame(new AirDataReqInnerFrame())
- .orderType(AtmoFunctionCode.QueryHeartBeat.getCode()).build();
+// WrapResponseCommonFrame<A5AtmosphereHeartbeatReportInnerFrame> wrapResponseCommonFrame =
+// MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), a5Frame, A5AtmosphereHeartbeatReportInnerFrame.class);
- WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> a5LightBrightnessRespInnerFrameWrapResponseCommonFrame =
- MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), build, A5LightBrightnessRespInnerFrame.class);
+ List<String> success = new ArrayList<>();
+ List<String> failed = new ArrayList<>();
- return ResponseUtil.success(a5LightBrightnessRespInnerFrameWrapResponseCommonFrame);
+ 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