From d26899642291dbc0cb8b97f7fb175411b53a2895 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 14:56:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 563 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 394 insertions(+), 169 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7b417cf..8f98ead 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,11 +9,7 @@
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;
@@ -23,6 +19,7 @@
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;
@@ -47,10 +44,13 @@
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(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>() {{
+ /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
add(204);add(205);add(206);add(207);
add(208);add(209);add(210);add(211);
@@ -68,12 +68,12 @@
public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
add(400);add(401);add(402);add(403);
add(404);add(405);add(406);add(407);
- }};
+ }};*/
/**
* 鏉$爜鏁伴噺
*/
- private int barcodeSize = 7;
+ private int barcodeSize = 1;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -89,12 +89,12 @@
switch (slave.getId()) {
case 1:
return staNos1;
- case 2:
+ /*case 2:
return staNos2;
case 3:
return staNos3;
case 4:
- return staNos4;
+ return staNos4;*/
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -123,7 +123,17 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
+ read();
break;
+ // 鍐欐暟鎹� ID+鐩爣绔�
+ case 4:
+ writeCycle((StaProtocol)task.getData());
+ read();
+ break;
+ /* case 3:
+ write2((StaProtocol)task.getData());
+ read();
+ break;*/
default:
break;
}
@@ -194,7 +204,7 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -204,26 +214,18 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, i*8)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2)); // 鐩爣绔�
- }
- }
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4)); // 鐩爣绔�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
- if (result1.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
- StaProtocol staProtocol = station.get(siteId);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setCar(status[6]); // 鏄惁鏈夎溅
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
@@ -232,120 +234,117 @@
}
}
+// OperateResultExOne<byte[]> resultAgvAndPlc = siemensS7Net.Read("DB102.0", (short) 30);
+// if (resultAgvAndPlc.IsSuccess) {
+// for (int i = 0; i < staNoSize; i++) {
+// int sign =(i+2)/2-1;
+// if ((i+2)%2!=0){
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// StaProtocol staProtocol = station.get(siteId);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(siteId);
+// station.put(siteId, staProtocol);
+// }
+// staProtocol.setAgvStartPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6+4)); // 鍏佽鍙栬揣
+// staProtocol.setAgvStartPlace((short)0); // 鍏佽鏀捐揣
+// continue;
+// }
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// StaProtocol staProtocol = station.get(siteId);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(siteId);
+// station.put(siteId, staProtocol);
+// }
+// staProtocol.setAgvStartPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6)); // 鍏佽鍙栬揣
+// staProtocol.setAgvStartPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6 + 2)); // 鍏佽鏀捐揣
+// }
+// }
- if (slave.getId() == 1){
+// OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB132.0", (short) 30);
+// if (resultAgvAndPlcOk.IsSuccess) {
+// for (int i = 0; i < staNoSize; i++) {
+// int sign =(i+2)/2-1;
+// if ((i+2)%2!=0){
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// StaProtocol staProtocol = station.get(siteId);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(siteId);
+// station.put(siteId, staProtocol);
+// }
+// staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6+4)); // 鍏佽鍙栬揣
+// staProtocol.setAgvTargetPlace((short)0); // 鍏佽鏀捐揣
+// continue;
+// }
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// StaProtocol staProtocol = station.get(siteId);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(siteId);
+// station.put(siteId, staProtocol);
+// }
+// try{
+// staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6)); // 鍙栬揣瀹屾垚
+// if (staProtocol.getAgvTargetPick()!=0){
+// System.out.println(staProtocol.getAgvTargetPick());
+// }
+// staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6 + 2)); // 鏀捐揣瀹屾垚
+// if (staProtocol.getAgvTargetPlace()!=0){
+// System.out.println(staProtocol.getAgvTargetPlace());
+// }
+// }catch (Exception e){
+// log.error(""+e);
+// }
+// }
+// }
+
+
+ if (slave.getId() == 1) {
//鏉$爜
- Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.102",(short)60);
+ //Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.848.0", (short) 8);
if (result2.IsSuccess) {
- for (int i = 0; i < 6; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,8, "UTF-8");
+ for (int i = 0; i < 1; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
}
}
- // 澶栧舰妫�娴� - 102
- Thread.sleep(100);
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.150", (short)1);
- if (result4.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
- StaProtocol staProtocol = station.get(103);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
+ //澶栧舰妫�娴�
+ OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.810.0", (short) (barcodeSize*1));
+ StaProtocol staProtocol1 = station.get(116);
+ boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, 0, 1);
+ staProtocol1.setFrontErr(status1[0]);
+ staProtocol1.setBackErr(status1[1]);
+ staProtocol1.setHighErr(status1[2]);
+ staProtocol1.setLeftErr(status1[3]);
+ staProtocol1.setRightErr(status1[4]);
+ staProtocol1.setWeightErr(status1[5]);
+ staProtocol1.setBarcodeErr(status1[6]);
+
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0", (short) (staNoSize * 4));
+ if (resultErr.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1);
+ StaProtocol staProtocol = station.get(siteId);
+ staProtocol.setBreakerErr(status[0]);
+ staProtocol.setInfraredErr(status[1]);
+ staProtocol.setOutTimeErr(status[2]);
+ staProtocol.setSeizeSeatErr(status[3]);
+ staProtocol.setWrkYgoodsN(status[4]);
+ staProtocol.setInverterErr(status[5]);
+ staProtocol.setContactErr(status[6]);
+ staProtocol.setUpcontactErr(status[7]);
+
+ }
}
- // 澶栧舰妫�娴� - 107
- Thread.sleep(50);
- OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.154", (short)1);
- if (result5.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
- StaProtocol staProtocol = station.get(107);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
- }
- // 澶栧舰妫�娴� - 111
- Thread.sleep(50);
- OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB101.158", (short)1);
- if (result6.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result6.Content, 0, 1);
- StaProtocol staProtocol = station.get(111);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
- }
- // 澶栧舰妫�娴� - 115
- Thread.sleep(50);
- OperateResultExOne<byte[]> result7 = siemensS7Net.Read("DB101.162", (short)1);
- if (result7.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result7.Content, 0, 1);
- StaProtocol staProtocol = station.get(115);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
- }
- // 澶栧舰妫�娴� - 119
- Thread.sleep(50);
- OperateResultExOne<byte[]> result8 = siemensS7Net.Read("DB101.166", (short)1);
- if (result8.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result8.Content, 0, 1);
- StaProtocol staProtocol = station.get(119);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
- }
- // 澶栧舰妫�娴� - 123
- Thread.sleep(50);
- OperateResultExOne<byte[]> result9 = siemensS7Net.Read("DB101.170", (short)1);
- if (result9.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result9.Content, 0, 1);
- StaProtocol staProtocol = station.get(123);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
- }
- } else if (slave.getId() == 3) {
- // 澶栧舰妫�娴� - 111
- Thread.sleep(50);
- OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
- if (result10.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
- StaProtocol staProtocol = station.get(301);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
- }
+
}
@@ -372,7 +371,7 @@
// this.ioMode = IoModeType.get(result2.Content);
// }
- if (result.IsSuccess && result1.IsSuccess) {
+ if (result.IsSuccess ) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -407,7 +406,268 @@
/**
* 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
*/
+ private void writeAgvOk(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+ ArrayList<Integer> staNos = getStaNo();
+ int index = staNos.indexOf(staProtocol.getSiteId());
+ if (staProtocol.getAgvTypeSign()==0 || staProtocol.getAgvTypeSign()==2 ){ //0鍙栬揣
+ switch (staProtocol.getSiteId()){
+ case 100:
+ index=32;
+ break;
+ case 101:
+ index=34;
+ break;
+ case 102:
+ index=38;
+ break;
+ case 103:
+ index=40;
+ break;
+ case 104:
+ index=44;
+ break;
+ case 105:
+ index=46;
+ break;
+ case 106:
+ index=50;
+ break;
+ case 107:
+ index=52;
+ break;
+ default:
+ return;
+ }
+ }else {
+ switch (staProtocol.getSiteId()){
+ case 100:
+ index=30;
+ break;
+ case 102:
+ index=36;
+ break;
+ case 104:
+ index=42;
+ break;
+ case 106:
+ index=48;
+ break;
+ default:
+ return;
+ }
+ }
+
+ OperateResult write = null;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ short textWrite = 1;// 浠诲姟瀹屾垚
+ if (staProtocol.getAgvTypeSign()>1){
+ textWrite = 0;// 浠诲姟澶嶄綅
+ }
+ write = siemensS7Net.Write("DB102." + index, textWrite);
+ if(write.IsSuccess){
+ writeCount=6;
+ }else {
+ writeCount++;
+ log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠ゅ悗璇诲彇澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }while (writeCount<5);
+
+ if (!write.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
+ log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愮珯鐐规暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+ log.info("杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠や笅鍙戠爜鍨涘畬鎴� 缁欒緭閫佺嚎鍐欎换鍔″畬鎴� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ }
+
+
+ }
private void write(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 = "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 (!clearPLCData(plcAddressWorkNo, plcAddressStaNo, staProtocol.getSiteId())) {
+ writeCount++;
+ continue; // 閲嶆柊灏濊瘯娓呴浂
+ }
+
+ // **鍐欏叆鏂颁换鍔�**
+ 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++;
+ }
+
+ // **鍐欏叆澶辫触澶勭悊**
+ 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 鏁版嵁骞堕獙璇佹竻闆舵槸鍚︽垚鍔�
+ */
+ private boolean clearPLCData(String plcAddressWorkNo, String plcAddressStaNo, int siteId) throws InterruptedException {
+ siemensS7Net.Write(plcAddressWorkNo, 0);
+ siemensS7Net.Write(plcAddressStaNo, (short) 0);
+ Thread.sleep(100); // 绛夊緟PLC璇嗗埆
+
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
+ if (readResult.IsSuccess) {
+ int readWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+ short readStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
+ if (readWorkNo == 0 && readStaNo == 0) {
+ return true; // 娓呴浂鎴愬姛
+ }
+ }
+
+ log.warn("绔欑偣 {} 娓呴浂澶辫触锛屽皾璇曢噸鏂版竻闆�...", siteId);
+ return false;
+ }
+
+ /**
+ * 鍐欏叆鏂颁换鍔″埌 PLC 骞堕獙璇佹槸鍚︽垚鍔�
+ */
+ private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException {
+ 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);
+ if (readResult.IsSuccess) {
+ int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+ short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
+ return workNo == staProtocol.getWorkNo().intValue() && staNo == staProtocol.getStaNo();
+ }
+ }
+ 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;
+ }
+
+ /**
+ * 澶勭悊鍐欏叆澶辫触鐨勬儏鍐�
+ */
+ private void handleWriteFailure(StaProtocol staProtocol, boolean writeFlag) {
+ if (!writeFlag) {
+ StaProtocol currentStaProtocol = station.get(staProtocol.getSiteId());
+ if (currentStaProtocol.getWorkNo() == 0 && currentStaProtocol.getStaNo() == 0) {
+ currentStaProtocol.setPakMk(true);
+ }
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�侾LC缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
+ slave.getId(), JSON.toJSON(currentStaProtocol)));
+ log.error("杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ワ紝PLC缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(currentStaProtocol));
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护鎴愬姛 [id:{1}] >>>>> {2}",
+ DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+ log.info("杈撻�佺嚎鍛戒护鎴愬姛 [id:{}] >>>>> {}", slave.getId(), JSON.toJSON(staProtocol));
+ }
+ }
+
+
+ private void write2(StaProtocol staProtocol) throws InterruptedException {
if (null == staProtocol) {
return;
}
@@ -417,28 +677,6 @@
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
array[1] = staProtocol.getStaNo();
-// OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
-
- //鏇存柊鍛戒护鏃ュ織
- CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
- CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
- CommandInfoLog commandInfoLog = new CommandInfoLog();
- if (commandInfo != null) {
- commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
- commandInfoLog.setId(null);
- }else {
- Date now = new Date();
- commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
- commandInfoLog.setCommandStatus(3);
- commandInfoLog.setStartTime(now);
- commandInfoLog.setExecuteTime(now);
- commandInfoLog.setCompleteTime(now);
- commandInfoLog.setDevice(SlaveType.Devp.toString());
- commandInfoLog.setWrkNo(9999);
- commandInfoLog.setTaskNo("9999");
- commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
- }
OperateResult writeResult;
//浠诲姟涓嬪彂娆℃暟
@@ -447,9 +685,6 @@
boolean writeFlag = false;
while(writeCount < 5){
writeResult = siemensS7Net.Write("DB100." + index*4, array); // 宸ヤ綔鍙枫�佺洰鏍囩珯
- //鏇存柊鎸囦护鏃ュ織
- commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
- commandInfoLogService.insert(commandInfoLog);
if(writeResult.IsSuccess){
Thread.sleep(200);
@@ -461,12 +696,15 @@
//浠诲姟鍛戒护鍐欏叆鎴愬姛
writeFlag = true;
log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+ Date now = new Date();
break;
} else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
writeCount++;
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
slave.getId(), JSON.toJSON(staProtocol),writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
}
} else {
writeCount++;
@@ -474,9 +712,6 @@
slave.getId(), JSON.toJSON(staProtocol), writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- //鏇存柊鎸囦护鏃ュ織
- commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
- commandInfoLogService.insert(commandInfoLog);
}
} else {
writeCount++;
@@ -484,9 +719,6 @@
slave.getId(), JSON.toJSON(staProtocol),writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- //鏇存柊鎸囦护鏃ュ織
- commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
- commandInfoLogService.insert(commandInfoLog);
}
Thread.sleep(200);
}
@@ -501,12 +733,12 @@
log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
//閲嶆柊娣诲姞鏁版嵁鍒颁换鍔¢槦鍒�
- boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(3, staProtocol));
read();//璇诲彇1娆¤澶囩姸鎬�
return;
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ //log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
Integer siteId = staProtocol.getSiteId();
staProtocol = station.get(siteId);
@@ -514,13 +746,6 @@
staProtocol.setPakMk(true);
}
- //鏇存柊浠诲姟姝ュ簭
- TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
- if (taskWrk != null) {
- taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
- taskWrkService.updateById(taskWrk);
- }
}
}
--
Gitblit v1.9.1