From 36485d6d285438c2ccfa5c8352ab8b3fd831bed0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 07 四月 2026 16:56:42 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java | 112 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d6c4e9c..1d424f4 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -7,7 +7,6 @@
import com.alibaba.fastjson.JSON;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.DateUtils;
-import com.zy.acs.framework.exception.CoolException;
import com.zy.asrs.entity.Devp;
import com.zy.asrs.service.DevpService;
import com.zy.asrs.utils.SpringContextUtil;
@@ -16,6 +15,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.constant.*;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.TaskType;
import com.zy.core.model.DevpSlave;
@@ -40,45 +40,16 @@
public class SiemensDevpThread implements Runnable, DevpThread {
private DevpSlave slave;
+
private SiemensS7Net siemensS7Net;
+
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- private short heartBeatVal = 1;
-
- public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(1001);
- add(1002);
- add(1003);
- add(1004);
- add(1005);
- add(1006);
- add(1007);
-
- }};
-
-
- public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1);
- }};
-
-
- /**
- * 鏉＄爜鏁伴噺
- */
- private int barcodeSize = 1;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
}
- private ArrayList<Integer> getStaNo() {
- switch (slave.getId()) {
- case 1:
- return staNos1;
- default:
- throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
- }
- }
@Override
@SuppressWarnings("InfiniteLoopStatement")
@@ -103,8 +74,6 @@
default:
break;
}
- // 蹇冭烦
-// heartbeat();
Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
@@ -117,7 +86,7 @@
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
private void initSite() {
- ArrayList<Integer> staNos = getStaNo();
+ List<Integer> staNos = slave.getStaNos();
// 绔欑偣缂栧彿
for (Integer siteId : staNos) {
StaProtocol staProtocol = station.get(siteId);
@@ -164,10 +133,9 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- ArrayList<Integer> staNos = getStaNo();
+ List<Integer> staNos = slave.getStaNos();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 2));
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.0", (short) (staNoSize * 4));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(StationStatusField.ALL.buildAddress(), (short) (staNoSize * StationStatusField.ALL.getByteLength()));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -177,12 +145,9 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- boolean[] status = null;
- if (i < 7) {
- staProtocol.setWorkNo((int) siemensS7Net.getByteTransform().TransInt16(result2.Content, i * 4));
- staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(result2.Content, i * 4 + 2));
- }
- status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 2, 2);
+ staProtocol.setWorkNo((int) siemensS7Net.getByteTransform().TransUInt32(result.Content, i * StationStatusField.ALL.getByteLength()));
+ staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * StationStatusField.ALL.getByteLength() + 4));
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * StationStatusField.ALL.getByteLength() + 6, 2);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
@@ -200,13 +165,12 @@
//鏉＄爜鎵弿鍣�
- ArrayList<Integer> barcodeList = BarcodeList;
- OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.102", (short) (barcodeList.size() * 8));
+ List<Integer> barcodeArr = slave.getBarcodeArr();
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read(DeviceField.BARCODE.buildAddress(), (short) (barcodeArr.size() * DeviceField.BARCODE.getByteLength()));
if (result5.IsSuccess) {
- for (int i = 0; i < barcodeList.size(); i++) {
- Integer barcodeId = barcodeList.get(i);
- String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * 8, 8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+ for (int i = 0; i < barcodeArr.size(); i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * DeviceField.BARCODE.getByteLength(), DeviceField.BARCODE.getByteLength(), "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeArr.get(i));
if (Cools.isEmpty(barcode)) {
barcodeThread.clearBarcode();
} else {
@@ -214,6 +178,48 @@
barcodeThread.setBarcode(barcode);
log.info("鏂欑鐮侊細{}", barcode);
}
+ }
+ }
+ }
+
+ List<Integer> staNosError = slave.getStaNosError();
+ OperateResultExOne<byte[]> resultError = siemensS7Net.Read(DeviceField.DIMENSION_WORD.buildAddress(), (short) (staNoSize * DeviceField.DIMENSION_WORD.getByteLength()));
+ if (resultError.IsSuccess) {
+ for (int i = 0; i < staNosError.size(); i++) {
+ Integer siteId = staNosError.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i * DeviceField.DIMENSION_WORD.getByteLength(), DeviceField.DIMENSION_WORD.getByteLength());
+ 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]);// 鎵爜澶辫触
+ }
+ }
+
+ //plc鏁呴殰
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read(PlcAlarmDefinition.ALL.buildAddress(), (short) (staNoSize * PlcAlarmDefinition.ALL.getByteLength()));
+ if (resultErr2.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * PlcAlarmDefinition.ALL.getByteLength(), PlcAlarmDefinition.ALL.getByteLength());
+ StaProtocol staProtocol = station.get(siteId);
+ if (staProtocol != null) {
+ 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]);
}
}
}
@@ -253,7 +259,7 @@
if (null == staProtocol) {
return;
}
- ArrayList<Integer> staNos = getStaNo();
+ List<Integer> staNos = slave.getStaNos();
int index = staNos.indexOf(staProtocol.getSiteId());
OperateResult write = null;
@@ -261,9 +267,9 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100." + index * 4, staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
+ write = siemensS7Net.Write(TaskField.TASK_NUMBER.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION + (index * TaskField.ALL.getByteLength() + TaskField.TASK_NUMBER.getOffset()), staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (index * 4 + 2), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ write1 = siemensS7Net.Write(TaskField.DEST_STATION.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION + (index * TaskField.ALL.getByteLength() + TaskField.DEST_STATION.getOffset()), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
if (write.IsSuccess && write1.IsSuccess) {
log.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
break;
--
Gitblit v1.9.1