获取适配方案数据集关联列表 返回格式修改

Hos-resource/src/main/java/com/yihu/ehr/datacollect/controller/DataCollectController.java

@@ -484,7 +484,7 @@ public class DataCollectController extends BaseController {
    /**
     * 保存或更新 任务编排信息
     * @param list
     * @param list 适配方案 数据集关系
     * @return
     */
    @RequestMapping("updateSchemeList")
@@ -506,8 +506,8 @@ public class DataCollectController extends BaseController {
    @RequestMapping("getSchemeDataSets")
    @ResponseBody
    public List getSchemeDataSets(
            @RequestParam(value = "schemeId", required = false) Integer schemeId,
            @RequestParam(value = "version", required = false) String version
            @RequestParam(value = "schemeId", required = true) Integer schemeId,
            @RequestParam(value = "version", required = true) String version
            ) {
        try {
            return adapterSchemeService.getAdapterDataSets(schemeId,version);

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

@@ -2,14 +2,16 @@ package com.yihu.ehr.standard.model.adapter;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lingfeng on 2015/9/16.
 */
@Entity
// 表名与类名不相同时重新定义表名.
@Table(name = "adapter_dataset")
public class AdapterDatasetModel implements Serializable {
    @Id
    @GeneratedValue(generator = "generator")

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

@@ -309,6 +309,12 @@ public class AdapterSchemeService extends SQLGeneralDAO {
    }
    /**
     * 根据适配版本 获取数据集列表
     * @param schemeId
     * @param version
     * @return
     */
    public List<AdapterDatasetModel> getAdapterDataSets(Integer schemeId,String version){
        List<AdapterDatasetModel> list=new ArrayList<>();
        String adapterVersionHql = "FROM AdapterSchemeVersionModel WHERE schemeId = :schemeId and version = :version";
@@ -318,11 +324,12 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        AdapterSchemeVersionModel versionModel =(AdapterSchemeVersionModel) query.uniqueResult();
        String tableName="adapter_dataset_"+versionModel.getVersion();
        String adapterDataSetSql = "select * FROM "+tableName+" WHERE scheme_id = :schemeId";
        Query dataSetQuery = getCurrentSession().createSQLQuery(adapterDataSetSql);
        Query dataSetQuery = getCurrentSession().createSQLQuery(adapterDataSetSql).addEntity(AdapterDatasetModel.class);
        dataSetQuery.setParameter("schemeId", schemeId);
        List<AdapterDatasetModel> adapterDataSet=dataSetQuery.list();
        //TODO 数据据获取
        return adapterDataSet;
    }
}