From 9d5c54be580f637daa60ce231b67b6236742e570 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 15:31:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d731d3a..8f98ead 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,21 +9,17 @@
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;
import com.zy.core.model.Task;
+import com.zy.core.model.protocol.Cycle;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -48,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);
@@ -132,7 +127,7 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 4:
- writeAgvOk((StaProtocol)task.getData());
+ writeCycle((StaProtocol)task.getData());
read();
break;
/* case 3:
@@ -544,6 +539,57 @@
handleWriteFailure(staProtocol, writeFlag);
}
+ private void writeCycle(StaProtocol staProtocol) throws InterruptedException {
+ if (staProtocol == null) {
+ return;
+ }
+
+ ArrayList<Integer> staNos = getStaNo();
+ int index = staNos.indexOf(staProtocol.getSiteId());
+
+ if (index == -1) {
+ log.error("绔欑偣缂栧彿 {} 涓嶅湪宸茬煡鍒楄〃涓紝鏃犳硶鍐欏叆浠诲姟锛�", staProtocol.getSiteId());
+ return;
+ }
+
+ int writeCount = 0; // 浠诲姟涓嬪彂灏濊瘯娆℃暟
+ boolean writeFlag = false; // 浠诲姟涓嬪彂鎴愬姛鏍囪
+ String plcAddressWorkNo = "";
+ String plcAddressStaNo = "" ;
+ switch (staProtocol.getSiteId()){
+ case 105:
+ plcAddressWorkNo = "DB73." + 0;
+ plcAddressStaNo = "DB73." + 4;
+ break;
+ case 106:
+ plcAddressWorkNo = "DB73." + 6;
+ plcAddressStaNo = "DB73." + (6 + 4);
+ break;
+ case 108:
+ plcAddressWorkNo = "DB73." + 2 * 6;
+ plcAddressStaNo = "DB73." + (2 * 6 + 4);
+ break;
+ case 110:
+ plcAddressWorkNo = "DB73." + 3 * 6;
+ plcAddressStaNo = "DB73." + (3 * 6 + 4);
+ break;
+ case 112:
+ plcAddressWorkNo = "DB73." + 4 * 6;
+ plcAddressStaNo = "DB73." + (4 * 6 + 4);
+ break;
+ }
+
+
+ // **鍐欏叆鏂颁换鍔�**
+ if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
+ writeFlag = true;
+ log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+
+ // **鍐欏叆澶辫触澶勭悊**
+ handleWriteFailure(staProtocol, writeFlag);
+ }
+
/**
* 娓呴浂 PLC 鏁版嵁骞堕獙璇佹竻闆舵槸鍚︽垚鍔�
*/
@@ -569,8 +615,9 @@
* 鍐欏叆鏂颁换鍔″埌 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 璇嗗埆鏂板��
@@ -584,6 +631,22 @@
return false;
}
+ private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, Cycle cycle) throws InterruptedException {
+ OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, cycle.getWorkNo().intValue());
+ OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, cycle.getStaNo());
+
+ if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
+ Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板��
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
+ if (readResult.IsSuccess) {
+ int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+ short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
+ return workNo == cycle.getWorkNo().intValue() && staNo == cycle.getStaNo();
+ }
+ }
+ return false;
+ }
+
/**
* 澶勭悊鍐欏叆澶辫触鐨勬儏鍐�
*/
--
Gitblit v1.9.1