From 9a10da7c920e5b926ad1278672b1dab7e604edb4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 17 三月 2022 21:01:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6eb8cb3..ee67550 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -48,7 +48,8 @@
add(150);add(151);add(152);add(153);add(154);add(155);add(156);add(157);add(158);add(159);
add(160);add(161);add(162);add(163);add(164);add(165);add(166);add(167);add(168);add(169);
add(170);add(171);add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
- add(180);add(181);add(182);add(183);add(184);add(185);add(186);add(187);add(188);add(189);
+ add(180);add(181);add(182);
+ add(183);add(184);add(185);add(186);add(187);add(188);add(189);
add(190);add(191);add(192);
}};
@@ -114,11 +115,11 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- // 鏇存柊鍏ュ嚭搴撴ā寮�
- updateIoMode();
+// // 鏇存柊鍏ュ嚭搴撴ā寮�
+// updateIoMode();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
if (result.IsSuccess) {
- for (int i = 0; i < 83; i++) {
+ for (int i = 0; i < 93; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -132,7 +133,7 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
if (result0.IsSuccess) {
- for (int i = 0; i < 83; i++) {
+ for (int i = 0; i < 93; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -146,7 +147,7 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 186);
if (result1.IsSuccess) {
- for (int i = 0; i < 83; i++) {
+ for (int i = 0; i < 93; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
StaProtocol staProtocol = station.get(siteId);
@@ -165,10 +166,44 @@
}
}
- OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
- if (result2.IsSuccess) {
- this.ioMode = IoModeType.get(result2.Content);
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB300.0", (short) 10);
+ if (result3.IsSuccess) {
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ Integer siteId = 0;
+ for (int i = 0; i < 5; i++) {
+ switch (i){
+ case 0:
+ siteId = 100;
+ break;
+ case 1:
+ siteId = 102;
+ break;
+ case 2:
+ siteId = 104;
+ break;
+ case 3:
+ siteId = 106;
+ break;
+ case 4:
+ siteId = 108;
+ break;
+ }
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ short value = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
+ staProtocol.setInQty(value); // 鍏ュ簱鏆傚瓨鏁�
+ }
}
+
+// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
+// if (result2.IsSuccess) {
+// this.ioMode = IoModeType.get(result2.Content);
+// }
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
@@ -181,11 +216,13 @@
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
}
+
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (!basDevpService.updateBatchById(basDevps)) {
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
} catch (Exception e) {
+ e.printStackTrace();
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
--
Gitblit v1.9.1