From 0c59552dc14c9023d4c0a9d57509cce1d5a6d6da Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-socket-1129'

---
 src/main/kotlin/cn/flightfeather/supervision/common/executor/BackgroundTaskCtrl.kt |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BackgroundTaskCtrl.kt b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BackgroundTaskCtrl.kt
index c8f23f6..492e15e 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BackgroundTaskCtrl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BackgroundTaskCtrl.kt
@@ -1,6 +1,7 @@
 package cn.flightfeather.supervision.common.executor
 
 import cn.flightfeather.supervision.common.exception.BizException
+import cn.flightfeather.supervision.socket.WebSocketSendMessageUtil
 import org.springframework.stereotype.Component
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
@@ -37,7 +38,10 @@
                 throw BizException("鏃犳硶閲嶅鍒涘缓浠诲姟")
             }
         }
-        val t = BgTask(type, id, name, task)
+        val t = BgTask(type, id, name, task) { status ->
+            // 鍙戦�佹秷鎭�
+            WebSocketSendMessageUtil.sendBgTaskMessage(status)
+        }
         taskSet[id] = t
         return t
     }
@@ -62,7 +66,9 @@
             }
         } else {
             task.ready()
-            task.future = executorService.submit { task.execute() }
+            task.future = executorService.submit {
+                task.execute()
+            }
             return task
         }
     }

--
Gitblit v1.9.3