From 135a1341621d7de38132aba7b6174c651492ba0e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 12:56:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java | 35 +++--------------------------------
1 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
index 473fd95..b5d31d7 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
@@ -87,7 +87,7 @@
}
read();
- Thread.sleep(200);
+ Thread.sleep(1000);
execute();
} catch (Exception e) {
e.printStackTrace();
@@ -131,19 +131,7 @@
private void readStatus() {
try {
//鑾峰彇鎻愬崌鏈烘暟鎹�
- HashMap<String, Object> resultData = this.masterThread.read(this.slave.getId(), "status");
- if (resultData == null) {
- OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
- return;
- }
- if (Integer.parseInt(resultData.get("slaveId").toString()) != this.slave.getId()) {
- return;
- }
- if (!resultData.get("dbTag").toString().equals("status")) {
- return;
- }
-
- OperateResultExOne<byte[]> result1 = (OperateResultExOne<byte[]>) resultData.get("data");
+ OperateResultExOne<byte[]> result1 = this.masterThread.read(this.slave.getId(), "status");
SiemensS7Net siemensS7Net = this.masterThread.getSiemensS7Net();
if (result1.IsSuccess) {
if (null == forkLiftProtocol) {
@@ -180,18 +168,7 @@
OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
}
- //鑾峰彇鎻愬崌鏈烘暟鎹�
- HashMap<String, Object> resultData2 = this.masterThread.read(this.slave.getId(), "staStatus");
- if (resultData2 == null) {
- OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
- }
- if (Integer.parseInt(resultData2.get("slaveId").toString()) != this.slave.getId()) {
- return;
- }
- if (!resultData2.get("dbTag").toString().equals("staStatus")) {
- return;
- }
- OperateResultExOne<byte[]> result2 = (OperateResultExOne<byte[]>) resultData2.get("data");
+ OperateResultExOne<byte[]> result2 = this.masterThread.read(this.slave.getId(), "staStatus");
if (result2.IsSuccess) {
for (int i = 0; i < this.slave.getSta().size(); i++) {
ForkLiftSlave.Sta sta = this.slave.getSta().get(i);
@@ -203,12 +180,6 @@
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result2.Content, i * 2, 2);
forkLiftStaProtocol.setHasTray(status1[0]);
forkLiftStaProtocol.setHasCar(status1[1]);
-
- if (sta.getStaNo() == 1001) {
- if (forkLiftStaProtocol.getHasTray() == false) {
- continue;
- }
- }
}
}
--
Gitblit v1.9.1