From b8e32099c3d0542a966f9bf0d24bfec73cc13882 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 30 五月 2025 10:59:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SteThread.java |   78 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 4b538c2..30f928e 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -44,6 +44,7 @@
     private SteProtocol steProtocol;
     private short heartBeatVal = 1;
     private boolean resetFlag = false;
+    private boolean connectSte = false;
 
     public SteThread(SteSlave slave) {
         this.slave = slave;
@@ -52,7 +53,31 @@
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
-        this.connect();
+        connectSte = this.connect();
+        while(!connectSte){
+            try {
+                connectSte = this.connect();
+                Thread.sleep(100);
+            } catch (Exception e){
+
+            }
+        }
+
+        // 鍚姩绾跨▼鑷姩閲嶈繛
+        new Thread(this::steConnect).start();
+
+        // 鍚姩璇绘暟鎹嚎绋�
+        new Thread(this::readStatusSte).start();
+
+        // 鍚姩浠诲姟涓嬪彂绾跨▼
+        new Thread(this::taskIssued).start();
+
+    }
+
+    /**
+     * 浠诲姟涓嬪彂
+     */
+    private void taskIssued() {
         while (true) {
             try {
                 int step = 1;
@@ -63,7 +88,7 @@
                 switch (step) {
                     // 璇绘暟鎹�
                     case 1:
-                        readStatus();
+//                        readStatus();
                         break;
                     // 鍐欏叆鏁版嵁
                     case 2:
@@ -74,12 +99,53 @@
                 }
                 // 蹇冭烦
 //                heartbeat();
-                Thread.sleep(500);
+                Thread.sleep(50);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("STE鍐欑嚎绋嬪紓甯�"+e.getMessage());
+
+//                e.printStackTrace();
             }
 
         }
+    }
+
+    private void steConnect() {
+        while (true) {
+            try {
+                Thread.sleep(1000);
+                if(!connectSte){
+                    try {
+                        connectSte = this.connect();
+                        Thread.sleep(100);
+                    } catch (Exception e){
+
+                    }
+                }
+            } catch (Exception e) {
+                log.error("ste杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                initSte();
+//                e.printStackTrace();
+            }
+        }
+    }
+
+    private void readStatusSte() {
+        while (true) {
+            try {
+                Thread.sleep(50);
+//                System.out.println("璇荤嚎绋�"+ slave.getId());
+
+                readStatus();
+
+            } catch (Exception e) {
+                log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+                initSte();
+//                e.printStackTrace();
+            }
+
+        }
+
     }
 
     /**
@@ -155,8 +221,8 @@
 
                 boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 27, 1);
 
-                steProtocol.setChargeStatus(status[0]?(short)1:(short)0);
-                steProtocol.setTrack(status[1]?(short)1:(short)0);
+                steProtocol.setChargeStatus(status2[0]?(short)1:(short)0);
+                steProtocol.setTrack(status2[1]?(short)1:(short)0);
 
 //                steProtocol.setLoad(status2[6]?(short)1:(short)0);
                 steProtocol.setLoad(status2[7]?(short)1:(short)0);

--
Gitblit v1.9.1