diff --git a/src/main/java/com/supervision/job/XxlJobTask.java b/src/main/java/com/supervision/job/XxlJobTask.java index b6c5557..722168f 100644 --- a/src/main/java/com/supervision/job/XxlJobTask.java +++ b/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); diff --git a/src/main/java/com/supervision/police/controller/MroController.java b/src/main/java/com/supervision/police/controller/MroController.java index 79e9f8f..63fa9ae 100644 --- a/src/main/java/com/supervision/police/controller/MroController.java +++ b/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> queryTaskList(@RequestBody TaskInfoReqVO taskInfoReqVO, - @RequestParam(required = false, defaultValue = "1") Integer page, - @RequestParam(required = false, defaultValue = "20") Integer size) { - IPage iPage = mroService.queryTaskList(taskInfoReqVO, page, size); - return R.ok(iPage); - } - - - @Operation(summary = "取消任务") - @PostMapping("/cancelTask") - public R cancelTask(@RequestBody List taskIds) { - Boolean success = mroService.cancelTask(taskIds); - return R.ok(success); - } - - - @Operation(summary = "删除任务") - @PostMapping("/deleteTask") - public R deleteTask(@RequestBody List taskIds) { - Boolean success = mroService.deleteTask(taskIds); - return R.ok(success); - } - - - - } diff --git a/src/main/java/com/supervision/police/controller/TaskRecordController.java b/src/main/java/com/supervision/police/controller/TaskRecordController.java index 8382c29..2fb333e 100644 --- a/src/main/java/com/supervision/police/controller/TaskRecordController.java +++ b/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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @Tag(name = "任务管理") @RestController @@ -28,4 +30,29 @@ public class TaskRecordController { return R.ok(); } + + @Operation(summary = "查询任务列表") + @PostMapping("/taskList") + public R> queryTaskList(@RequestBody TaskInfoReqVO taskInfoReqVO, + @RequestParam(required = false, defaultValue = "1") Integer page, + @RequestParam(required = false, defaultValue = "20") Integer size) { + IPage iPage = taskRecordService.queryTaskList(taskInfoReqVO, page, size); + return R.ok(iPage); + } + + + @Operation(summary = "取消任务") + @PostMapping("/cancelTask") + public R cancelTask(@RequestBody List taskIds) { + taskRecordService.cancelTask(taskIds); + return R.ok(true); + } + + + @Operation(summary = "删除任务") + @PostMapping("/deleteTask") + public R deleteTask(@RequestBody List taskIds) { + taskRecordService.deleteTask(taskIds); + return R.ok(true); + } } diff --git a/src/main/java/com/supervision/police/service/MroService.java b/src/main/java/com/supervision/police/service/MroService.java index 6551e90..119a328 100644 --- a/src/main/java/com/supervision/police/service/MroService.java +++ b/src/main/java/com/supervision/police/service/MroService.java @@ -12,10 +12,4 @@ public interface MroService { IPage queryCaseList(CaseProcessReqVO caseProcessReqVO, Integer page, Integer size); void analysisCase(List caseIds); - - IPage queryTaskList(TaskInfoReqVO taskInfoReqVO, Integer page, Integer size); - - Boolean cancelTask(List taskIds); - - Boolean deleteTask(List taskIds); } diff --git a/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java index 34e110d..a613c1d 100644 --- a/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java @@ -273,7 +273,7 @@ public class ChatServiceImpl implements ChatService { private void handleIndexResultQA(List modelIndices, String query, String caseId, Map 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()); diff --git a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java index dc69c5c..fdfda86 100644 --- a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java @@ -75,32 +75,4 @@ public class MroServiceImpl implements MroService { } } - @Override - public IPage queryTaskList(TaskInfoReqVO taskInfoReqVO, Integer page, Integer size) { - - return taskRecordService.queryTaskList(taskInfoReqVO, page, size); - } - - @Override - @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class) - public Boolean cancelTask(List 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 taskIds) { - if (CollUtil.isEmpty(taskIds)){ - log.info("deleteTask:删除任务失败,参数为空"); - return false; - } - taskRecordService.deleteTask(taskIds); - return true; - } - }