diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/task/CaseUploadTask.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/task/CaseUploadTask.java index 92718839..8d568b48 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/task/CaseUploadTask.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/task/CaseUploadTask.java @@ -6,13 +6,11 @@ import com.xboe.module.boecase.dao.CaseDocumentLogDao; import com.xboe.module.boecase.dao.CasesDao; import com.xboe.module.boecase.entity.CaseDocumentLog; import com.xboe.module.boecase.entity.Cases; +import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -24,8 +22,6 @@ import java.util.List; */ @Component @Slf4j -@RestController -@RequestMapping("/xboe/m/boe/caseUpload") public class CaseUploadTask { @Resource @@ -42,7 +38,7 @@ public class CaseUploadTask { private static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id"; - @PostMapping("/execute") + @XxlJob("oldDataUploadJob") public void oldDataUploadJob() { try { log.info("开始执行旧案例上传任务"); @@ -65,12 +61,12 @@ public class CaseUploadTask { for (Cases cases : casesToProcess) { caseIds.add(cases.getId()); } - + // 一次性查询所有相关案例的记录 List existingLogs = caseDocumentLogDao.getGenericDao() .findList(CaseDocumentLog.class, com.xboe.core.orm.FieldFilters.in("caseId", caseIds)); - + // 过滤出未在CaseDocumentLog中存在的案例 List casesList = new ArrayList<>(); for (Cases cases : casesToProcess) { @@ -106,15 +102,6 @@ public class CaseUploadTask { } } - /** - * 清除处理位置标记,使下次任务从头开始执行 - */ - @PostMapping("/reset") - public void resetLastProcessedId() { - stringRedisTemplate.delete(CASE_UPLOAD_LAST_ID_KEY); - log.info("已清除上次处理位置标记"); - } - /** * 查询需要处理的案例数据 *