From 0ebe62181d5eeb1e59a6943af13cc79bcdfe732a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 02 六月 2025 18:54:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 71 ++++++++++++++++++++++-
src/main/java/com/zy/core/thread/SteThread.java | 74 +++++++++++++++++++++++-
2 files changed, 137 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 496ec77..ba56b5f 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -48,6 +48,7 @@
* 宸ヤ綅2澶嶄綅淇″彿
*/
private boolean resetFlag2 = false;
+ private boolean connectRgv = false;
public RgvThread(RgvSlave slave) {
this.slave = slave;
@@ -56,7 +57,31 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- this.connect();
+ connectRgv = this.connect();
+ while(!connectRgv){
+ try {
+ connectRgv = this.connect();
+ Thread.sleep(100);
+ } catch (Exception e){
+
+ }
+ }
+
+ // 鍚姩绾跨▼鑷姩閲嶈繛
+ new Thread(this::rgvConnect).start();
+
+ // 鍚姩璇绘暟鎹嚎绋�
+ new Thread(this::readStatusRgv).start();
+
+ // 鍚姩浠诲姟涓嬪彂绾跨▼
+ new Thread(this::taskIssued).start();
+ }
+
+
+ /**
+ * 浠诲姟涓嬪彂
+ */
+ private void taskIssued() {
while (true) {
try {
int step = 1;
@@ -67,7 +92,7 @@
switch (step) {
// 璇绘暟鎹�
case 1:
- readStatus();
+// readStatus();
break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 2:
@@ -90,14 +115,54 @@
default:
break;
}
- Thread.sleep(500);
+ Thread.sleep(100);
} catch (Exception e) {
+ log.error("RGV鍐欑嚎绋嬪紓甯�"+e.getMessage());
// e.printStackTrace();
}
}
}
+ private void rgvConnect() {
+ while (true) {
+ try {
+ Thread.sleep(1000);
+ if(!connectRgv){
+ try {
+ connectRgv = this.connect();
+ Thread.sleep(100);
+ } catch (Exception e){
+
+ }
+ }
+ } catch (Exception e) {
+
+ log.error("rgv杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ initRgv();
+// e.printStackTrace();
+ }
+ }
+ }
+
+ private void readStatusRgv() {
+ while (true) {
+ try {
+ Thread.sleep(40);
+ readStatus();
+
+ } catch (Exception e) {
+ log.error("RGV璇荤嚎绋嬪紓甯�"+e.getMessage());
+
+ log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ initRgv();
+// e.printStackTrace();
+ }
+
+ }
+
+ }
+
/**
* 鍒濆鍖朢GV鐘舵��
*/
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 483c4e7..cc049cb 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;
@@ -51,8 +52,30 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- this.connect();
+ public void run() { 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 +86,7 @@
switch (step) {
// 璇绘暟鎹�
case 1:
- readStatus();
+// readStatus();
break;
// 鍐欏叆鏁版嵁
case 2:
@@ -74,14 +97,55 @@
}
// 蹇冭烦
// 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("ste鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+ initSte();
+// e.printStackTrace();
+ }
+
+ }
+
+ }
+
/**
* 鍒濆鍖栧爢鍨涙満鐘舵��
*/
--
Gitblit v1.9.1