任务编排接口返回类型编排

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/flow/DtoAdapterScheme.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.crawler.model.flow;
package com.yihu.ehr.crawler.model.flow.resultModel;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/flow/DtoCrawlerDataSet.java

@@ -1,6 +1,8 @@
package com.yihu.ehr.crawler.model.flow;
package com.yihu.ehr.crawler.model.flow.resultModel;
import com.yihu.ehr.crawler.model.flow.CrawlerDataSetModel;
/**
 * 任务编排数据集关联
 */

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/flow/FlowEntrance.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.crawler.model.flow;
package com.yihu.ehr.crawler.model.flow.resultModel;
import java.io.Serializable;

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/flow/FlowLines.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.crawler.model.flow;
package com.yihu.ehr.crawler.model.flow.resultModel;
import java.io.Serializable;

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

@@ -7,10 +7,7 @@ import com.yihu.ehr.datacollect.model.RsJobLog;
import com.yihu.ehr.datacollect.service.intf.IDatacollectManager;
import com.yihu.ehr.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.model.*;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.resource.service.IStdService;
@@ -457,39 +454,33 @@ public class DataCollectController extends BaseController {
        return "partView";
    }
    @RequestMapping("getJobLayout")
    /**
     * 获取任务编排列表
     * @return
     */
    @RequestMapping("getLayout")
    @ResponseBody
    public List<SchemeResultDetailModel> getJobLayout() {
    public DetailModelResult getLayout() {
        try {
            List<SchemeResultDetailModel> schemeResultDetailModels = adapterSchemeService.getSchemeList2();
            DetailModelResult schemeResultDetailModels = adapterSchemeService.getSchemeList();
            ObjectMapper mapper = new ObjectMapper();
            String result = mapper.writeValueAsString(schemeResultDetailModels);
            return schemeResultDetailModels;
//            DictionaryResult dictionaryResult = new DictionaryResult();
//            List<DictItem> detailModelList = new ArrayList<DictItem>();
//            for(SchemeResultDetailModel schemeResultDetailModel : schemeResultDetailModels){
//                DictItem items = new DictItem();
//                String id = schemeResultDetailModel.getId();
//                items.setCode(id);
//                items.setValue(schemeResultDetailModel.getName());
//                detailModelList.add(items);
//            }
//            dictionaryResult.setDetailModelList(detailModelList);
//            return dictionaryResult;
        } catch (Exception ex) {
//            return Result.error(ex.getMessage());
            ex.printStackTrace();
            return null;
        }
    }
    /**
     * 保存或更新 任务编排信息
     *
     * @param list 适配方案 数据集关系
     * @return
     */
    @RequestMapping("updateSchemeList")
    @ResponseBody
    public Result saveOrUpdateSchemes( String list) {
    public Result saveOrUpdateSchemes(String list) {
        try {
            return adapterSchemeService.saveOrUpdateSchemeList(list);
        } catch (Exception ex) {
@@ -500,45 +491,49 @@ public class DataCollectController extends BaseController {
    /**
     * 获取适配方案 数据集关系
     * @param schemeId 适配方案ID
     *
     * @param versionId 适配方案版本ID
     * @return
     */
    @RequestMapping("getSchemeDataSets")
    @ResponseBody
    public List getSchemeDataSets(
            @RequestParam(value = "schemeId", required = true) Integer schemeId,
            @RequestParam(value = "version", required = true) String version
            ) {
    public DetailModelResult getSchemeDataSets(
            @RequestParam(value = "versionId", required = true) Integer versionId
    ) {
        try {
            return adapterSchemeService.getAdapterDataSets(schemeId,version);
        } catch (Exception ex) {
            return new ArrayList<>();
            return adapterSchemeService.getSchemeDataset(versionId);
        } catch (Exception e) {
            e.printStackTrace();
            return new DetailModelResult();
        }
    }
    /**
     * 保存适配方案数据集关系 （暂定）
     *
     * @param schemeId
     * @param version
     * @param dataSetList
     * @param data     映射关系
     * @return
     */
    @RequestMapping("addSchemeRelation")
    @ResponseBody
    public List addSchemeRelation(
    public ActionResult addSchemeRelation(
            @RequestParam(value = "schemeId", required = true) Integer schemeId,
            @RequestParam(value = "version", required = true) String version,
            @RequestParam(value = "dataSetList", required = true) String dataSetList
            @RequestParam(value = "data", required = true) String data
    ) {
        try {
            return adapterSchemeService.getAdapterDataSets(schemeId,version);
            return adapterSchemeService.saveDataSetRelation(schemeId, version, data);
        } catch (Exception ex) {
            return new ArrayList<>();
            ex.printStackTrace();
            return new ActionResult();
        }
    }
    /**
     * 保存适配方案 数据映射关系
     *
     * @param schemeId
     * @param version
     * @param data

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

@@ -7,12 +7,12 @@ import com.yihu.ehr.crawler.dao.intf.ICrawlerDao;
import com.yihu.ehr.crawler.model.flow.CrawlerDataSetModel;
import com.yihu.ehr.crawler.model.flow.CrawlerFlowHeadModel;
import com.yihu.ehr.crawler.model.flow.CrawlerFlowModel;
import com.yihu.ehr.crawler.model.flow.DtoCrawlerDataSet;
import com.yihu.ehr.crawler.model.flow.resultModel.DtoAdapterScheme;
import com.yihu.ehr.crawler.model.flow.resultModel.DtoCrawlerDataSet;
import com.yihu.ehr.crawler.model.flow.resultModel.DtoSchemeVersionModel;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
@@ -299,27 +299,25 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        return false;
    }
    public List<SchemeResultDetailModel> getSchemeList2() {
    public DetailModelResult getSchemeList() {
        String schemeHql = "FROM AdapterSchemeModel";
        Query query = getCurrentSession().createQuery(schemeHql);
        List<AdapterSchemeModel> adapterSchemeModelList = query.list();
        List<SchemeResultDetailModel> schemeList = new ArrayList<>();
        List<DtoAdapterScheme> schemeList = new ArrayList<>();
        DetailModelResult result=new DetailModelResult();
        for (AdapterSchemeModel schemeModel : adapterSchemeModelList) {
            String adapterVersionHql = "FROM AdapterSchemeVersionModel WHERE schemeId = :schemeId";
            String adapterVersionHql = "FROM AdapterSchemeVersionModel WHERE schemeId = :schemeId and publishStatus = 1";
            query = getCurrentSession().createQuery(adapterVersionHql);
            query.setParameter("schemeId", schemeModel.getId());
            List<AdapterSchemeVersionModel> versionModelList = query.list();
            String id = "" + schemeModel.getId();
            SchemeResultDetailModel resultDetailModel = new SchemeResultDetailModel();
            resultDetailModel.setId(id);
            resultDetailModel.setPid("");
            resultDetailModel.setType(0);
            DtoAdapterScheme resultDetailModel = new DtoAdapterScheme();
            resultDetailModel.setSchemeId(schemeModel.getId());
            resultDetailModel.setName(schemeModel.getName());
            resultDetailModel.setVersionList(versionModelList);
            schemeList.add(resultDetailModel);
        }
        return schemeList;
        result.setDetailModelList(schemeList);
        return result;
    }
    /**
@@ -348,27 +346,6 @@ 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";
        Query query = getCurrentSession().createQuery(adapterVersionHql);
        query.setParameter("schemeId", schemeId);
        query.setParameter("version", version);
        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).addEntity(AdapterDatasetModel.class);
        dataSetQuery.setParameter("schemeId", schemeId);
        List<AdapterDatasetModel> adapterDataSet = dataSetQuery.list();
        return adapterDataSet;
    }
    /**
     * 保存编排映射关系