From cafd3002c04cbce2025aba2de17e866547bbcf86 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 16:35:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 66 +++++++-------------------------
1 files changed, 15 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 851cfce..49bce81 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -466,26 +466,8 @@
Integer siteId = staProtocol.getSiteId();
Integer index =0;
switch (siteId){
- case 118:
+ case 607:
index=0;
- break;
- case 119:
- index=1;
- break;
- case 120:
- index=2;
- break;
- case 121:
- index=3;
- break;
- case 131:
- index=4;
- break;
- case 135:
- index=5;
- break;
- case 147:
- index=6;
break;
default:
return;
@@ -495,7 +477,7 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100.600." + index, true); // 浠诲姟瀹屾垚
+ write = siemensS7Net.Write("DB100.1872", 1); // 浠诲姟瀹屾垚
if(write.IsSuccess){
writeCount=6;
}else {
@@ -524,26 +506,8 @@
Integer siteId = staProtocol.getSiteId();
Integer index =0;
switch (siteId){
- case 118:
+ case 607:
index=0;
- break;
- case 119:
- index=1;
- break;
- case 120:
- index=2;
- break;
- case 121:
- index=3;
- break;
- case 131:
- index=4;
- break;
- case 135:
- index=5;
- break;
- case 147:
- index=6;
break;
default:
return;
@@ -553,10 +517,10 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100.600." + index, false); // 浠诲姟瀹屾垚澶嶄綅
+ write = siemensS7Net.Write("DB100.1872", 0); // 浠诲姟瀹屾垚澶嶄綅
if(write.IsSuccess){
writeCount=6;
- }else {
+ } else {
writeCount++;
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
@@ -974,43 +938,43 @@
String resultV1 = "";
switch (devNo){
case 1:
- resultV1 = "DB100.1824";
+ resultV1 = "DB500.0.0";
break;
case 2:
- resultV1 = "DB100.1836";
+ resultV1 = "DB500.0.1";
break;
case 3:
- resultV1 = "DB100.1848";
+ resultV1 = "DB500.0.2";
break;
default:
return;
}
- OperateResult result = siemensS7Net.Write(resultV1, (short) 1);
+ OperateResult result = siemensS7Net.Write(resultV1, true);
Integer writeCount = 0;
do {
try{
if(!result.IsSuccess){
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, (short) 1);
+ result = siemensS7Net.Write(resultV1, true);
Thread.sleep(100);
writeCount++;
continue;
}
- OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 2);
+ OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 1);
if (resultRead1.IsSuccess) {
- short transInt16 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
- if (transInt16 == (short) 1){
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+ if (status[devNo-1]){
break;
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, (short) 1);
+ result = siemensS7Net.Write(resultV1, true);
Thread.sleep(100);
writeCount++;
continue;
}
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
- result = siemensS7Net.Write(resultV1, (short) 1);
+ result = siemensS7Net.Write(resultV1, true);
Thread.sleep(100);
writeCount++;
continue;
--
Gitblit v1.9.1