修改任务编排功能

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

@@ -12,13 +12,13 @@ import java.util.List;
 * Created at 2016/4/27.
 */
public class DtoSchemeVersionModel extends AdapterSchemeVersionModel implements Serializable {
    private List<CrawlerDataSetModel> dataSets;
    private String dataSets;
    public List<CrawlerDataSetModel> getDataSets() {
    public String getDataSets() {
        return dataSets;
    }
    public void setDataSets(List<CrawlerDataSetModel> dataSets) {
    public void setDataSets(String dataSets) {
        this.dataSets = dataSets;
    }
}

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

@@ -445,17 +445,8 @@ public class DataCollectController extends BaseController {
        }
    }
    /*
    任务编排
     */
    @RequestMapping("jobLayout")
    public String jobLayout(Model model) {
        model.addAttribute("contentPage", "/datacollect/jobLayout");
        return "partView";
    }
    /**
     * 获取任务编排列表
     * 获取适配方案-版本下拉框列表
     * @return
     */
    @RequestMapping("getLayout")
@@ -463,8 +454,22 @@ public class DataCollectController extends BaseController {
    public DetailModelResult getLayout() {
        try {
            DetailModelResult schemeResultDetailModels = adapterSchemeService.getSchemeList();
            ObjectMapper mapper = new ObjectMapper();
            String result = mapper.writeValueAsString(schemeResultDetailModels);
            return schemeResultDetailModels;
        } catch (Exception ex) {
            ex.printStackTrace();
            return null;
        }
    }
    /**
     * 获取任务编排 适配版本列表
     * @return
     */
    @RequestMapping("getSchemeVersionList")
    @ResponseBody
    public DetailModelResult getSchemeVersionList() {
        try {
            DetailModelResult schemeResultDetailModels = adapterSchemeService.getSchemeVersionList();
            return schemeResultDetailModels;
        } catch (Exception ex) {
            ex.printStackTrace();
@@ -553,6 +558,15 @@ public class DataCollectController extends BaseController {
        }
    }
    /*
 任务编排
  */
    @RequestMapping("jobLayout")
    public String jobLayout(Model model) {
        model.addAttribute("contentPage", "/datacollect/jobLayout");
        return "partView";
    }
    /*
   任务编排数据映射
    */
@@ -569,10 +583,11 @@ public class DataCollectController extends BaseController {
    }
    @RequestMapping("datasetDetail")
    public String datasetDetail(Model model,Integer schemeId,String version) {
    public String datasetDetail(Model model,Integer schemeId,String schemeNm,String version) {
        model.addAttribute("contentPage", "/datacollect/datasetDetail");
        model.addAttribute("schemeId",schemeId);
        model.addAttribute("version",version);
        model.addAttribute("schemeNm",schemeNm);
        return "pageView";
    }

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

@@ -421,25 +421,23 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        List<CrawlerDataSetModel> crawlerDataset = crawlerDao.getSchemeDataset(versionModel.getId());
        DetailModelResult re = new DetailModelResult();
        List<DtoCrawlerDataSet> list = new ArrayList<>();
        for (Object item : jsonArray) {
            JSONObject jsonItem = JSONObject.fromObject(item);
            String datasetId = jsonItem.getString("adapterDatasetId");
            //是否关联任务
        for (AdapterDatasetModel datasetModel:datasetString){
            DtoCrawlerDataSet obj = new DtoCrawlerDataSet();
            obj.setSchemeVersionId(schemeVersionId);
            obj.setDatasetId(datasetModel.getStdDatasetId());
            obj.setDatasetCode(datasetModel.getStdDatasetCode());
            obj.setDatasetName(datasetModel.getStdDatasetName());
            obj.setSchemeId(datasetModel.getSchemeId());
            if (crawlerDataset != null && crawlerDataset.size() > 0) {
                DtoCrawlerDataSet obj = new DtoCrawlerDataSet();
                for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                    if (cDataSet.getDatasetId().equals(datasetId)) {
                    if (cDataSet.getDatasetId().equals(datasetModel.getId())) {
                        obj.setSchemeVersionId(cDataSet.getSchemeVersionId());
                        obj.setDatasetId(cDataSet.getDatasetId());
                        obj.setDatasetCode(cDataSet.getDatasetCode());
                        obj.setDatasetName(cDataSet.getDatasetName());
                        obj.setSchemeId(cDataSet.getSchemeId());
                        obj.setChecked("1");
                        break;
                    }
                }
                list.add(obj);
            }
            list.add(obj);
        }
        re.setDetailModelList(list);
        return re;
@@ -460,12 +458,13 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        if (modelList !=null && modelList.size()> 0){
            for (AdapterSchemeVersionModel model:modelList){
                List<CrawlerDataSetModel> crawlerDataset = crawlerDao.getSchemeDataset(model.getId());
                String dataSets=getAppendDataSets(crawlerDataset);
                DtoSchemeVersionModel dtoModel=new DtoSchemeVersionModel();
                dtoModel.setSchemeId(model.getSchemeId());
                dtoModel.setId(model.getId());
                dtoModel.setVersion(model.getVersion());
                dtoModel.setName(model.getName());
                dtoModel.setDataSets(crawlerDataset);
                dtoModel.setDataSets(dataSets);
                list.add(dtoModel);
            }
        }
@@ -473,4 +472,12 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        return re;
    }
    public String getAppendDataSets(List<CrawlerDataSetModel> crawlerDataset ){
        StringBuffer buffer=new StringBuffer();
        for (CrawlerDataSetModel crawlerDataSetModel:crawlerDataset){
            buffer.append(crawlerDataSetModel.getDatasetName()).append(",");
        }
        return buffer.toString();
    }
}

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/datasetDetail.jsp

@@ -13,7 +13,7 @@
  <div class="m-form-group" style="margin-left: 10px;">
    <label style="text-align: left;width: 68px;">已选择：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240" id="lbl_publisher" style="text-align: left"></label>
      <label type="text" class="f-w240" id="lbl_publisher" style="text-align: left">${schemeNm}</label>
    </div>
  </div>
  <div class="m-form-group" style="margin-left: 10px;">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/datasetDetailJs.jsp

@@ -11,7 +11,7 @@
  (function ($, win) {
      var jobDataset = {};
      var Util = $.Util;
      var schemeId = "${schemeId}";
      //集成标准处理
      jobDataset.attr = {
        grid:null,
@@ -25,16 +25,28 @@
            }});
            //parms:{schemeId:"${schemeId}",version:"${version}"},
            this.grid = $("#div_dataset_grid").ligerGrid({
                url: '${contextRoot}/datacollect/getJob',
                url: '${contextRoot}/datacollect/getSchemeDataSets',
                parms:{versionId:"${version}"},
                checkbox: true,
                width:560,
                height:400,
                usePager: false,
                columns: [
                    {display:'数据集编码',name:'jobDataset', width: '50%'},
                    {display:'数据集名称',name:'jobDataset',width: '50%'}
                    { display: 'datasetId', name: 'datasetId', hide:true },
                    {display:'数据集编码',name:'datasetCode', width: '50%'},
                    {display:'数据集名称',name:'datasetName',width: '50%'}
                ],
                usePager: true
                //默认选中
                isChecked:function(row){
                    if(row.checked=="1")
                    {
                        return true;
                    }
                    else{
                        return false;
                    }
                },
            });
          this.event();

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/jobLayoutJs.jsp

@@ -19,12 +19,11 @@
            $('.m-retrieve-area').show();
            $.ajax({
                url: '${contextRoot}/datacollect/getJobLayout',
                type: "get",
                url: '${contextRoot}/datacollect/getLayout',
                dataType: "json",
                success: function (data) {
                    if(!Util.isStrEmpty(data)){
                        schemeVersionList = data || [];
                    if(data.successFlg){
                        schemeVersionList = data.detailModelList || [];
                    }else{
                        $.ligerDialog.error(data.message);
                    }
@@ -37,37 +36,40 @@
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/datacollect/getJob',
//                usePager: false,
                url: '${contextRoot}/datacollect/getSchemeVersionList',
                usePager: false,
                columns: [
                    {display:'适配方案',name:'schemeAndVersion', width: '20%',render: function (row, rowindex, value, column) {
                        //<option value="">请选择</option>
                        var select= '<select class="sel-scheme-id form-control"  id="schemeId'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                    { display: 'schemeId', name: 'schemeId', hide:true },
                    { display: 'id', name: 'id', hide:true },
                    {display:'适配方案',name:'', width: '20%',render: function (row, rowindex, value, column) {
                        var select= '<select class="sel-scheme-name form-control"  id="schemeNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        for(var i=0;i<schemeVersionList.length;i++){
                            select+='<option value="'+schemeVersionList[i].id+'">'+schemeVersionList[i].name+'</option>';
                            select+='<option value="'+schemeVersionList[i].schemeId+'">'+schemeVersionList[i].name+'</option>';
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'版本',name:'jobPlan',width: '20%',render: function (row, rowindex, value, column) {
                        var select= '<select class="sel-version-id form-control"  id="versionId'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                    {display:'版本',name:'',width: '20%',render: function (row, rowindex, value, column) {
                        var select= '<select class="sel-version-name form-control"  id="versionNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        var versionList = [];
                        for(var i=0;i<schemeVersionList.length;i++){
                            versionList = schemeVersionList[i].versionList;
                            for(var j=0;j<versionList.length;j++){
                                select+='<option value="'+versionList[j].id+'">'+versionList[j].name+'</option>';
                            if(schemeVersionList[i].schemeId == row.schemeId){
                                versionList = schemeVersionList[i].versionList;
                                for(var j=0;j<versionList.length;j++){
                                    select+='<option value="'+versionList[j].id+'">'+versionList[j].name+'</option>';
                                }
                            }
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        $('option[value="'+row.id+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'数据集名称',name:'jobDataset', width: '40%',render: function (row, rowindex, value, column) {
                        var html = '<input style="margin-top:3px;font-size:12px;" data-rowindex="'+rowindex+'" class="sel-dataset-name form-control" value="'+(value || "")+'" >' +
                    {display:'数据集名称',name:'dataSets', width: '40%',render: function (row, rowindex, value, column) {
                        var dataSets = value.toString().substring(0,value.length-1);
                        var html = '<input style="margin-top:3px;font-size:12px;" data-rowindex="'+rowindex+'" class="sel-dataset-name form-control" value="'+(dataSets || "")+'" >' +
                                '<div style="display: none;" id="datasetId'+rowindex+'"></div>';
                        return html;
                    }},
@@ -81,11 +83,11 @@
                onAfterShowData: function (gridData) {//显示完数据事件
                    //【适配方案】change事件
                    $(".sel-scheme-id").on("change", function() {
                    $(".sel-scheme-name").on("change", function() {
                        var rowIndex = $(this).attr("id").replace("schemeId","");
                        var option = "";
                        for(var i=0;i<schemeVersionList.length;i++){
                            if(schemeVersionList[i].id == $(this).val()){
                            if(schemeVersionList[i].schemeId == $(this).val()){
                                versionList = schemeVersionList[i].versionList;
                                for(var j=0;j<versionList.length;j++){
                                    option+='<option value="'+versionList[j].id+'">'+versionList[j].name+'</option>';
@@ -98,11 +100,10 @@
                    //【数据集名称】focus事件
                    $(".sel-dataset-name").on("focus", function() {
                        debugger
                        var rowindex = $(this).attr("data-rowindex");
                        jobLayout.grid.select(rowindex);//选中行
                        var row = jobLayout.grid.getSelectedRow();
                        var  params = {schemeId:"",version:""};
                        var  params = {schemeId:row.schemeId,version:row.id,schemeNm:$("#schemeNm"+rowindex).find("option:selected").text()};
                        me.dialog = $.ligerDialog.open({
                            height: 600,
                            width: 600,