From 09f634c766e8daeeb687d48fd645f225afc3c082 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 25 七月 2025 16:41:22 +0800
Subject: [PATCH] #优
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 126 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4055c3b..c6498dd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -95,6 +95,16 @@
add(203);add(205);add(208);add(211);
}};
+ public static final ArrayList<Integer> staNosInList1 = new ArrayList<Integer>() {{
+ add(122);
+ add(222);add(224);add(227);add(230);
+ }};
+
+ public static final ArrayList<Integer> staNosInList2 = new ArrayList<Integer>() {{
+ add(101); add(104);add(106);add(108);
+ add(202);add(204);add(207);add(210);
+ }};
+
private Integer count=0;
/**
@@ -117,6 +127,17 @@
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
+ }
+
+ private ArrayList<Integer> getStaNoIn() {
+ switch (slave.getId()) {
+ case 1:
+ return staNosInList1;
+ case 2:
+ return staNosInList2;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
}
private ArrayList<Integer> getStaNoErr() {
@@ -182,6 +203,9 @@
case 2:
write((StaProtocol)task.getData());
log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
+ break;
+ case 3:
+ write2((StaProtocol)task.getData());
break;
default:
break;
@@ -271,6 +295,7 @@
ArrayList<Integer> staNos = getStaNo();
ArrayList<Integer> staNosErrList = getStaNoErr();
ArrayList<Integer> staNoWeight = getStaNoWeight();
+ ArrayList<Integer> staNosInList = getStaNoIn();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (500 * 8));
OperateResultExOne<byte[]> resultWeight = null;
@@ -355,6 +380,23 @@
}
}
+ //鍏ュ簱婊¤冻
+ ArrayList<Integer> staNosIns = staNosInList;
+ int staNosInSize = staNosIns.size();
+ OperateResultExOne<byte[]> resultIn = siemensS7Net.Read("DB1000.0", (short) (staNosInSize * 6));
+ if(resultIn.IsSuccess){
+ for (int i = 0; i < staNosInSize; i++) {
+ Integer siteId = staNosIns.get(i);
+ if(siteId == 202){
+ StaProtocol staProtocol1 = station.get(siteId);
+ }
+ StaProtocol staProtocol = station.get(siteId);
+ staProtocol.setStamp( siemensS7Net.getByteTransform().TransInt16(resultIn.Content, i*6));
+ }
+ }
+
+
+
// //plc鏁呴殰
// OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.1728", (short) (staNoSize*4));
// if (resultErr2.IsSuccess) {
@@ -432,9 +474,43 @@
}
- /**
- * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
- */
+
+ private void write2(StaProtocol staProtocol) throws InterruptedException {
+ OperateResult write = null;
+ int writeCount = 0;
+ ArrayList<Integer> staNosInList = getStaNoIn();
+
+ ArrayList<Integer> staNosIns = staNosInList;
+ int staNosInSize = staNosIns.size();
+ OperateResultExOne<byte[]> resultIn = siemensS7Net.Read("DB1000.0", (short) (staNosInSize * 6));
+ int offset = 0;
+ if(resultIn.IsSuccess){
+ for (int i = 0; i < staNosInSize; i++) {
+ Integer siteId = staNosIns.get(i);
+ if(staProtocol.getSiteId().equals(siteId)){
+ offset = i*6 + 2;
+ break;
+ }
+ }
+ }
+ do {
+ write = siemensS7Net.Write("DB1000.0" + offset,staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+
+ if(write.IsSuccess ){
+ log.error("鍐欏叆宸ヤ綔鍙穥}",staProtocol.getWorkNo());
+ log.error("鍐欏叆杈撳懡浠ゆ垚鍔熴�傝緭閫佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}", slave.getId(), writeCount);
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("鍐欏叆鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }while (writeCount<5);
+ }
+
+ /**
+ * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+ */
private void write(StaProtocol staProtocol) throws InterruptedException {
if (null == staProtocol) {
return;
@@ -445,20 +521,52 @@
OperateResult write = null;
OperateResult write1 = null;
+ boolean flag1 = false;
+ boolean flag2 = false;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
- if(write.IsSuccess && write1.IsSuccess){
+ if (!flag1) {
+ write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ if (write.IsSuccess) {
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100." + offset, (short) 2);
+ if (result.IsSuccess) {
+ if (staProtocol.getWorkNo().equals(siemensS7Net.getByteTransform().TransInt16(result.Content, (short) 0))) {
+ flag1 = true;
+ }
+ }
+ }
+ }
+ if (!flag2) {
+ Thread.sleep(200);
+ write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ if (write1.IsSuccess) {
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100." + (offset+4), (short) 2);
+ if (result2.IsSuccess) {
+ if (staProtocol.getStaNo().equals(siemensS7Net.getByteTransform().TransInt16(result2.Content, (short) 0))) {
+ flag2 = true;
+ }
+ }
+ }
+ }
+ if (flag1 && flag2) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
break;
- }
- else {
+ } else {
writeCount++;
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
+// write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+// Thread.sleep(200);
+// write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+// if(write.IsSuccess && write1.IsSuccess){
+// log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+// break;
+// }
+// else {
+// writeCount++;
+// log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+// }
}while (writeCount<5);
if (!write.IsSuccess) {
--
Gitblit v1.9.1