From 536ace35b7d83f641e0565e02a1ce9e2b3a3a84e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 11 Feb 2025 14:29:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BA=94=E7=94=A8app?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=85=A2=E6=97=B6=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8app=E8=A2=AB=E5=BD=93=E6=88=90=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=E5=A4=84=E7=90=86=EF=BC=8C=E4=BD=9C=E4=B8=9A=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=A2=AB=E6=8E=A5=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1354317460635648]应用app重启慢时会导致应用app被当成故障处理，作业任务被接管 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1354317460635648
---
 .../asynchronization/thread/NeatLogicThread.java | 16 ++++++++++++++--
 .../heartbeat/core/HeartbeatManager.java         |  3 ++-
 .../heartbeat/dao/mapper/ServerMapper.xml        |  4 +++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java b/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
index 4a450b30d..f6e727cc8 100644
--- a/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
+++ b/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
@@ -37,6 +37,8 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
     private static long threadSeqNumber;
     private int priority = 3;//默认优先级是3，数字越低优先级越高
 
+    private boolean needAwaitAdvance = true;// 是否需要等待所有模块加载完成后再任务
+
     @Override
     public int compareTo(NeatLogicThread other) {
         return Integer.compare(this.priority, other.priority); // 优先级高的先出队,priority越小代表优先级越高
@@ -114,8 +116,10 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
             if (StringUtils.isNotBlank(threadName)) {
                 Thread.currentThread().setName(threadName);
             }
-            /* 等待所有模块加载完成后，phaser将会变成1，线程才开始执行 **/
-            ModuleInitApplicationListener.getModuleinitphaser().awaitAdvance(0);
+            if (needAwaitAdvance) {
+                /* 等待所有模块加载完成后，phaser将会变成1，线程才开始执行 **/
+                ModuleInitApplicationListener.getModuleinitphaser().awaitAdvance(0);
+            }
             execute();
             Thread.currentThread().setName(oldThreadName);
         } catch (ApiRuntimeException ex) {
@@ -174,4 +178,12 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
     public void setCountDownLatch(CountDownLatch countDownLatch) {
         this.countDownLatch = countDownLatch;
     }
+
+    public boolean isNeedAwaitAdvance() {
+        return needAwaitAdvance;
+    }
+
+    public void setNeedAwaitAdvance(boolean needAwaitAdvance) {
+        this.needAwaitAdvance = needAwaitAdvance;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java b/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java
index 099e8eb03..daf670142 100644
--- a/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java
+++ b/src/main/java/neatlogic/framework/heartbeat/core/HeartbeatManager.java
@@ -118,7 +118,8 @@ public class HeartbeatManager extends ModuleInitializedListenerBase {
                 }
             }
         };
-        heartbeatService.scheduleAtFixedRate(runnable, Config.SERVER_HEARTBEAT_RATE(), Config.SERVER_HEARTBEAT_RATE(), TimeUnit.MINUTES);
+        runnable.setNeedAwaitAdvance(false);
+        heartbeatService.scheduleAtFixedRate(runnable, Config.SERVER_HEARTBEAT_RATE(), Config.SERVER_HEARTBEAT_RATE(), TimeUnit.SECONDS);
     }
 
     /**
diff --git a/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml b/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml
index 4d3c2fa09..8bd1889b4 100644
--- a/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml
+++ b/src/main/java/neatlogic/framework/heartbeat/dao/mapper/ServerMapper.xml
@@ -56,7 +56,9 @@
 
 	<update id="updateServerHeartbeatTimeByServerId" parameterType="java.lang.Integer">
 		UPDATE `server_status`
-		SET `heartbeat_time` = NOW(3)
+		SET
+			`status` = 'startup',
+		    `heartbeat_time` = NOW(3)
 		WHERE `server_id` = #{value}
 	</update>
 
-- 
Gitee