标准模块采集流程调试

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

@@ -127,7 +127,7 @@ public class CrawlerManager {
            Map<String, String> condition = new HashMap<>();
            condition.put("column", "adapter_dataset_code");
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetList(AdapterDatasetModel.class, adapterVersion.getDataSetTableName(), jsonpObject.toString(), ErrorCode.GetDataSetListFailed);
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(AdapterDatasetModel.class, adapterVersion.getDataSetTableName(), jsonpObject.toString(), ErrorCode.GetDataSetListFailed);
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/PublisherController.java

@@ -0,0 +1,38 @@
package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.service.standard.StdPublisherService;
import com.yihu.ehr.system.model.SystemOrganization;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("PublisherController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "PublisherController", description = "发布者管理", tags = {"发布者"})
public class PublisherController extends BaseController {
    @Resource(name = StdPublisherService.BEAN_ID)
    private StdPublisherService stdPublisherService;
    /**
     * 根据标准ID获取发布机构（get）
     * @param publisherId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getForPublisherId")
    @ApiOperation(value = "获取发布机构", response = SystemOrganization.class, produces = "application/json", notes = "获取发布机构")
    public SystemOrganization get(
            @ApiParam(name = "publisherId", value = "机构ID")
            @RequestParam(value = "publisherId") String publisherId) {
        return stdPublisherService.get(publisherId);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterDatasetModel.java

@@ -5,11 +5,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by lingfeng on 2015/9/16.
 */
public class AdapterDatasetModel {
public class AdapterDatasetModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterDatasetRelationModel.java

@@ -5,11 +5,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by lingfeng on 2015/9/16.
 */
public class AdapterDatasetRelationModel {
public class AdapterDatasetRelationModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterDictEntryModel.java

@@ -5,11 +5,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by lingfeng on 2015/9/16.
 */
public class AdapterDictEntryModel {
public class AdapterDictEntryModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterDictModel.java

@@ -5,11 +5,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by lingfeng on 2015/9/16.
 */
public class AdapterDictModel {
public class AdapterDictModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterMetadataModel.java

@@ -5,11 +5,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by lingfeng on 2015/9/16.
 */
public class AdapterMetadataModel {
public class AdapterMetadataModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeDispatchModel.java

@@ -3,15 +3,16 @@ package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
import java.io.Serializable;
/**
 * 标准版本模型
 *
 * @Created by lingfeng 2015/12/23.
 */
@Entity(name = "adapter_scheme_dispatch")
public class AdapterSchemeDispatchModel {
@Entity
@Table(name = "adapter_scheme_dispatch")
public class AdapterSchemeDispatchModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeModel.java

@@ -3,14 +3,16 @@ package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 标准版本模型
 *
 * @Created by lingfeng 2015/12/23.
 */
@Entity(name="adapter_scheme")
public class AdapterSchemeModel {
@Entity
@Table(name="adapter_scheme")
public class AdapterSchemeModel implements Serializable {
    public static final String TABLE_NAME = "ADAPTER_SCHEME";
    @Id
    @GeneratedValue(generator = "generator")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeVersionModel.java

@@ -3,6 +3,7 @@ package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
@@ -10,8 +11,9 @@ import java.util.Date;
 *
 * @created lingfeng 2015/12/23.
 */
@Entity(name = "adapter_scheme_version")
public class AdapterSchemeVersionModel {
@Entity
@Table(name = "adapter_scheme_version")
public class AdapterSchemeVersionModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardModel.java

@@ -10,8 +10,9 @@ import java.io.Serializable;
 *
 * @created Airhead 2015/12/23.
 */
@Entity(name = "std_info")
public class StandardModel  implements Serializable {
@Entity
@Table(name = "std_info")
public class StandardModel implements Serializable {
    public static final String TABLE_NAME = "STD_INFO";
    @Id

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardVersionModel.java

@@ -11,7 +11,8 @@ import java.util.Date;
 *
 * @created Airhead 2015/12/23.
 */
@Entity(name = "std_version")
@Entity
@Table(name = "std_version")
public class StandardVersionModel implements Serializable {
    public static final String TABLE_NAME = "STD_VERSION";

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdCDACatalogModel.java

@@ -3,14 +3,16 @@ package com.yihu.ehr.standard.model.standard;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * CDA类型模型
 *
 * @created Airhead 2015/12/23.
 */
@Entity(name = "std_cda_catalog")
public class StdCDACatalogModel {
@Entity
@Table(name = "std_cda_catalog")
public class StdCDACatalogModel implements Serializable {
    public static String TABLE_NAME="STD_CDA_CATALOG";
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdCDADatasetModel.java

@@ -4,13 +4,14 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * CDA与数据集关系模型
 *
 * @created Airhead 2015/12/23.
 */
public class StdCDADatasetModel {
public class StdCDADatasetModel implements Serializable {
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdCDAModel.java

@@ -4,11 +4,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * @created Airhead 2015/12/23.
 */
public class StdCDAModel {
public class StdCDAModel implements Serializable {
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDataSetModel.java

@@ -4,11 +4,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by wq on 2015/9/16.
 */
public class StdDataSetModel {
public class StdDataSetModel implements Serializable {
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDatasetCatalogModel.java

@@ -2,18 +2,17 @@ package com.yihu.ehr.standard.model.standard;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 数据集模型
 *
 * @created Airhead 2015/12/23.
 */
@Entity(name = "std_dataset_catalog")
public class StdDatasetCatalogModel {
@Entity
@Table(name = "std_dataset_catalog")
public class StdDatasetCatalogModel implements Serializable {
    public static String TABLE_NAME = "STD_DATASET_CATALOG";
    @Id

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDictionaryEntryModel.java

@@ -4,11 +4,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * @created Airhead 2015/12/23.
 */
public class StdDictionaryEntryModel {
public class StdDictionaryEntryModel implements Serializable {
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDictionaryModel.java

@@ -4,13 +4,14 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * 标准数据字典模型
 *
 * @created Airhead 2015/12/23.
 */
public class StdDictionaryModel {
public class StdDictionaryModel implements Serializable {
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdMetaDataModel.java

@@ -4,11 +4,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
/**
 * Created by wq on 2015/9/22.
 */
public class StdMetaDataModel {
public class StdMetaDataModel implements Serializable {
    @Id
    @GenericGenerator(name = "generator", strategy = "increment")
    @Column(name = "id")

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterDatasetService.java

@@ -399,7 +399,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        return sql.toString();
    }
    public List getAdapterDatasetList(Class tClass, String tableName, String condition, ErrorCode errorCode) {
    public List getAdapterDatasetNotNullList(Class tClass, String tableName, String condition, ErrorCode errorCode) {
        try {
            StringBuffer sql = new StringBuffer();
            sql.append("SELECT * FROM ").append(tableName);

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardService.java

@@ -299,12 +299,19 @@ public class StandardService extends SQLGeneralDAO {
        List<Object[]> list = getSysParamList();
        String code = StringUtil.toString(list.get(0)[0]);
        String publishOrgCode = StringUtil.toString(list.get(0)[1]);
        String publisherHql = "FROM SystemOrganization";
        SqlCreator sqlCreator = new SqlCreator(StandardModel.class);
        if (type == 0) {
            sqlCreator.equalCondition("code", code);
            publisherHql = publisherHql + " WHERE code = :code";
        } else {
            sqlCreator.neCondition("code", code);
            publisherHql = publisherHql + " WHERE code != :code";
        }
        Query query = getCurrentSession().createQuery(publisherHql);
        query.setParameter("code", publishOrgCode);
        List<SystemOrganization> publisherModelList = query.list();
        String sql = sqlCreator.selectData(StandardModel.TABLE_NAME);
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StandardModel> standardModelList = sessionQuery.list();
@@ -316,9 +323,7 @@ public class StandardService extends SQLGeneralDAO {
        if (CollectionUtil.isEmpty(idList)) {
            idList.add(null);
        }
        String publisherHql = "FROM SystemOrganization";
        Query query = getCurrentSession().createQuery(publisherHql);
        List<SystemOrganization> publisherModelList = query.list();
        String versionHql = "FROM StandardVersionModel WHERE standardId IN :idList";
        query = getCurrentSession().createQuery(versionHql);
        query.setParameterList("idList", idList);

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdPublisherService.java

@@ -74,7 +74,7 @@ public class StdPublisherService extends SQLGeneralDAO {
        return systemOrganizationList;
    }
    public SystemOrganization get(Integer stdPublisherId) {
    public SystemOrganization get(String stdPublisherId) {
        try {
            Session session = getCurrentSession();
            Criteria criteria = session.createCriteria(SystemOrganization.class);