From f81e9a5b2b22b3b9e05cdeafb091bca707fa27aa Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 29 四月 2025 16:20:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 783e791..8f98ead 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,17 +9,12 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.CommandInfoLog;
-import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.service.*;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
@@ -49,12 +44,11 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);add(104);
- add(105);add(106);add(107);add(108);add(109);
- add(110);add(111);add(112);add(113);add(114);
- add(115);add(116);add(117);add(118);add(119);
- add(120);add(121);add(122);add(123);add(124);
- add(125);add(1001);add(1002);add(1003);add(1004);
+ add(101);add(102);add(103);add(104);
+ add(105);add(106);add(107);add(108);
+ add(201);add(202);add(203);add(204);add(205);
+ add(206);add(207);add(208);add(209);add(210);
+ add(211);add(212);
}};
/*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
@@ -584,31 +578,12 @@
plcAddressStaNo = "DB73." + (4 * 6 + 4);
break;
}
-// String plcAddressWorkNo = "DB100." + index * 6;
-// String plcAddressStaNo = "DB100." + (index * 6 + 4);
- while (writeCount < 5) {
- // **璇诲彇褰撳墠PLC鐘舵�侊紝閬垮厤涓嶅繀瑕佺殑鍐欏叆**
- OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
- if (readResult.IsSuccess) {
- int currentWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
- short currentStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
- if (currentWorkNo == staProtocol.getWorkNo().intValue() && currentStaNo == staProtocol.getStaNo()) {
- log.info("绔欑偣 {} 褰撳墠鐘舵�佸凡鍖归厤锛屾棤闇�閲嶅鍐欏叆", staProtocol.getSiteId());
- return;
- }
- }
-
- // **鍐欏叆鏂颁换鍔�**
- if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
- writeFlag = true;
- log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- break;
- }
-
- log.warn("杈撻�佺嚎鍛戒护鍐欏叆澶辫触锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- writeCount++;
+ // **鍐欏叆鏂颁换鍔�**
+ if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
+ writeFlag = true;
+ log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
// **鍐欏叆澶辫触澶勭悊**
@@ -640,9 +615,10 @@
* 鍐欏叆鏂颁换鍔″埌 PLC 骞堕獙璇佹槸鍚︽垚鍔�
*/
private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException {
- OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, staProtocol.getStaNo());
+ OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
+
if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板��
OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
--
Gitblit v1.9.1