From 8f93d32b15cff5287a07649da92bd5b6276c14e2 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 26 六月 2024 22:13:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 77 +++++++++++++-------------------------
1 files changed, 26 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 76c9777..0ea4c8f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -200,6 +200,9 @@
case 9:
write9((StaProtocol)task.getData());
break;
+ case 10:
+ write10((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -554,30 +557,28 @@
boolean rgv4 = staProtocol.isRGV4();
boolean rgv5 = staProtocol.isRGV5();
OperateResult result1 = null;
- OperateResult result2 = null;
String resultV1 = "";
- String resultV2 = "";
switch (staProtocol.getSiteId()){
case 623:
- resultV1 = "1804";
- resultV2 = "1804";
+ resultV1 = "DB100.1804";
break;
case 624:
- resultV1 = "1810";
- resultV2 = "1810";
+ resultV1 = "DB100.1810";
break;
case 625:
- resultV1 = "1816";
- resultV2 = "1816";
+ resultV1 = "DB100.1816";
break;
case 626:
- resultV1 = "1822";
- resultV2 = "1822";
+ resultV1 = "DB100.1822";
break;
default:
return;
}
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
//纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
try {
Thread.sleep(200);
@@ -590,7 +591,11 @@
try{
if(!result1.IsSuccess){
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
Thread.sleep(100);
writeCount++;
continue;
@@ -598,56 +603,26 @@
OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
if (resultRead1.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
- boolean status1 = status[rgv4? 4:3];
- if (status1 == rgv4?rgv5:rgv4){
+ if (status[rgv4? 3:4]){
break;
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
Thread.sleep(100);
writeCount++;
continue;
}
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
- writeCount = 1;
- do {
- try{
- if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 1);
- if (resultRead2.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead2.Content, 0, 1);
- boolean status1 = status[rgv4? 3:4];
- if (status1 == rgv4?rgv4:rgv5){
- break;
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
- Thread.sleep(100);
- writeCount++;
- continue;
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
}
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
Thread.sleep(100);
writeCount++;
continue;
--
Gitblit v1.9.1