From 6d11821ff01c5bfb1c07153772a8efce774ab5d5 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期四, 28 八月 2025 08:14:34 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 47 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..9d87197 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -7,12 +7,9 @@
import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasRgvMap;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.BasRgvMapService;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -28,7 +25,10 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -48,15 +48,11 @@
//
// }};
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(121);add(122);add(123);add(124);add(125);
- add(126);
- add(221);add(222);add(223);add(224);add(225);
- add(226);add(227);add(228);add(229);add(230);
- add(231);
- add(411);add(412);add(413);add(414);
+ add(101);add(102);add(103);
+ add(104);add(105);
}};
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(101);add(102);add(103);
add(104);add(105);add(106);add(107);
add(108);add(109);
@@ -66,34 +62,35 @@
add(208);add(209);add(210);add(211);
add(401);add(402);add(403);add(404);
- }};
+ }};*/
public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
add(1); add(2);add(3);add(4);add(5);
}};
- public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
+ /* public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
add(6);add(7);add(8);add(9);
add(10); add(11); add(12); add(13);
- }};
- public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
+ }};*/
+ /*public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
add(102); add(105);add(107);add(109);
add(203);add(205);add(208);add(211);
- }};
+ }};*/
public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
- add(123);
- add(223);add(225);add(228);add(231);
+// add(101);
+// add(102);add(103);add(104);add(105);
+ add(102);
}};
public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
- add(223);add(225);add(228);add(231);
+ add(101);add(102);add(103);add(104);add(105);
}};
- public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
+ /*public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
add(102);add(105);add(107);add(109);
add(203);add(205);add(208);add(211);
- }};
+ }};*/
private Integer count=0;
@@ -123,8 +120,8 @@
switch (slave.getId()) {
case 1:
return staNosErrList1;
- case 2:
- return staNosErrList2;
+ /*case 2:
+ return staNosErrList2;*/
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -134,8 +131,8 @@
switch (slave.getId()) {
case 1:
return staNoWeight1;
- case 2:
- return staNoWeight2;
+ /*case 2:
+ return staNoWeight2;*/
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -145,8 +142,8 @@
switch (slave.getId()) {
case 1:
return staNos1;
- case 2:
- return staNos2;
+ /*case 2:
+ return staNos2;*/
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -155,8 +152,8 @@
switch (slave.getId()) {
case 1:
return BarcodeList1;
- case 2:
- return BarcodeList2;
+ /*case 2:
+ return BarcodeList2;*/
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -268,20 +265,23 @@
// updateIoMode();
// if (slave.getId()==1) return;
- ArrayList<Integer> staNos = getStaNo();
+ ArrayList<Integer> staNos = staNos1;
+ int staNoSize = staNos1.size();
+ //ArrayList<Integer> staNos = getStaNo();
ArrayList<Integer> staNosErrList = getStaNoErr();
ArrayList<Integer> staNoWeight = getStaNoWeight();
- int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (500 * 8));
+ //int staNoSize = staNos.size();
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
OperateResultExOne<byte[]> resultWeight = null;
- if(staNoWeight.size()>4){
+ /*if(staNoWeight.size()>4){
resultWeight = siemensS7Net.Read("DB102.0", (short) (8 * 4));
}else{
resultWeight = siemensS7Net.Read("DB102.0", (short) (4 * 4));
}
- OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short) (4 * 4));
+ OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short) (4 * 4));*/
- if (result.IsSuccess && resultWeight.IsSuccess) {
+ //if (result.IsSuccess && resultWeight.IsSuccess) {
+ if (result.IsSuccess) {
int j = 0;
for(int i = 0 ; i<staNoSize;i++){
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -294,8 +294,8 @@
boolean[] status = null;
int offset = getOffsetFromSiteId(siteId);//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset)); // 宸ヤ綔鍙�
- if (staNoWeight.contains(siteId)) {
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
+ /*if (staNoWeight.contains(siteId)) {
if(staNoWeight.size() == 4){
staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
j = j + 4;
@@ -304,9 +304,9 @@
j = j + 4;
}
- }
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4)); // 鐩爣绔�
- status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
+ }*/
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
+ status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 1);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -325,7 +325,7 @@
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeList = getBarcodeList();
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602", (short) (barcodeList.size() * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeList.size(); i++) {
Integer barcodeId = barcodeList.get(i);
@@ -339,11 +339,12 @@
//澶栧舰妫�娴�
ArrayList<Integer> staNoErrs = staNosErrList;
int staNoErrsSize = staNoErrs.size();
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2808", (short) (staNoErrsSize * 4));
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.702", (short) (staNoErrsSize * 7));
if (resultErr.IsSuccess) {
for (int i = 0; i < staNoErrsSize; i++) {
Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 7, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
@@ -440,17 +441,17 @@
return;
}
ArrayList<Integer> staNos = getStaNo();
-// int index = staNos.indexOf(staProtocol.getSiteId());
- int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
+ int index = staNos.indexOf(staProtocol.getSiteId());
+// int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
OperateResult write = null;
OperateResult write1 = null;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ write = siemensS7Net.Write("DB100." + index * 6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
if(write.IsSuccess && write1.IsSuccess){
log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
break;
--
Gitblit v1.9.1