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

Hos-Framework/src/main/java/com/yihu/ehr/framework/util/httpclient/HttpHelper.java

@@ -1,5 +1,6 @@
package com.yihu.ehr.framework.util.httpclient;
import com.yihu.ehr.framework.util.operator.StringUtil;
import org.apache.http.NameValuePair;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
@@ -41,6 +42,11 @@ public class HttpHelper {
            httpGateway = props.getProperty("httpGateway");
            String sslKeystore = props.getProperty("sslKeystore");
            String sslPassword = props.getProperty("sslPassword");
            if (StringUtil.isEmpty(sslKeystore)) {
                String home = System.getProperty("catalina.home").replace('\\','/');
                String homeUrl = home.substring(0,home.lastIndexOf('/')+1);
                sslKeystore = homeUrl + "tomcat.keystore";
            }
            if(sslKeystore!=null && sslKeystore.length()>0 && sslPassword!=null &&sslPassword.length()>0)
            {
                SSLContext sslContext = SSLContexts.custom()

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerFlowManager.java

@@ -131,7 +131,7 @@ public class CrawlerFlowManager {
                    if (!StringUtil.isEmpty(data.get("data")) && !StringUtil.isEmpty(data.get("data").get(0))) {
                        if (!StringUtil.isEmpty(data.get("data").get(0).get(SysConfig.getInstance().getRegisterIdCardNo()))) {
                            //register
                            dispatch.register(patient, data);
                            dispatch.register(patient, data.toString());
                        }
                    }
                }

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java

@@ -3,12 +3,9 @@ package com.yihu.ehr.crawler.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.crawler.model.adapter.AdapterDataSet;
import com.yihu.ehr.crawler.model.adapter.AdapterDictEntry;
import com.yihu.ehr.crawler.model.config.SysConfig;
import com.yihu.ehr.crawler.model.patient.Patient;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
@@ -18,6 +15,7 @@ import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import net.sf.json.JSONObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -71,7 +69,6 @@ public class CrawlerManager {
            }
        }
        message = "本次采集病人共" + totalCount + "条,成功采集信息"+ count + "条";
        logger.info(message);
        return message;
    }
@@ -116,7 +113,7 @@ public class CrawlerManager {
                    if (!StringUtil.isEmpty(jsonObject.get("data")) && !StringUtil.isEmpty(jsonObject.get("data").get(0))) {
                        if (!StringUtil.isEmpty(jsonObject.get("data").get(0).get(SysConfig.getInstance().getRegisterIdCardNo()))) {
                            logger.info("注册病人");
                            dispatch.register(patient, jsonObject);
                            dispatch.register(patient, jsonObject.toString());
                        }
                    }
                }
@@ -143,13 +140,13 @@ public class CrawlerManager {
    }
    public Boolean getDataForPrepare() {
        logger.info("适配基本相关数据准备");
        if (adapterFlg) {
            return true;
        }
        logger.info("适配基本相关数据准备");
        try {
            adapterDataSetMap = new HashMap<>();
            AdapterVersion adapterVersion = null;
            AdapterVersion adapterVersion;
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            List<AdapterDatasetModel> adapterDataSetModelList = new ArrayList<>();
            if (!CollectionUtil.isEmpty(datasetList)) {
@@ -180,6 +177,10 @@ public class CrawlerManager {
                    adapterFlg = true;
                    return true;
                }
                Map<String, String> condition = new HashMap<>();
                condition.put("column", "adapter_dataset_code");
                JSONObject jsonpObject = JSONObject.fromObject(condition);
                adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
            }
            /**

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/DataCollectDispatcher.java

@@ -310,7 +310,7 @@ public class DataCollectDispatcher {
        return result;
    }
    public Boolean register(Patient patient, JsonNode data) {
    public Boolean register(Patient patient, String data) {
        return EsbHttp.register(patient, data, token);
    }

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/EsbHttp.java

@@ -260,7 +260,7 @@ public class EsbHttp {
    /**
     * 注册病人
     */
    public static Boolean register(Patient patient, JsonNode data, String token) {
    public static Boolean register(Patient patient, String data, String token) {
        try {
            JSONObject json = new JSONObject(data);
            String colName = SysConfig.registerIdCardNo;

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

@@ -11,9 +11,7 @@ import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
/**
 * Created by hzp on 2016/5/11.
@@ -24,8 +22,8 @@ public class ArchiveUploadJob implements IBaseJob {
    @Override
    public void execute(String jobId) throws Exception{
        logger.info("档案采集上传开始:"+DateConvert.toString(new Date()) + ":"+jobId);
        String random = UUID.randomUUID().toString();
        logger.info("档案采集上传开始,流水号:" + random + ",jobId:"+jobId);
        IDatacollectManager datacollect = SpringBeanUtil.getService(Services.Datacollect);
        RsJobConfig job = datacollect.getJobById(jobId);
        Map<String, Object> condition = new HashMap<>();
@@ -46,13 +44,13 @@ public class ArchiveUploadJob implements IBaseJob {
        DataGridResult result = datacollect.getJobDatasetByJobId(jobId);
        CrawlerManager crawlerManager = new CrawlerManager(result.getDetailModelList(), job.getSchemeVersion());
        crawlerManager.dataCrawler(condition);
        String message = crawlerManager.dataCrawler(condition);
        if (!job.getJobType().equals("0")) {
            job.setRepeatStartTime(end);
            job.setRepeatEndTime(DateUtil.formatYMDToYMDHMS(DateUtil.getSysDateTime().toString()));
        }
        datacollect.updateJob(job);
        logger.info("档案采集上传结束:"+DateConvert.toString(new Date()) + ":"+jobId);
        logger.info("档案采集上传结束,流水号:" + random + ",jobId:" + jobId + ",message:" + message);
        return;
    }
}