Merge branch 'master' of lulihong0928/esb into master

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

@@ -97,6 +97,7 @@
        <div class="m-form-group">
            <label>数据集列表：</label>
            <div id="listDataset" class="m-form-control"></div>
            <div id="crawlerListDataset" class="m-form-control f-dn"></div>
        </div>
    </div>

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

@@ -7,9 +7,11 @@
    var editorJob={
        beforeServeTime:false,
        archiveUpload:"com.yihu.ehr.job.service.ArchiveUploadJob",
        crawlerFlowUpload:"com.yihu.ehr.job.service.CrawlerFlowUploadJob",
        $form:$("#div_form"),
        $listPlan:null,//适配方案列表
        $listDataset:null,//数据集列表
        $crawlerFlowDataset:null,//任务编排数据集列表
        $conditionDialog:null,//数据集配置条件弹窗
        $condition:null,//条件选择控件
        needReload:true, //需要刷新关联数据集
@@ -32,7 +34,13 @@
                },
                onStepChanged:function(b,to,from){
                    if(to==1){
                        me.$listPlan.reRender();
                        if($('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload){//类名为任务编排上传类
                            me.$listPlan.setOptions({ url: '${contextRoot}/crawler/savedSchemeList'});
                            me.$listPlan.loadData(true);
                        }else{
                            me.$listPlan._setData($.parseJSON('${schemeList}'));
                            me.$listPlan.reRender();
                        }
                    }
                    else if(to==2){
                        //接口为档案上传时，数据集不可编辑
@@ -42,6 +50,19 @@
                                { display: '数据集代码', name: 'jobDatasetCode' },
                                { display: '数据集名称', name: 'jobDatasetName' }
                            ]);
                        }else if($('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload){//类名为任务编排上传类,数据集只能查看
                            $("#listDataset").hide();
                            $("#crawlerListDataset").show();
                            var selected = me.$listPlan.getSelectedRow();
                            if(selected!=null) {
                                me.$crawlerFlowDataset.setOptions({url: '${contextRoot}/crawler/savedJobData', parms: [{ name: 'version', value:selected.id}],checkbox:false});
                                me.$crawlerFlowDataset.set("columns", [
                                    { display: '数据集代码', name: 'jobDatasetCode' },
                                    { display: '数据集名称', name: 'jobDatasetName' }
                                ]);
                                me.$crawlerFlowDataset.loadData(true);
                            }
                            return false;
                        }
                        else{
                            me.$listDataset.set("columns", [
@@ -55,7 +76,8 @@
                                } }
                            ]);
                        }
                        $("#listDataset").show();
                        $("#crawlerListDataset").hide();
                        //刷新数据集
                        if(me.needReload)
                        {
@@ -226,6 +248,32 @@
                    editorJob.setCheckVal();
                }
            });
            //任务编排上传类的数据集列表
            me.$crawlerFlowDataset = $("#crawlerListDataset").ligerGrid({
                url: '${contextRoot}/crawler/getSchemeDataSets',
                dataType : "json",
                cache:false,
                columns: [
                    { display: '数据集代码', name: 'jobDatasetCode' },
                    { display: '数据集名称', name: 'jobDatasetName' },
                    { display: '执行条件', name: 'jobDatasetCondition', render: function (row,rowIndex) {
                        var html = '<div class="m-inline-buttons" style="width:55px;">';
                        html += "<a href=\"javascript:void(0)\" onclick=\"javascript:editorJob.setCondition("+rowIndex+");\">设置筛选</a>";
                        return html;
                    } }
                ],
                delayLoad:true,//初始化不加载
                alternatingRow:true,
                selectRowButtonOnly:true,
                rownumbers:false,
                usePager:false,
                checkbox:false,
                height:340,
                width:360
            });
            //初始化条件选择控件
            $('#jobDatasetCondition').ligerCondition({
                stdDictUrl:"${contextRoot}/std/getDictByScheme"
@@ -368,6 +416,7 @@
        },
        //获取数据
        getData:function(){
            var me = this;
            var type = $('input[name="jobContentType"]').ligerRadio('getValue');
            var content = "";
            if(type == "0")
@@ -378,6 +427,10 @@
                content = $("#jobContentClass").ligerComboBox("getValue");
            }
            if($('#jobContentClass').ligerComboBox("getValue")==me.crawlerFlowUpload) {//任务编排上传类，不需要选择数据集,直接设值
                $("#txtJobDataset").val(JSON.stringify(me.$crawlerFlowDataset.getData()));
            }
            var model ={
                id:$('#txtId').val(),
                jobName: $('#txtJobName').val(),
@@ -608,38 +661,37 @@
                }
                case 3:
                {
                    var dataset = $("#txtJobDataset").val();
                    //数据集不能为空
                    if(dataset == null || dataset =="[]")
                    {
                        me.setCheckVal();
                        dataset = $("#txtJobDataset").val();
                        if(dataset == null || dataset =="[]") {
                            $.ligerDialog.error("请选择数据集！");
                            return false;
                        }
                    if($('#jobContentClass').ligerComboBox("getValue")!=me.crawlerFlowUpload) {//不是任务编排上传类
                        var dataset = $("#txtJobDataset").val();
                        //数据集不能为空
                        if(dataset == null || dataset =="[]")
                        {
                            me.setCheckVal();
                            dataset = $("#txtJobDataset").val();
                            if(dataset == null || dataset =="[]") {
                                $.ligerDialog.error("请选择数据集！");
                                return false;
                            }
                    }
                        }
                    //判断是否设置轮询字段和字段类型   档案上传不校验 @modify by cyj
                    if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload) {
                        var selected = me.$listDataset.getSelectedRows();
                        for(var i=0;i<selected.length;i++)
                        {
                            if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                        //判断是否设置轮询字段和字段类型   档案上传不校验 @modify by cyj
                        if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload) {
                            var selected = me.$listDataset.getSelectedRows();
                            for(var i=0;i<selected.length;i++)
                            {
                                if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                                {
                            }
                            else{
                                $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                                return false;
                                }
                                else{
                                    $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                                    return false;
                                }
                            }
                        }
                    }
                    return true;
                }
                default :

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

@@ -104,7 +104,7 @@
            var changeCheckbox = document.querySelector('#jobStatusSwitch');
            me.switchery = new Switchery(changeCheckbox, { disabled: true,size: 'large' });
            changeCheckbox.onchange = function() {
                debugger
                //debugger
                var a = me.switchery;
                var jobId = $("#selJob").ligerComboBox("getValue");
@@ -126,7 +126,7 @@
        },
        //获取任务相关数据
        search:function(jobId){
            debugger
            //debugger
            var me = this;
            me.clearTop();
            me.initSwitcher();