第三方单据上传相关bug修改

pro^2
anthonywj 2 years ago
parent a7982e80dd
commit 461dedf088

@ -256,6 +256,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
private void updateTask(String taskKey) {
ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
vo.setFinished(true);
vo.setNextTime(new Date().getTime());
redisUtil.set(taskKey, vo);
}
@ -269,12 +270,13 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
String taskKey = getTaskKey(thrSystemDetailEntity);
ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
if (null != vo && !vo.isFinished()) {
log.info("有任务尚未执行完成当前任务key{}", taskKey);
log.info(vo.getKey() + "有任务尚未执行完成当前任务key{}", taskKey);
return false;
}
long nextTime = DateUtil.offsetMonth(new Date(), thrSystemDetailEntity.getTime()).getTime();
long curTime = new Date().getTime();
if (vo != null) {
if (vo.getNextTime() - new Date().getTime() > thrSystemDetailEntity.getTime() * 1000 * 60) {
long lastTime = vo.getNextTime();
if (curTime - lastTime < thrSystemDetailEntity.getTime().intValue() * 1000 * 60) {
log.info("定时任务时间未到", taskKey);
return false;
} else {
@ -283,7 +285,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
} else {
vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo());
vo.setKey(taskKey);
vo.setNextTime(nextTime);
vo.setNextTime(curTime);
vo.setFinished(false);
redisUtil.set(taskKey, vo);
}

Loading…
Cancel
Save