From e8ca0be1b3a0ac0b2307a9f6e41186312bd8cf28 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期日, 01 九月 2024 16:22:23 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 80 ++++++++++++----------------------------
1 files changed, 24 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 371cf81..e259358 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,7 +50,7 @@
add(101);
add(102);
add(103);
- //add(104);
+ add(104);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
@@ -69,6 +69,7 @@
add(101);
add(102);
add(103);
+ add(104);
add(200);
add(201);
add(202);
@@ -204,7 +205,7 @@
private void read() throws InterruptedException {
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// updateIoMode();
- ArrayList<Integer> staNos = getStaNo();
+ ArrayList<Integer> staNos = staNosAll;
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
@@ -245,67 +246,19 @@
}
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-// if (result0.IsSuccess) {
-// for (int i = 0; i < 93; 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.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
-// }
-// }
-
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
//ArrayList<Integer> barcodeList = BarcodeList;
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (3 * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (24));
if (result2.IsSuccess) {
for (int i = 0; i < 3; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i);
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
}
}
- //鏉＄爜鎵弿鍣�
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2", (short) (barcodeSize * 8));
-// if (result2.IsSuccess) {
-// if (slave.getId() == 1) {
-// for (int i = 0; i < barcodeSize / 3; i++) {
-// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-// if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-//// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-// barcodeThread.setBarcode(barcode);
-// }
-// }
-// } else if (slave.getId() == 2) {
-// for (int i = barcodeSize / 3; i < barcodeSize; i++) {
-// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, (i - barcodeSize / 3) * 8, 8, "UTF-8");
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-// if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-//// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-// barcodeThread.setBarcode(barcode);
-// }
-// }
-// } else if (slave.getId() == 3) {
-// for (int i = barcodeSize / 3 + 1; i < barcodeSize; i++) {
-// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, (i - (barcodeSize / 3) * 2) * 8, 8, "UTF-8");
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-// if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-//// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-// barcodeThread.setBarcode(barcode);
-// }
-// }
-// }
-// }
Thread.sleep(200);
@@ -335,11 +288,27 @@
}
}
+ //plc鏁呴殰
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.300", (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<>();
@@ -347,7 +316,6 @@
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
}
-
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
@@ -388,7 +356,7 @@
OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 4);
OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index * 6 + 4), (short) 2);
if (readResult.IsSuccess && readResult1.IsSuccess) {
- short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
+ short workNo = (short) siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
if (staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)) {
//浠诲姟鍛戒护鍐欏叆鎴愬姛
--
Gitblit v1.9.1