From 996e076ab3201464086505e08caafa0088eeec34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 10:12:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 e148e31..f3efcd3 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
@@ -37,7 +37,7 @@
HashMap<String, Object> lift1 = new HashMap<>();
lift1.put("status", new DbData("DB101.0", (short) 16));//鎻愬崌鏈烘暟鎹�
- lift1.put("staStatus", new DbData("DB102.0", (short) 8));//绔欑偣鏁版嵁
+ lift1.put("staStatus", new DbData("DB102.0", (short) 14));//绔欑偣鏁版嵁
lift1.put("write", new DbData("DB103.0", null));//鍐欏叆鏁版嵁
lift1.put("writeConfirm", new DbData("DB103.8", null));//鍐欏叆纭鏁版嵁
lift1.put("confirm", new DbData("DB103.10", null));//纭鍛戒护
@@ -45,7 +45,7 @@
HashMap<String, Object> lift2 = new HashMap<>();
lift2.put("status", new DbData("DB104.0", (short) 16));//鎻愬崌鏈烘暟鎹�
- lift2.put("staStatus", new DbData("DB105.0", (short) 8));//绔欑偣鏁版嵁
+ lift2.put("staStatus", new DbData("DB105.0", (short) 14));//绔欑偣鏁版嵁
lift2.put("write", new DbData("DB106.0", null));//鍐欏叆鏁版嵁
lift2.put("writeConfirm", new DbData("DB106.8", null));//鍐欏叆纭鏁版嵁
lift2.put("confirm", new DbData("DB106.10", null));//纭鍛戒护
@@ -98,12 +98,22 @@
}
}
- public synchronized OperateResultExOne<byte[]> read(Integer slaveId, String dbTag) {
+ public SiemensS7Net getSiemensS7Net() {
+ return siemensS7Net;
+ }
+
+ 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;
+
+ 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