From 7fb7e64c4bd096b031d9a6015f8ee0ac0ae900e1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 10:19:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
index e7151fd..1fb8a2b 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
@@ -102,12 +102,27 @@
return siemensS7Net;
}
- public synchronized OperateResultExOne<byte[]> read(Integer slaveId, String dbTag) {
+ public synchronized HashMap<String, Object> read(Integer slaveId, String dbTag) {
try {
+ HashMap<String, Object> data = new HashMap<>();
+
HashMap<String, Object> map = this.slaveAddressList.get(slaveId - 1);
DbData dbData = (DbData) map.get(dbTag);
OperateResultExOne<byte[]> result = siemensS7Net.Read(dbData.dbAddress, dbData.dbAddressLength);
- return result;
+
+ if (slaveId == 1 && dbData.equals("staStatus")) {
+ boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, 0, 2);
+ if(status1[0] == false){
+ return null;
+ }else {
+ return null;
+ }
+ }
+
+ data.put("slaveId", slaveId);
+ data.put("dbTag", dbTag);
+ data.put("data", result);
+ return data;
} catch (Exception e) {
OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆戣鍙栨彁鍗囨満鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
}
--
Gitblit v1.9.1