From 982359342d0a4c868580c1e7db9784865941b5e1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 15:06:49 +0800
Subject: [PATCH] 大气设备、数据(农耕)

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 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 869765b..65b269e 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
@@ -62,8 +62,7 @@
     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);
+        System.out.println(a5Frame + "          --------a5Frame");
 
         List<String> success = new ArrayList<>();
         List<String> failed = new ArrayList<>();
@@ -71,11 +70,8 @@
         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);
+                System.out.println(commonFrame + "         -----------commonFrame");
+                AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
                 if (commonFrame != null) {
                     success.add(macStr);
                 } else {

--
Gitblit v1.9.3