From a5cdbf569067822e3232d2177b8a9aac1ed95b69 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 29 五月 2024 17:32:00 +0800
Subject: [PATCH] 1. 修改自评逻辑中，问题整改的判断方式为已整改并且整改审核通过； 2. 新增评估详情获取接口;
---
src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt
index 953eac3..66a9315 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/executor/BgTask.kt
@@ -1,6 +1,5 @@
package cn.flightfeather.supervision.common.executor
-import org.springframework.scheduling.annotation.Async
import java.time.LocalDateTime
import java.util.concurrent.Future
@@ -22,8 +21,13 @@
}
fun execute() {
- val res = task()
- if (res) success() else fail()
+ try {
+ val res = task()
+ if (res) success() else fail()
+ } catch (e: Exception) {
+ fail()
+ taskStatus.extra = e.message
+ }
}
fun success() {
@@ -39,9 +43,9 @@
fun shutdown() {
if (future?.isCancelled == false && !future!!.isDone) {
future!!.cancel(true)
- taskStatus.status = TaskStatus.SHUTDOWN
- complete()
}
+ taskStatus.status = TaskStatus.SHUTDOWN
+ complete()
}
fun complete() {
--
Gitblit v1.9.3