From 2028b51aeda2b6b23fda4183875b145d5e83822f Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 19 六月 2024 11:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 919b4d9..4cad002 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -137,7 +137,7 @@
                 }
                 // 蹇冭烦
 //                heartbeat();
-                Thread.sleep(300);
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -234,7 +234,7 @@
         }
         BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
         //RGV灏忚溅1
-        Thread.sleep(100);
+//        Thread.sleep(100);
         OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
         if (result3.IsSuccess) {
             BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
@@ -251,7 +251,7 @@
             }
         }
         //RGV灏忚溅2
-        Thread.sleep(100);
+//        Thread.sleep(100);
         OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10);
         if (result4.IsSuccess) {
             BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0));
@@ -269,7 +269,7 @@
         }
 
         //RGV灏忚溅3
-        Thread.sleep(100);
+//        Thread.sleep(100);
         OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10);
         if (result5.IsSuccess) {
             BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0));
@@ -411,6 +411,7 @@
             Thread.sleep(200);
             write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if(write.IsSuccess && write1.IsSuccess){
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                 break;
             }
             else {

--
Gitblit v1.9.1