From a37eb3393b65933105a6f23a1713a2b14b835d16 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 23 五月 2025 12:53:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 f3efcd3..8a8964d 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
@@ -36,16 +36,18 @@
ArrayList<HashMap<String, Object>> addressList = new ArrayList<>();
HashMap<String, Object> lift1 = new HashMap<>();
- lift1.put("status", new DbData("DB101.0", (short) 16));//鎻愬崌鏈烘暟鎹�
- lift1.put("staStatus", new DbData("DB102.0", (short) 14));//绔欑偣鏁版嵁
+ lift1.put("status", new DbData("DB101.0", (short) 18));//鎻愬崌鏈烘暟鎹�
+ lift1.put("staStatusTray", new DbData("DB102.0", (short) 14));//绔欑偣鏁版嵁
+ lift1.put("staStatusCar", new DbData("DB102.50", (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));//纭鍛戒护
lift1.put("switchIOMode", new DbData("DB103.12", null));//鍑哄叆搴撴ā寮�
HashMap<String, Object> lift2 = new HashMap<>();
- lift2.put("status", new DbData("DB104.0", (short) 16));//鎻愬崌鏈烘暟鎹�
- lift2.put("staStatus", new DbData("DB105.0", (short) 14));//绔欑偣鏁版嵁
+ lift2.put("status", new DbData("DB104.0", (short) 18));//鎻愬崌鏈烘暟鎹�
+ lift2.put("staStatusTray", new DbData("DB105.0", (short) 14));//绔欑偣鏁版嵁
+ lift2.put("staStatusCar", new DbData("DB105.50", (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));//纭鍛戒护
@@ -102,18 +104,12 @@
return siemensS7Net;
}
- public synchronized HashMap<String, Object> read(Integer slaveId, String dbTag) {
+ public synchronized OperateResultExOne<byte[]> 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);
-
- data.put("slaveId", slaveId);
- data.put("dbTag", dbTag);
- data.put("data", result);
- return data;
+ return result;
} 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