From 6b8b5a067ccfb86e3434f66e2471255d87f2ecd7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 19:18:21 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 194 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 145 insertions(+), 49 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 301ae9e..873297c 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -3,9 +3,9 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.acs.common.utils.News;
-import com.zy.acs.conveyor.core.constant.DeviceField;
-import com.zy.acs.conveyor.core.constant.PlcAlarmDefinition;
-import com.zy.acs.conveyor.core.constant.StationStatusField;
+import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.conveyor.core.constant.*;
+import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.service.DevpS7Service;
@@ -36,6 +36,9 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station;
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
private static final int WRITE_RETRY_MAX = 5;
@@ -125,6 +128,10 @@
// 璇诲彇PLC鏁呴殰
readPlcAlarms(staNos, staNoSize);
+ // 璇诲彇瀹夊叏浜や簰淇″彿
+ readSaleSingle(slave.getPutSta(), slave.getTakeSta());
+
+
// 瀹氭湡鏇存柊鏁版嵁搴擄紙闄嶄綆棰戠巼锛�
updateDatabaseIfNeeded();
}
@@ -138,9 +145,13 @@
staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(
content, offset + StationStatusField.FINAL_TARGET.getOffset()));
- boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ boolean[] status0 = siemensS7Net.getByteTransform().TransBool(
content, offset + StationStatusField.STATUS_WORD.getOffset(),
StationStatusField.STATUS_WORD.getByteLength());
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ content, offset + StationStatusField.STATUS_WORD.getOffset(),
+ 1);
staProtocol.setAutoing(status[0]);
staProtocol.setLoading(status[1]);
@@ -150,22 +161,36 @@
staProtocol.setFullPlt(status[5]);
staProtocol.setHigh(status[6]);
staProtocol.setLow(status[7]);
+ boolean[] status2 = siemensS7Net.getByteTransform().TransBool(
+ content, offset + StationStatusField.STATUS_WORD.getOffset() + 1,
+ 1);
+ staProtocol.setMid(status2[0]);
+ staProtocol.setStartup(status2[1]);
+ staProtocol.setSegApply(status2[2]);
+ staProtocol.setApplyErr(status2[3]);
+ if (!status2[1] && !status[1]) {
+ staProtocol.setStartUpFlag(true);
+ }
+ for (int i = 0; i < 8; i++) {
+ if (status0[i + 8] != status2[i]) {
+ log.info("鐘舵�佺爜涓嶄竴鑷� [id:{}] [i:{}] [status0:{}] [status2:{}]", slave.getId(), i, status0[i], status2[i]);
+ }
+ }
}
/**
* 璇诲彇鏉＄爜淇℃伅
*/
private void readBarcodes() {
- List<Integer> barcodeArr = slave.getBarcodeArr();
- if (barcodeArr == null || barcodeArr.isEmpty()) {
+ if (slave.getBarcode() == null || !slave.getBarcode()) {
return;
}
OperateResultExOne<byte[]> result = siemensS7Net.Read(
DeviceField.BARCODE.buildAddress(),
- (short) (barcodeArr.size() * DeviceField.BARCODE.getByteLength()));
+ (short) (DeviceField.BARCODE.getByteLength() * DeviceField.BARCODE.getArrLength()));
if (!result.IsSuccess) {
log.warn("璇诲彇鏉＄爜澶辫触 [id:{}]", slave.getId());
@@ -173,48 +198,57 @@
}
byte[] content = result.Content;
- for (int i = 0; i < barcodeArr.size(); i++) {
+ for (int i = 0; i < DeviceField.BARCODE.getArrLength(); i++) {
+ int[] seg = DeviceField.BARCODE.getSeg();
+ int staNo = siemensS7Net.getByteTransform().TransInt16(
+ content, seg[0] + i * DeviceField.BARCODE.getByteLength());
String barcode = siemensS7Net.getByteTransform().TransString(
- content, i * DeviceField.BARCODE.getByteLength(),
- DeviceField.BARCODE.getByteLength(), "UTF-8");
+ content, seg[1] + i * DeviceField.BARCODE.getByteLength(),
+ DeviceField.BARCODE.getByteLength()-seg[1] , "UTF-8").trim();
- if (!Cools.isEmpty(barcode)) {
- StaProtocol staProtocol = station.get(barcodeArr.get(i));
+ if (!Cools.isEmpty(barcode) && !barcode.contains("Default") && !barcode.contains("Error") && staNo != 0) {
+ StaProtocol staProtocol = station.get(staNo);
if (staProtocol == null) {
- log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), barcodeArr.get(i));
+ log.warn("鎵爜绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNo);
continue;
}
staProtocol.setBarcode(barcode);
- News.info("鏂欑鐮侊細{}", barcode);
+ //News.info("鏂欑鐮侊細{}", barcode);
}
}
}
/**
- * 璇诲彇鏉＄爜淇℃伅
+ * 璇诲彇閲嶉噺淇℃伅
*/
private void readWeight() {
- List<Integer> weightArr = slave.getWeightArr();
- if (weightArr == null || weightArr.isEmpty()) {
+ if (slave.getWeight() == null || !slave.getWeight()) {
return;
}
OperateResultExOne<byte[]> result = siemensS7Net.Read(
DeviceField.WEIGHT.buildAddress(),
- (short) (weightArr.size() * DeviceField.WEIGHT.getByteLength()));
+ (short) (DeviceField.WEIGHT.getArrLength() * DeviceField.WEIGHT.getByteLength()));
if (!result.IsSuccess) {
log.warn("璇诲彇閲嶉噺澶辫触 [id:{}]", slave.getId());
return;
}
- for (int i = 0; i < weightArr.size(); i++) {
- StaProtocol staProtocol = station.get(weightArr.get(i));
- if (staProtocol == null) {
- log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), weightArr.get(i));
- continue;
+ byte[] content = result.Content;
+ for (int i = 0; i < DeviceField.WEIGHT.getArrLength(); i++) {
+ int[] seg = DeviceField.WEIGHT.getSeg();
+ int staNo = siemensS7Net.getByteTransform().TransInt16(
+ content, seg[0] + i * DeviceField.WEIGHT.getByteLength());
+ Double weight = (double) siemensS7Net.getByteTransform().TransSingle(
+ content, seg[1] + i * DeviceField.WEIGHT.getByteLength());
+ if (!Cools.isEmpty(weight) && staNo != 0) {
+ StaProtocol staProtocol = station.get(staNo);
+ if (staProtocol == null) {
+ log.warn(" [id:{}] [staNo:{}]", slave.getId(), staNo);
+ continue;
+ }
+ staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(4, RoundingMode.HALF_UP).doubleValue());
}
- double weight = siemensS7Net.getByteTransform().TransSingle(result.Content, i * DeviceField.WEIGHT.getByteLength());
- staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(4, RoundingMode.HALF_UP).doubleValue());
}
}
@@ -222,14 +256,13 @@
* 璇诲彇澶栧舰妫�娴嬮敊璇�
*/
private void readDimensionErrors() {
- List<Integer> staNosError = slave.getStaNosError();
- if (staNosError == null || staNosError.isEmpty()) {
+ if (slave.getStaNosError() == null || !slave.getStaNosError()) {
return;
}
OperateResultExOne<byte[]> result = siemensS7Net.Read(
DeviceField.DIMENSION_WORD.buildAddress(),
- (short) (staNosError.size() * DeviceField.DIMENSION_WORD.getByteLength()));
+ (short) (DeviceField.DIMENSION_WORD.getArrLength() * DeviceField.DIMENSION_WORD.getByteLength()));
if (!result.IsSuccess) {
log.warn("璇诲彇澶栧舰妫�娴嬮敊璇け璐� [id:{}]", slave.getId());
@@ -237,30 +270,35 @@
}
byte[] content = result.Content;
- for (int i = 0; i < staNosError.size(); i++) {
- Integer siteId = staNosError.get(i);
- StaProtocol staProtocol = station.get(siteId);
- if (staProtocol == null){
- log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNosError.get(i));
- continue;
+ for (int i = 0; i < DeviceField.DIMENSION_WORD.getArrLength(); i++) {
+ int[] seg = DeviceField.DIMENSION_WORD.getSeg();
+ int staNo = siemensS7Net.getByteTransform().TransInt16(
+ content, seg[0]);
+ if (staNo != 0) {
+ StaProtocol staProtocol = station.get(staNo);
+ if (staProtocol == null) {
+ log.warn("寮傚父绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNo);
+ continue;
+ }
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ content, seg[1] + i * DeviceField.DIMENSION_WORD.getByteLength(),
+ 1);
+//鏈娇鐢紝棰勭暀
+// boolean[] status1 = siemensS7Net.getByteTransform().TransBool(
+// content, seg[1]+i * DeviceField.DIMENSION_WORD.getByteLength()+1,
+// 1);
+
+ staProtocol.setLeftErr(status[0]);
+ staProtocol.setRightErr(status[1]);
+ staProtocol.setFrontErr(status[2]);
+ staProtocol.setBackErr(status[3]);
+ staProtocol.setHighErr(status[4]);
+ staProtocol.setLoadErr(status[5]);
+ staProtocol.setWeightErr(status[6]);
+ staProtocol.setBarcodeErr(status[7]);
}
- short i1 = siemensS7Net.getByteTransform().TransInt16(
- content, 0);
- boolean[] status = siemensS7Net.getByteTransform().TransBool(
- content, 2+i * DeviceField.DIMENSION_WORD.getByteLength(),
- 1);
- boolean[] status1 = siemensS7Net.getByteTransform().TransBool(
- content, 2+i * DeviceField.DIMENSION_WORD.getByteLength()+1,
- 1);
- 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]);
}
}
@@ -301,6 +339,64 @@
}
/**
+ * 璇诲彇瀹夊叏浜や簰淇″彿
+ */
+ private void readSaleSingle(List<DevpSlave.Sta> putSta, List<DevpSlave.Sta> takeSta) {
+ int staNoSize = putSta.size();
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(
+ SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.buildAddress(),
+ (short) (staNoSize * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength()));
+
+
+ if (!result.IsSuccess) {
+ log.warn("璇诲彇PLC瀹夊叏浜や簰淇℃伅寮傚父 [id:{}]", slave.getId());
+ return;
+ }
+
+ byte[] content = result.Content;
+ for (int i = 0; i < staNoSize; i++) {
+ Integer put = putSta.get(i).getStaNo();
+ Integer take = takeSta.get(i).getStaNo();
+ StaProtocol staProtocolPut = station.get(put);
+ StaProtocol staProtocolTake = station.get(take);
+ if (staProtocolPut == null || staProtocolTake == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{},{}]", slave.getId(), put, take);
+ continue;
+ }
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(
+ content, i * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength(), 1);
+
+ boolean[] status2 = siemensS7Net.getByteTransform().TransBool(
+ content, i * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength() + 2, 1);
+
+ staProtocolPut.setHeartbeat(status[0]);
+ staProtocolPut.setAllowTake(status[1]);
+ staProtocolPut.setAllowPut(status[2]);
+ staProtocolPut.setInComplete(status[3]);
+ staProtocolPut.setOutComplete(status[4]);
+
+ staProtocolTake.setHeartbeat(status2[0]);
+ staProtocolTake.setAllowTake(status2[1]);
+ staProtocolTake.setAllowPut(status2[2]);
+ staProtocolTake.setInComplete(status2[3]);
+ staProtocolTake.setOutComplete(status2[4]);
+ //
+ if (status[3]) {
+ staProtocolPut.setSafeSignal(new SafeSignal(i, false, true));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolPut);
+ News.info("瀹夊叏浜や簰淇″彿澶嶄綅 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
+ }
+ if (status2[4]) {
+ staProtocolTake.setSafeSignal(new SafeSignal(i, false, false));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolTake);
+ News.info("瀹夊叏浜や簰淇″彿澶嶄綅 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
+ }
+
+ }
+ }
+
+ /**
* 鎸夐渶鏇存柊鏁版嵁搴擄紙闄嶄綆鏇存柊棰戠巼锛�
*/
private void updateDatabaseIfNeeded() {
--
Gitblit v1.9.1