From 6fdacca914ef38e6cc91292ef07c5af32bd92991 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 03 十二月 2024 11:12:40 +0800
Subject: [PATCH] 1. BgTask增加onStatusChange参数，通过外界传递如何发送状态改变的消息 2. BackgroundTaskCtrl.kt 创建了BgTask对象并传递了onStatusChange参数 3. WebSocketMessageUtil 类名修改为 WebSocketMessageDecoder 4. SendWebSocketMessageUtil 类名修改为 WebSocketSendMessageUtil
---
src/main/kotlin/cn/flightfeather/supervision/common/executor/BackgroundTaskCtrl.kt | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 730c3a6..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,7 +1,7 @@
package cn.flightfeather.supervision.common.executor
import cn.flightfeather.supervision.common.exception.BizException
-import cn.flightfeather.supervision.common.utils.SendSocketMessageUtil
+import cn.flightfeather.supervision.socket.WebSocketSendMessageUtil
import org.springframework.stereotype.Component
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executors
@@ -38,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
}
@@ -65,10 +68,7 @@
task.ready()
task.future = executorService.submit {
task.execute()
- println(task.taskStatus.runTime)
- SendSocketMessageUtil.sendBgTaskMessage(task.taskStatus)
}
- SendSocketMessageUtil.sendBgTaskMessage(task.taskStatus)
return task
}
}
@@ -117,13 +117,11 @@
return if (id != null) {
val task = taskMap[id] ?: throw BizException("鏃犳硶鍏抽棴浠诲姟锛屼换鍔${id}]涓嶅瓨鍦�")
task.shutdown()
- SendSocketMessageUtil.sendBgTaskMessage(task.taskStatus)
listOf(task.taskStatus)
} else {
val res = mutableListOf<BgTaskStatus?>()
taskMap.forEach { (t, u) ->
u.shutdown()
- SendSocketMessageUtil.sendBgTaskMessage(u.taskStatus)
res.add(u.taskStatus)
}
res.sortedBy { it?.createTime }
--
Gitblit v1.9.3