|
@ -4,14 +4,16 @@ import com.yihu.ehr.common.Services;
|
|
|
import com.yihu.ehr.crawler.service.CrawlerManager;
|
|
|
import com.yihu.ehr.datacollect.model.RsJobConfig;
|
|
|
import com.yihu.ehr.datacollect.service.intf.IDatacollectManager;
|
|
|
import com.yihu.ehr.framework.constrant.DateConvert;
|
|
|
import com.yihu.ehr.framework.model.DataGridResult;
|
|
|
import com.yihu.ehr.framework.util.DateUtil;
|
|
|
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
|
|
import java.util.*;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
/**
|
|
|
* Created by hzp on 2016/5/11.
|
|
@ -30,11 +32,8 @@ public class ArchiveUploadJob implements IBaseJob {
|
|
|
Date begin = job.getRepeatStartTime();
|
|
|
Date end = job.getRepeatEndTime();
|
|
|
if (!job.getJobType().equals("0")) {
|
|
|
if (end == null) {
|
|
|
//调整截止时间,当前时间-偏移量
|
|
|
end = DateUtil.addDate(-job.getDelayTime(), DateUtil.getSysDateTime());
|
|
|
}
|
|
|
|
|
|
//调整截止时间,当前时间-偏移量
|
|
|
end = DateUtil.addDate(-job.getDelayTime(), DateUtil.getSysDateTime());
|
|
|
if ((end.getTime() - begin.getTime()) <= 0) {
|
|
|
return; //结束时间小于开始时间时,不获取
|
|
|
}
|