From e83761d390b593cff8b7c17144529e92eb482bd6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 16 四月 2025 16:38:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 445b4fd..e7151fd 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
@@ -37,17 +37,19 @@
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));//纭鍛戒护
+ 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) 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));//纭鍛戒护
+ lift2.put("switchIOMode", new DbData("DB106.12", null));//鍑哄叆搴撴ā寮�
addressList.add(lift1);
addressList.add(lift2);
@@ -96,7 +98,11 @@
}
}
- public OperateResultExOne<byte[]> read(Integer slaveId, String dbTag) {
+ public SiemensS7Net getSiemensS7Net() {
+ return siemensS7Net;
+ }
+
+ public synchronized OperateResultExOne<byte[]> read(Integer slaveId, String dbTag) {
try {
HashMap<String, Object> map = this.slaveAddressList.get(slaveId - 1);
DbData dbData = (DbData) map.get(dbTag);
@@ -108,7 +114,7 @@
return null;
}
- public OperateResult write(Integer slaveId, String dbTag, short[] array) {
+ public synchronized OperateResult write(Integer slaveId, String dbTag, short[] array) {
try {
HashMap<String, Object> map = this.slaveAddressList.get(slaveId - 1);
DbData dbData = (DbData) map.get(dbTag);
@@ -120,7 +126,7 @@
return null;
}
- public OperateResult write(Integer slaveId, String dbTag, short val) {
+ public synchronized OperateResult write(Integer slaveId, String dbTag, short val) {
try {
HashMap<String, Object> map = this.slaveAddressList.get(slaveId - 1);
DbData dbData = (DbData) map.get(dbTag);
--
Gitblit v1.9.1