From 5879527ed5b7349ce7fd7cd3fe92c81307646b21 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 19 九月 2025 11:09:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 269 ++++++++++++++++++++++++-----------------------------
1 files changed, 121 insertions(+), 148 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c0277e9..5c7b264 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
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;
@@ -14,7 +15,7 @@
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.DevpType.DevpWorkType;
+import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
@@ -42,8 +43,9 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- public static boolean is = true;
-
+// public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+//
+// }};
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(101);add(102);add(103);add(104);
add(105);add(106);add(107);add(108);
@@ -51,16 +53,21 @@
add(206);add(207);add(208);add(209);add(210);
add(211);add(212);
}};
-// public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-// add(1040);add(1041);add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);
-// add(2010);add(2011);add(2012);add(2013);add(2014);add(2015);add(2016);add(2017);
-// add(3010);add(3011);add(3012);add(3013);add(3014);add(3015);add(3016);add(3017);
-// }};
+
+ public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
+ add(0);add(1);add(2);add(3);
+ add(4);add(5);add(6);add(7);
+ }};
+
+ public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
+ add(102);add(104);add(106);add(108);
+ add(203);add(206);add(209);add(212);
+ }};
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 8;
+ private int barcodeSize = 6;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -83,8 +90,6 @@
switch (slave.getId()) {
case 1:
return staNos1;
-// case 2:
-// return staNos2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -108,8 +113,8 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- writeD((StaProtocol)task.getData(),1);
-// log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
+ write((StaProtocol)task.getData());
+ log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
default:
break;
@@ -136,18 +141,15 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo((short) 0); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short) 0); // 鐩爣绔�
- staProtocol.setState((short) 0); // 妯″紡鐘舵�� 0鍋滄満锛�=1鎵嬪姩锛�=2鑷姩锛�=3鏁呴殰
- staProtocol.setWorkIo((short) 0);
- staProtocol.setRequestIo((short) 0);
- staProtocol.setTrayIo((short) 0);
- staProtocol.setLocIo((short) 0);
- staProtocol.setBarcode("-");
- staProtocol.setWeightIo(0.0);
- staProtocol.setMode((short) 0);
+ staProtocol.setWorkNo(0); // ID
+ staProtocol.setAutoing(false); // 鑷姩
+ staProtocol.setLoading(false); // 鏈夌墿
+ staProtocol.setInEnable(false); // 鍙叆
+ staProtocol.setOutEnable(false); // 鍙嚭
+ staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
+ staProtocol.setStaNo((short) 0); // 鐩爣绔�
- if (!staProtocol.isPakMk() && staProtocol.workType == DevpWorkType.IDLE) {
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
}
@@ -181,35 +183,103 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*66));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setSiteId(siteId);
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i*66 + 8)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 12)); // 鐩爣绔�
- staProtocol.setState(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 14)); // 妯″紡鐘舵�� 0鍋滄満锛�=1鎵嬪姩锛�=2鑷姩锛�=3鏁呴殰
- staProtocol.setWorkIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 16));
- staProtocol.setRequestIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 18));
- staProtocol.setTrayIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 20));
- staProtocol.setLocIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 22));
- staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content,i*66 + 24,16, "UTF-8").trim());
-// staProtocol.setWeightIo(siemensS7Net.getByteTransform().TransDouble(result.Content,i*66 + 40));
- staProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 44));
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*2, 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.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
- if (!staProtocol.isPakMk() && (staProtocol.workType == DevpWorkType.IDLE || staProtocol.isPakReset())) {
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
}
}
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
+ if (result1.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo((int) siemensS7Net.getByteTransform().TransInt16(result1.Content, i*4)); // 宸ヤ綔鍙�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result1.Content, i*4 + 2)); // 鐩爣绔�
+ }
+ }
+
+ //鏉＄爜鎵弿鍣�
+ ArrayList<Integer> barcodeList = BarcodeList;
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.100", (short) (barcodeList.size() * 10));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeList.size(); i++) {
+ Integer barcodeId = barcodeList.get(i);
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10+2,8, "UTF-8");
+ barcode = barcode.trim();
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+ }
+ //澶栧舰妫�娴�
+ ArrayList<Integer> staNoErrs = staNosErrList;
+ int staNoErrsSize = staNoErrs.size();
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.180", (short) (staNoErrsSize*8));
+ if (resultErr.IsSuccess){
+ for (int i = 0;i<3;i++){
+ Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
+ StaProtocol staProtocol = station.get(siteId);
+ 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[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
+// if (resultErr2.IsSuccess) {
+// for (int i = 0; i < staNoSize; i++) {
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.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]);
+//
+// }
+// }
+
+
if (result.IsSuccess) {
+
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
try {
List<BasDevp> basDevps = new ArrayList<>();
@@ -217,6 +287,7 @@
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
}
+
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
@@ -244,15 +315,16 @@
ArrayList<Integer> staNos = getStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
OperateResult write = null;
- OperateResult write1 = null;
- OperateResult write2 = null;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100." + index*66, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (index*66+4), staProtocol.getStaNo()); // 鐩爣绔�
- if(write.IsSuccess && write1.IsSuccess){
+ short[] data = new short[2];
+ data[0] = staProtocol.getWorkNo().shortValue();
+ data[1] = staProtocol.getStaNo();
+
+ write = siemensS7Net.Write("DB100." + index*4, data);
+ if(write.IsSuccess){
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
break;
}
else {
@@ -274,114 +346,15 @@
}
}
- private void writeD(StaProtocol staProtocol,Integer count)throws InterruptedException{
-
- boolean reset = true;
- if (null == staProtocol) {
- return;
- }
- staProtocol = staProtocol.clone();
- short oriWrkNo = staProtocol.getWorkNo();
- short oriStaNo = staProtocol.getStaNo();
- ArrayList<Integer> staNos = getStaNo();
- int index = staNos.indexOf(staProtocol.getSiteId());
-
-
- if(writeWrk(staProtocol,1)){
-
- int whileCount = 0;
- OperateResult write3 = siemensS7Net.Write("DB100." + (index*66+6), (short) 1);
- if (write3.IsSuccess){
- News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+1+"]");
- Thread.sleep(100);
- do {
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100."+(index*66 +6), (short) 2);
- short mk = siemensS7Net.getByteTransform().TransInt16(result2.Content, 0);
- if (mk == 2){
- OperateResult write5 = siemensS7Net.Write("DB100." + index*66, 0); // 宸ヤ綔鍙�
- Thread.sleep(100);
- OperateResult write6 = siemensS7Net.Write("DB100." + (index*66+4), (short) 0); // 鐩爣绔�
- Thread.sleep(100);
- OperateResult write4 = siemensS7Net.Write("DB100." + (index*66+6), (short) 0);
- reset = false;
- if (write4.IsSuccess && write5.IsSuccess && write6.IsSuccess){
- News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100."+(index*66), (short) 8);
- Integer wrkNo1 = siemensS7Net.getByteTransform().TransInt32(result1.Content, 0);
- short staNo1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 4);
- short mk1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 6);
- if (wrkNo1 != 0 || staNo1 !=0 || mk1 !=0){
- whileCount++;
- News.info("澶嶄綅澶辫触,杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
- }else {
- News.info("杈撻�佺嚎澶嶄綅瀹屾垚");
- break;
- }
-
- }
- }else if (reset && mk == 0 ){
- OperateResult write7 = siemensS7Net.Write("DB100." + (index*66+6), (short) 1);
- News.info("鍥炶1澶辫触锛岃緭閫佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"1"+"]");
- Thread.sleep(100);
- whileCount++;
- }else {
- whileCount++;
- }
- }while (whileCount <10);
+ // 鏇存柊鍏ュ嚭搴撴ā寮�
+ private void updateIoMode() throws InterruptedException {
+ if (this.ioModeOf2F != IoModeType.NONE) {
+ if (!siemensS7Net.Write("DB107.180", this.ioModeOf2F.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
- }else {
- log.error("杈撻�佸懡浠や笅鍙戝け璐�"+JSON.toJSONString(staProtocol));
}
-
-
-
}
-
- private boolean writeWrk(StaProtocol staProtocol,Integer count)throws InterruptedException {
-
- if (null == staProtocol) {
- return false;
- }
- short oriWrkNo = staProtocol.getWorkNo();
- short oriStaNo = staProtocol.getStaNo();
-
- ArrayList<Integer> staNos = getStaNo();
- int index = staNos.indexOf(staProtocol.getSiteId());
- do {
- log.info("杈撻�侀�掑綊娆℃暟:" + count);
- OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(100);
- OperateResult write2 = siemensS7Net.Write("DB100." + (index * 66 + 4), staProtocol.getStaNo()); // 鐩爣绔�
- if (write1.IsSuccess && write2.IsSuccess) {
- News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:" + slave.getId() + "] >>>>>" + "[" + staProtocol.getWorkNo() + "," + staProtocol.getStaNo() + "]");
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100." + (index * 66), (short) 6);
- Integer wrkNo = siemensS7Net.getByteTransform().TransInt32(result.Content, 0);
- short staNo = siemensS7Net.getByteTransform().TransInt16(result.Content, 4);
- if (!(oriWrkNo == wrkNo) || oriStaNo != staNo) {
- if (count >= 5) {
- log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), count);
- return false;
- }
- count++;
- }else {
- return true;
- }
- }
- }while (count <=5);
-
-
- return true;
- }
-
-// // 鏇存柊鍏ュ嚭搴撴ā寮�
-// private void updateIoMode() throws InterruptedException {
-// if (this.ioModeOf2F != IoModeType.NONE) {
-// if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-// OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-// News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
-// }
-// }
-// }
/**
* 蹇冭烦
--
Gitblit v1.9.1