From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- 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