From 2cc17d26486c9e4d4db6157497589c52dd7f0dc2 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 17 三月 2022 13:50:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 17a3e4a..803a751 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -118,7 +118,7 @@
// 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 +132,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 +146,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);
@@ -162,6 +162,41 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
+ }
+ }
+
+ 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); // 鍏ュ簱鏆傚瓨鏁�
+ String str="";
}
}
@@ -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