|
|
|
@ -289,7 +289,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
|
|
|
|
|
*/
|
|
|
|
|
private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) {
|
|
|
|
|
String taskKey = getTaskKey(thrSystemDetailEntity);
|
|
|
|
|
ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
|
|
|
|
|
ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
|
|
|
|
|
if (null != vo && !vo.isFinished()) {
|
|
|
|
|
log.info(vo.getKey() + "有任务尚未执行完成,当前任务key:{}", taskKey);
|
|
|
|
|
return false;
|
|
|
|
@ -298,12 +298,12 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
|
|
|
|
|
if (vo != null) {
|
|
|
|
|
long lastTime = vo.getNextTime();
|
|
|
|
|
|
|
|
|
|
long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
|
|
|
|
|
long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
|
|
|
|
|
if (curTime - lastTime < timeInterval) {
|
|
|
|
|
log.info("定时任务时间未到---" + taskKey);
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
return true;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo());
|
|
|
|
|