From 391cbdd2309469a48d2068c0849b8140e5d5670a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 13 一月 2026 13:27:32 +0800
Subject: [PATCH] 修复堆垛机
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..da7e86c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -158,9 +158,6 @@
private void readStatus(){
try {
short len = 56;
- if (slave.getId() == 1) {
- len = 58;
- }
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", len);
if (result.IsSuccess) {
if (null == crnProtocol) {
@@ -184,13 +181,10 @@
crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
- if (slave.getId() == 1) {
- crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
- }
+ crnProtocol.setxDistance((short) siemensNet.getByteTransform().TransSingle(result.Content, 40));
+ crnProtocol.setyDistance((short) siemensNet.getByteTransform().TransSingle(result.Content, 44));
+ crnProtocol.setxDuration((short) siemensNet.getByteTransform().TransSingle(result.Content, 48));
+ crnProtocol.setyDuration((short) siemensNet.getByteTransform().TransSingle(result.Content, 52));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -208,7 +202,15 @@
}
}
- 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