From f2fba165f5a8de71729a1ed9546eac971507b257 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 09:21:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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..afbcd87 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -974,43 +974,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