From f4603a10d8519827608636c5e7980b2d6d0be8e3 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期四, 05 二月 2026 09:14:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index f9ecce5..50ae4b1 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -203,12 +203,21 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
if (write(crnCommand)) {
+ log.info(crnProtocol.getCrnNo()+"鍙峰爢鍨涙満浠诲姟绛夊緟wcs纭锛屽綋鍓嶇姸鎬�"+crnProtocol.getStatusType());
resetFlag = false;
}
}
}
- if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 5) {
+ if (crnProtocol.getAlarm() > 0) {
+ crnProtocol.setLastCommandTime(-1L);
+ }
+
+ if (crnProtocol.getAlarm() == 0 && crnProtocol.getLastCommandTime() == -1) {
+ crnProtocol.setLastCommandTime(System.currentTimeMillis());
+ }
+
+ if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 1) {
//閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
//淇濆瓨鏁版嵁璁板綍
DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
--
Gitblit v1.9.1