From 2e25dbb794bde83ebca485178b3447e8be0271e4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 21 十一月 2022 16:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index e00f1f8..714e1f3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -1013,9 +1013,7 @@
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), setCalendarReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- CommonFrame commonFrame;
-
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getDeviceCode(), a5Frame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getDeviceCode(), a5Frame);
StoreOperationRecordsUtils.storeInnerFrameData(one.getDeviceCode(), "鍗曠伅甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -1096,14 +1094,15 @@
count++;
}
if (haveTime) {
- try {
- long longTime = cal.getTimeInMillis() - System.currentTimeMillis();
- log.error("鐫＄湢鏃堕棿锛堟绉掞級锛�" + longTime);
- Thread.sleep(longTime);
- SetCalendar(light.getLightId(), lightAddress);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ log.error("瀛樺湪瀹氭椂浠诲姟锛�" + light.getLightId()+","+light.getDeviceCode());
+// try {
+// long longTime = cal.getTimeInMillis() - System.currentTimeMillis();
+// log.error("鐫＄湢鏃堕棿锛堟绉掞級锛�" + longTime);
+// Thread.sleep(longTime);
+// SetCalendar(light.getLightId(), lightAddress);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// }
} else {
log.error("鐏潌ID涓猴細" + light.getLightId() + "锛岀伅澶村湴鍧�涓猴細" + lightAddress + "娌℃湁鎵惧埌鍙悓姝ョ殑鏃堕棿锛岃妫�鏌ヤ换鍔★紒");
}
--
Gitblit v1.9.3