|
|
@ -24,6 +24,7 @@ import org.springframework.scheduling.support.CronTrigger;
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
@ -50,8 +51,22 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
|
|
|
|
triggerContext -> {
|
|
|
|
triggerContext -> {
|
|
|
|
ScheduledRequest scheduledRequest = new ScheduledRequest();
|
|
|
|
ScheduledRequest scheduledRequest = new ScheduledRequest();
|
|
|
|
scheduledRequest.setCronName("ioCollectOrderUploadTask");
|
|
|
|
scheduledRequest.setCronName("ioCollectOrderUploadTask");
|
|
|
|
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
|
|
|
|
// 使用设置的轮询时间为准 这边进行转换
|
|
|
|
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 */10 * * * ?";
|
|
|
|
IoCollectSet ioCollectSet = collectSetService.getSet();
|
|
|
|
|
|
|
|
String cron = null;
|
|
|
|
|
|
|
|
if(ioCollectSet!= null
|
|
|
|
|
|
|
|
&& ioCollectSet.getStartUploadHour() !=null
|
|
|
|
|
|
|
|
&& ioCollectSet.getStartUploadHour() >0
|
|
|
|
|
|
|
|
){
|
|
|
|
|
|
|
|
if(ioCollectSet.getStartUploadHour() <= 24){
|
|
|
|
|
|
|
|
cron = "0 0 */"+ioCollectSet.getStartUploadHour()+" * * ? ";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
cron = "0 0 0 */1 * ?";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
logger.info("已完成单据自动上传轮询设置cron表达式==="+cron);
|
|
|
|
|
|
|
|
|
|
|
|
if (cron.isEmpty()) {
|
|
|
|
if (cron.isEmpty()) {
|
|
|
|
logger.error("cron is null");
|
|
|
|
logger.error("cron is null");
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -61,6 +76,7 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
|
|
|
|
|
|
|
|
|
|
|
|
private void process() {
|
|
|
|
private void process() {
|
|
|
|
ThreadUtil.execAsync(() -> {
|
|
|
|
ThreadUtil.execAsync(() -> {
|
|
|
|
|
|
|
|
|
|
|
|
//获取下载的起始时间
|
|
|
|
//获取下载的起始时间
|
|
|
|
IoCollectSet ioCollectSet = collectSetService.getSet();
|
|
|
|
IoCollectSet ioCollectSet = collectSetService.getSet();
|
|
|
|
Date startUploadTime = ioCollectSet.getStartUploadTime();
|
|
|
|
Date startUploadTime = ioCollectSet.getStartUploadTime();
|
|
|
@ -75,7 +91,10 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
|
|
|
|
|
|
|
|
|
|
|
|
collectOrderRequest.setStartTime(paramValue);
|
|
|
|
collectOrderRequest.setStartTime(paramValue);
|
|
|
|
collectOrderRequest.setEndTime(nowTime);
|
|
|
|
collectOrderRequest.setEndTime(nowTime);
|
|
|
|
collectOrderRequest.setUploadStatus(1); //未上传
|
|
|
|
List<Integer> list = new ArrayList<>();
|
|
|
|
|
|
|
|
list.add(1);
|
|
|
|
|
|
|
|
list.add(3);
|
|
|
|
|
|
|
|
collectOrderRequest.setUploadStatusList(list);
|
|
|
|
|
|
|
|
|
|
|
|
//调用上传单据
|
|
|
|
//调用上传单据
|
|
|
|
List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
|
|
|
|
List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
|
|
|
@ -84,9 +103,9 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
|
|
|
|
ioCollectOrderBackupService.orderUpload(item.getBillNo(),null);
|
|
|
|
ioCollectOrderBackupService.orderUpload(item.getBillNo(),null);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 无限循环去上传单据不做限制了
|
|
|
|
ioCollectSet.setStartUploadTime(MsDateUtil.parseDate(nowTime));
|
|
|
|
// ioCollectSet.setStartUploadTime(MsDateUtil.parseDate(nowTime));
|
|
|
|
collectSetService.updateById(ioCollectSet);
|
|
|
|
// collectSetService.updateById(ioCollectSet);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|