From f655a141dbced565ef1ea546116a016c3dbd1f79 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 28 六月 2024 00:28:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 49ba3f6..12bcefd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -305,7 +305,7 @@
int[] staNosRgv = {623,624,625,626};
for (int i = 0; i < staNosRgv.length; i++) {
OperateResultExOne<byte[]> resultRgv = siemensS7Net.Read("DB100."+(1800+i*6), (short) 5);
- OperateResultExOne<byte[]> resultRgv2 = siemensS7Net.Read("DB100."+(1824+i*10), (short) 8);
+ OperateResultExOne<byte[]> resultRgv2 = siemensS7Net.Read("DB100."+(1824+i*12), (short) 8);
if (resultRgv.IsSuccess) {
Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
@@ -563,7 +563,7 @@
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂鐮佸灈瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
}
}
@@ -591,19 +591,19 @@
resultV3 = "DB100.1828";
break;
case 624:
- resultV1 = "DB100.1840";
- resultV2 = "DB100.1826";
- resultV3 = "DB100.1828";
+ resultV1 = "DB100.1842";
+ resultV2 = "DB100.1838";
+ resultV3 = "DB100.1840";
break;
case 625:
- resultV1 = "DB100.1850";
- resultV2 = "DB100.1826";
- resultV3 = "DB100.1828";
+ resultV1 = "DB100.1854";
+ resultV2 = "DB100.1850";
+ resultV3 = "DB100.1852";
break;
case 626:
- resultV1 = "DB100.1860";
- resultV2 = "DB100.1826";
- resultV3 = "DB100.1828";
+ resultV1 = "DB100.1866";
+ resultV2 = "DB100.1862";
+ resultV3 = "DB100.1864";
break;
default:
return;
@@ -721,16 +721,16 @@
resultV2 = "DB100.1830";
break;
case 624:
- resultV1 = "DB100.1836";
- resultV2 = "DB100.1840";
+ resultV1 = "DB100.1838";
+ resultV2 = "DB100.1842";
break;
case 625:
- resultV1 = "DB100.1846";
- resultV2 = "DB100.1850";
+ resultV1 = "DB100.1850";
+ resultV2 = "DB100.1854";
break;
case 626:
- resultV1 = "DB100.1856";
- resultV2 = "DB100.1860";
+ resultV1 = "DB100.1862";
+ resultV2 = "DB100.1866";
break;
default:
return;
@@ -742,16 +742,16 @@
resultV2 = "DB100.1830";
break;
case 624:
- resultV1 = "DB100.1838";
- resultV2 = "DB100.1840";
+ resultV1 = "DB100.1840";
+ resultV2 = "DB100.1842";
break;
case 625:
- resultV1 = "DB100.1848";
- resultV2 = "DB100.1850";
+ resultV1 = "DB100.1852";
+ resultV2 = "DB100.1854";
break;
case 626:
- resultV1 = "DB100.1858";
- resultV2 = "DB100.1860";
+ resultV1 = "DB100.1864";
+ resultV2 = "DB100.1866";
break;
default:
return;
@@ -856,19 +856,19 @@
switch (staProtocol.getSiteId()){
case 623:
resultV1 = "DB100.1824";
- resultV2 = "DB100.1834";
+ resultV2 = "DB100.1848";
break;
case 624:
- resultV1 = "DB100.1834";
- resultV2 = "DB100.1824";
+ resultV1 = "DB100.1836";
+ resultV2 = "DB100.1860";
break;
case 625:
- resultV1 = "DB100.1844";
- resultV2 = "DB100.1854";
+ resultV1 = "DB100.1848";
+ resultV2 = "DB100.1824";
break;
case 626:
- resultV1 = "DB100.1854";
- resultV2 = "DB100.1844";
+ resultV1 = "DB100.1860";
+ resultV2 = "DB100.1836";
break;
default:
return;
@@ -958,7 +958,7 @@
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂鐮佸灈瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚 缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
}
}
--
Gitblit v1.9.1