From e47b30ba51de51df6210910e50d790614a9b30e1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 20:38:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 0980805..49ba3f6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
+import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -323,18 +324,25 @@
staProtocol.setRGV2(status[1]); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
staProtocol.setRGV3(status[2]); // 灏忚溅杩愯涓�
-// staProtocol.setRGV11(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 灏忚溅鏃犺揣绌洪棽
-// staProtocol.setRGV22(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
-// staProtocol.setRGV33(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); //灏忚溅杩愯涓�
- staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
- staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6)); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
- staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 8)); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+// staProtocol.setRGV1(false); // 灏忚溅鏃犺揣绌洪棽
+// staProtocol.setRGV2(true); // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+// staProtocol.setRGV3(false); // 灏忚溅杩愯涓�
+
+ staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 2));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+ staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4)); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+ staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6)); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+//
+// staProtocol.setRGV44((short) 0);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+// staProtocol.setRGV55((short) 0); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+// staProtocol.setRGV66((short) 0); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
staProtocol.setRGV4(staProtocol.getRGV44() != 0 && staProtocol.getRGV44() != 2);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
staProtocol.setRGV5(staProtocol.getRGV55() != 0 && staProtocol.getRGV55() != 2); //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
staProtocol.setRGV6(staProtocol.getRGV66() != 0 && staProtocol.getRGV66() != 2); // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+
}catch (Exception e){
- System.out.println(e.getMessage());
+ log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
}
}
}
@@ -566,28 +574,42 @@
if (null == staProtocol) {
return;
}
+ News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
boolean rgv6 = staProtocol.isRGV6();
OperateResult result1 = null;
OperateResult result2 = null;
String resultV1 = "";
+ String resultV2 = "";
+ String resultV3 = "";
short resultS1 = 1;
short resultS2 = 2;
switch (staProtocol.getSiteId()){
case 623:
resultV1 = "DB100.1830";
+ resultV2 = "DB100.1826";
+ resultV3 = "DB100.1828";
break;
case 624:
resultV1 = "DB100.1840";
+ resultV2 = "DB100.1826";
+ resultV3 = "DB100.1828";
break;
case 625:
resultV1 = "DB100.1850";
+ resultV2 = "DB100.1826";
+ resultV3 = "DB100.1828";
break;
case 626:
resultV1 = "DB100.1860";
+ resultV2 = "DB100.1826";
+ resultV3 = "DB100.1828";
break;
default:
return;
}
+ siemensS7Net.Write(resultV2, (short) 0);
+ siemensS7Net.Write(resultV3, (short) 0);
result1 = siemensS7Net.Write(resultV1, resultS1);
//纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
@@ -644,7 +666,7 @@
writeCount = 1;
do {
try{
- if(!result1.IsSuccess){
+ if(!result2.IsSuccess){
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
result2 = siemensS7Net.Write(resultV1, resultS2);
@@ -682,26 +704,33 @@
if (null == staProtocol) {
return;
}
+ News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
boolean rgv4 = staProtocol.isRGV4();
boolean rgv5 = staProtocol.isRGV5();
OperateResult result1 = null;
OperateResult result2 = null;
String resultV1 = "";
+ String resultV2 = "";
short resultS1 = 1;
short resultS2 = 2;
if (rgv4){
switch (staProtocol.getSiteId()){
case 623:
resultV1 = "DB100.1826";
+ resultV2 = "DB100.1830";
break;
case 624:
resultV1 = "DB100.1836";
+ resultV2 = "DB100.1840";
break;
case 625:
resultV1 = "DB100.1846";
+ resultV2 = "DB100.1850";
break;
case 626:
resultV1 = "DB100.1856";
+ resultV2 = "DB100.1860";
break;
default:
return;
@@ -710,20 +739,25 @@
switch (staProtocol.getSiteId()){
case 623:
resultV1 = "DB100.1828";
+ resultV2 = "DB100.1830";
break;
case 624:
resultV1 = "DB100.1838";
+ resultV2 = "DB100.1840";
break;
case 625:
resultV1 = "DB100.1848";
+ resultV2 = "DB100.1850";
break;
case 626:
resultV1 = "DB100.1858";
+ resultV2 = "DB100.1860";
break;
default:
return;
}
}
+ siemensS7Net.Write(resultV2, (short) 0);
result1 = siemensS7Net.Write(resultV1, resultS1);
//纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
try {
@@ -817,22 +851,24 @@
OperateResult result2 = null;
String resultV1 = "";
String resultV2 = "";
+ News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
switch (staProtocol.getSiteId()){
case 623:
resultV1 = "DB100.1824";
- resultV2 = "DB100.1828";
+ resultV2 = "DB100.1834";
break;
case 624:
- resultV1 = "DB100.1828";
+ resultV1 = "DB100.1834";
resultV2 = "DB100.1824";
break;
case 625:
- resultV1 = "DB100.1832";
- resultV2 = "DB100.1836";
+ resultV1 = "DB100.1844";
+ resultV2 = "DB100.1854";
break;
case 626:
- resultV1 = "DB100.1836";
- resultV2 = "DB100.1832";
+ resultV1 = "DB100.1854";
+ resultV2 = "DB100.1844";
break;
default:
return;
--
Gitblit v1.9.1