From 4ab8c2aa4996e2d16fe0a214e2a41a4c77378d35 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 07 四月 2026 16:22:37 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 104 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 46 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 cbf2b80..090619e 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
@@ -10,6 +10,7 @@
import com.zy.acs.conveyor.core.cache.MessageQueue;
import com.zy.acs.conveyor.core.cache.OutputQueue;
import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.conveyor.core.constant.StationStatusField;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.enums.TaskType;
import com.zy.acs.conveyor.core.model.Task;
@@ -40,45 +41,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 +75,6 @@
default:
break;
}
- // 蹇冭烦
-// heartbeat();
Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
@@ -117,7 +87,7 @@
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
private void initSite() {
- ArrayList<Integer> staNos = getStaNo();
+ List<Integer> staNos = slave.getStaNos();
// 绔欑偣缂栧彿
for (Integer siteId : staNos) {
StaProtocol staProtocol = station.get(siteId);
@@ -164,10 +134,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,13 +146,9 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- boolean[] status = null;
- if (i < 7) {
- short i1 = siemensS7Net.getByteTransform().TransInt16(result2.Content, i * 4 + 2);
- 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]); // 鍙叆
@@ -201,7 +166,7 @@
//鏉＄爜鎵弿鍣�
- ArrayList<Integer> barcodeList = BarcodeList;
+ List<Integer> barcodeList = slave.getBarcodeNumber();
OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.102", (short) (barcodeList.size() * 8));
if (result5.IsSuccess) {
for (int i = 0; i < barcodeList.size(); i++) {
@@ -215,6 +180,53 @@
barcodeThread.setBarcode(barcode);
log.info("鏂欑鐮侊細{}", barcode);
}
+ }
+ }
+ }
+
+
+ OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB103.0", (short) (staNoSize * 2));
+ if (resultError.IsSuccess) {
+ ArrayList<Integer> staNoError = new ArrayList<Integer>() {{
+ add(102);
+ add(201);
+ add(211);
+ }};
+ for (int i = 0; i < staNoError.size(); i++) {
+ Integer siteId = staNoError.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 * 2, 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]);// 鎵爜澶辫触
+ }
+ }
+
+ //plc鏁呴殰
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB25.0", (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, 2);
+ 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]);
}
}
}
@@ -254,7 +266,7 @@
if (null == staProtocol) {
return;
}
- ArrayList<Integer> staNos = getStaNo();
+ List<Integer> staNos = slave.getStaNos();
int index = staNos.indexOf(staProtocol.getSiteId());
OperateResult write = null;
--
Gitblit v1.9.1