Merge branch 'master' of http://192.168.1.220:10080/esb/esb

Hos-Resource-Mini/pom.xml

@@ -3,6 +3,12 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.core</groupId>
        <artifactId>Hos-Framework-dependencies</artifactId>
        <version>1.0.1</version>
        <relativePath>../Hos-Framework-dependencies</relativePath>
    </parent>
    <groupId>ehr</groupId>
    <artifactId>Hos-Resource-Mini</artifactId>

Hos-resource/src/main/java/com/yihu/ehr/job/service/ArchiveUploadJob.java

@@ -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; //结束时间小于开始时间时，不获取
            }