diff --git a/src/main/java/com/platform/check/service/CheckDocTaskService.java b/src/main/java/com/platform/check/service/CheckDocTaskService.java index 60048b4..45b6787 100644 --- a/src/main/java/com/platform/check/service/CheckDocTaskService.java +++ b/src/main/java/com/platform/check/service/CheckDocTaskService.java @@ -6,6 +6,7 @@ import com.platform.check.domain.vo.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -24,6 +25,8 @@ public interface CheckDocTaskService extends IService{ List findAllReport(String taskId); + void handleTaskData(String taskId); + void deleteTask(String taskId); String updateSubmitState(String taskId,Integer submitState,String description,String analysis); diff --git a/src/main/java/com/platform/check/service/impl/CheckDocTaskServiceImpl.java b/src/main/java/com/platform/check/service/impl/CheckDocTaskServiceImpl.java index 74ace53..fe60a13 100644 --- a/src/main/java/com/platform/check/service/impl/CheckDocTaskServiceImpl.java +++ b/src/main/java/com/platform/check/service/impl/CheckDocTaskServiceImpl.java @@ -329,26 +329,82 @@ public class CheckDocTaskServiceImpl extends ServiceImpl fileIds = splitter.splitToList(task.getFileIdList()); + elasticsearchService.batchDeleteIndex(fileIds); + //删除redis缓存数据 + this.deleteRedisParsingCache(task); + //删除文档查重任务对应的文件信息 + String taskFilePath = properties.getTaskFilePath()+File.separator+taskId; + File taskFile = new File(taskFilePath); + if(taskFile.exists()){ + FileUtils.deleteDirectory(taskFile); + } + //删除任务报告对应文件信息 + String taskReportPath = properties.getTaskReportFilePath()+File.separator+taskId; + File taskReportFile = new File(taskReportPath); + if(taskReportFile.exists()){ + FileUtils.deleteDirectory(taskReportPath); + } + //设置查重任务状态为未开始 + task.setTaskStatus(CheckStatus.NOT_STARTED.getCode()); + //删除文档查重任务 + this.baseMapper.updateById(task); + } + /** * 删除文件查重任务信息 * @param taskId */ @Override @Transactional - public void deleteTask(String taskId) { + public void deleteTask(String taskId){ //修改项目查重标识 CheckDocTask task = this.getById(taskId); if(Objects.isNull(task)){ throw new BusinessException("查重任务不存在!"); } //删除过滤词文件 -// if (StringUtils.isNotBlank(task.getFilterWordFilePath())){ -// String filterWordFilePath = task.getFilterWordFilePath(); -// File filterWordFile = new File(filterWordFilePath); -// if(filterWordFile.exists()){ -// FileUtils.deleteDirectory(filterWordFilePath); -// } -// } + if (StringUtils.isNotBlank(task.getFilterWordFilePath())){ + String filterWordFilePath = task.getFilterWordFilePath(); + File filterWordFile = new File(filterWordFilePath); + if(filterWordFile.exists()){ + FileUtils.deleteDirectory(filterWordFilePath); + } + } + //删除任务报告对应文件信息 + String taskReportPath = properties.getTaskReportFilePath()+File.separator+taskId; + File taskReportFile = new File(taskReportPath); + if(taskReportFile.exists()){ + FileUtils.deleteDirectory(taskReportFile); + } //删除文档查重任务对应的报告信息 checkReportService.deleteReport(taskId); //删除关联表 @@ -358,16 +414,10 @@ public class CheckDocTaskServiceImpl extends ServiceImpl