From 69ed1095b88871af2f79348cb629646300720254 Mon Sep 17 00:00:00 2001
From: yaxin <daixiaoyi@supervision.ltd>
Date: Tue, 14 Jan 2025 17:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=88=9B=E5=BB=BA=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8F=90=E5=8F=96=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskRecordServiceImpl.java   | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java
index d7a15cb..153f06d 100644
--- a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java
@@ -103,13 +103,13 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
         taskRecord.setType(TASK_TYPE_ONE_CLICK);
         taskRecord.setName(this.generateTaskName(taskRecord.getType()));
         super.save(taskRecord);
-        notePromptService.list(new LambdaQueryWrapper<NotePrompt>().eq(NotePrompt::getType, TYPE_GRAPH_REASONING).or().eq(NotePrompt::getType, TYPE_STRUCTURAL_REASONING)).forEach(notePrompt -> {
-            try {
-                NotePrompt prompt = notePromptService.getById(notePrompt.getId());
-                List<ModelCase> modelCases = this.getModelCases(taskRecord);
-                if (!CollUtil.isEmpty(modelCases)) {
-                    //异步调用xxl-job执行任务
-                    Thread thread = new Thread(() -> {
+        //异步调用xxl-job执行任务
+        Thread thread = new Thread(() -> {
+            notePromptService.list(new LambdaQueryWrapper<NotePrompt>().eq(NotePrompt::getType, TYPE_GRAPH_REASONING).or().eq(NotePrompt::getType, TYPE_STRUCTURAL_REASONING)).forEach(notePrompt -> {
+                try {
+                    NotePrompt prompt = notePromptService.getById(notePrompt.getId());
+                    List<ModelCase> modelCases = this.getModelCases(taskRecord);
+                    if (!CollUtil.isEmpty(modelCases)) {
                         for (ModelCase modelCase : modelCases) {
                             String caseId = modelCase.getId();
                             List<String> ids = this.getIds(taskRecord, caseId, prompt.getType());
@@ -120,17 +120,17 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
                                 log.info("案件【{}】没有笔录或证据", caseId);
                             }
                         }
-                    });
-                    thread.start();
-                } else {
-                    log.info("查无案件");
+                    } else {
+                        log.info("查无案件");
+                    }
+                } catch (Exception e) {
+                    taskRecord.setStatus(TASK_STATUS_FAIL);
+                    super.updateById(taskRecord);
+                    log.error("任务执行失败", e);
                 }
-            } catch (Exception e) {
-                taskRecord.setStatus(TASK_STATUS_FAIL);
-                super.updateById(taskRecord);
-                log.error("任务执行失败", e);
-            }
+            });
         });
+        thread.start();
         stopWatch.stop();
         log.info("一键提取任务触发完成。耗时:{}", stopWatch.getTotalTimeSeconds());
     }
@@ -316,7 +316,7 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
 
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
-    public void completeTask(String taskId, String executeId,String promptId, boolean isSuccess) {
+    public void completeTask(String taskId, String executeId, String promptId, boolean isSuccess) {
         if (StrUtil.isEmpty(taskId)) {
             log.info("completeTask:任务ID为空");
             return;
@@ -331,7 +331,7 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
             return;
         }
 
-        TaskCaseRecord taskCaseRecord = taskCaseRecordService.updateStatus(taskId, executeId,promptId, isSuccess);
+        TaskCaseRecord taskCaseRecord = taskCaseRecordService.updateStatus(taskId, executeId, promptId, isSuccess);
         log.info("completeTask:任务ID:【{}】，执行ID:【{}】，任务状态:【{}】", taskId, executeId, taskCaseRecord.getStatus());
         // 校验总体任务是否是取消中
         if (StrUtil.equalsAny(taskRecord.getStatus(), TASK_STATUS_CANCELLING, TASK_STATUS_CANCELED)) {
@@ -351,7 +351,7 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
             log.info("completeTask:任务ID:【{}】，初始任务案件状态:【{}】,计算后任务状态:【{}】", taskId, taskCaseRecord.getStatus(), taskStatus);
             if (!StrUtil.equals(taskStatus, taskRecord.getStatus())) {
                 taskRecord.setStatus(taskStatus);
-                if (StrUtil.equals(taskStatus, TASK_STATUS_SUCCESS)){
+                if (StrUtil.equals(taskStatus, TASK_STATUS_SUCCESS)) {
                     taskRecord.setFinishTime(LocalDateTime.now());
                 }
                 super.updateById(taskRecord);