任务相关业务方法抽取到taskRecord controller、service中

src/main/java/com/supervision/job/XxlJobTask.java

@@ -92,12 +92,14 @@ public class XxlJobTask {
                     break;
             }
             if (executable) {
+
                 TaskCaseRecord taskCaseRecord = taskCaseRecordService.lambdaQuery().eq(TaskCaseRecord::getCaseId, caseId).eq(TaskCaseRecord::getTaskRecordId, taskId).one();
                 if (TASK_STATUS_WAITING.equals(taskCaseRecord.getStatus())) {
                     log.info("任务状态为等待中，任务状态更新为处理中，任务案件ID: 【{}】", taskCaseRecord.getId());
                     taskCaseRecord.setStatus(TASK_STATUS_PROCESSING);
                     taskCaseRecordService.updateById(taskCaseRecord);
                 }
+
                 switch (prompt.getType()) {
                     case TYPE_GRAPH_REASONING:
                         log.info("【图推理】任务开始。任务ID: 【{}】", taskId);

src/main/java/com/supervision/police/controller/MroController.java

@@ -43,32 +43,4 @@ public class MroController {
         return R.ok();
     }
 
-    @Operation(summary = "查询任务列表")
-    @PostMapping("/taskList")
-    public R<IPage<TaskInfoDTO>> queryTaskList(@RequestBody TaskInfoReqVO taskInfoReqVO,
-                                               @RequestParam(required = false, defaultValue = "1") Integer page,
-                                               @RequestParam(required = false, defaultValue = "20") Integer size) {
-        IPage<TaskInfoDTO> iPage = mroService.queryTaskList(taskInfoReqVO, page, size);
-        return R.ok(iPage);
-    }
-
-
-    @Operation(summary = "取消任务")
-    @PostMapping("/cancelTask")
-    public R<Boolean> cancelTask(@RequestBody List<String> taskIds) {
-        Boolean success = mroService.cancelTask(taskIds);
-        return R.ok(success);
-    }
-
-
-    @Operation(summary = "删除任务")
-    @PostMapping("/deleteTask")
-    public R<Boolean> deleteTask(@RequestBody List<String> taskIds) {
-        Boolean success = mroService.deleteTask(taskIds);
-        return R.ok(success);
-    }
-
-
-
-
 }

src/main/java/com/supervision/police/controller/TaskRecordController.java

@@ -1,16 +1,18 @@
 package com.supervision.police.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.common.domain.R;
+import com.supervision.police.dto.TaskInfoDTO;
 import com.supervision.police.dto.taskRecord.TaskRecordVo;
 import com.supervision.police.service.TaskCaseRecordService;
 import com.supervision.police.service.TaskRecordService;
+import com.supervision.police.vo.TaskInfoReqVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
+
-import org.springframework.web.bind.annotation.RequestMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.RestController;
 
 @Tag(name = "任务管理")
 @RestController
@@ -28,4 +30,29 @@ public class TaskRecordController {
         return R.ok();
     }
 
+
+    @Operation(summary = "查询任务列表")
+    @PostMapping("/taskList")
+    public R<IPage<TaskInfoDTO>> queryTaskList(@RequestBody TaskInfoReqVO taskInfoReqVO,
+                                               @RequestParam(required = false, defaultValue = "1") Integer page,
+                                               @RequestParam(required = false, defaultValue = "20") Integer size) {
+        IPage<TaskInfoDTO> iPage = taskRecordService.queryTaskList(taskInfoReqVO, page, size);
+        return R.ok(iPage);
+    }
+
+
+    @Operation(summary = "取消任务")
+    @PostMapping("/cancelTask")
+    public R<Boolean> cancelTask(@RequestBody List<String> taskIds) {
+        taskRecordService.cancelTask(taskIds);
+        return R.ok(true);
+    }
+
+
+    @Operation(summary = "删除任务")
+    @PostMapping("/deleteTask")
+    public R<Boolean> deleteTask(@RequestBody List<String> taskIds) {
+        taskRecordService.deleteTask(taskIds);
+        return R.ok(true);
+    }
 }

src/main/java/com/supervision/police/service/MroService.java

@@ -12,10 +12,4 @@ public interface MroService {
     IPage<CaseProcessDTO> queryCaseList(CaseProcessReqVO caseProcessReqVO, Integer page, Integer size);
 
     void analysisCase(List<String> caseIds);
-
-    IPage<TaskInfoDTO> queryTaskList(TaskInfoReqVO taskInfoReqVO, Integer page, Integer size);
-
-    Boolean cancelTask(List<String> taskIds);
-
-    Boolean deleteTask(List<String> taskIds);
 }

src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java

@@ -273,7 +273,7 @@ public class ChatServiceImpl implements ChatService {
     private void handleIndexResultQA(List<ModelIndex> modelIndices, String query, String caseId, Map<String, Object> answerMap) {
         //如果案件分析状态不是分析成功，则先执行案件分析
         ModelCase modelCase = modelCaseService.getById(caseId);
-        ModelIndex modelIndex = modelIndices.stream().filter(index -> query.contains(index.getName())).findFirst().get();
+        ModelIndex modelIndex = modelIndices.stream().filter(index -> query.equals(index.getName())).findFirst().get();
         IndexResultQuery indexResultQuery = new IndexResultQuery();
         indexResultQuery.setCaseId(caseId);
         indexResultQuery.setIndexType(modelIndex.getIndexType());

src/main/java/com/supervision/police/service/impl/MroServiceImpl.java

@@ -75,32 +75,4 @@ public class MroServiceImpl implements MroService {
         }
     }
 
-    @Override
-    public IPage<TaskInfoDTO> queryTaskList(TaskInfoReqVO taskInfoReqVO, Integer page, Integer size) {
-
-        return taskRecordService.queryTaskList(taskInfoReqVO, page, size);
-    }
-
-    @Override
-    @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
-    public Boolean cancelTask(List<String> taskIds) {
-        if (CollUtil.isEmpty(taskIds)){
-            log.info("cancelTask:取消任务失败，参数为空");
-            return false;
-        }
-        taskRecordService.cancelTask(taskIds);
-        return true;
-    }
-
-    @Override
-    @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
-    public Boolean deleteTask(List<String> taskIds) {
-        if (CollUtil.isEmpty(taskIds)){
-            log.info("deleteTask:删除任务失败，参数为空");
-            return false;
-        }
-        taskRecordService.deleteTask(taskIds);
-        return true;
-    }
-
 }