Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/model/RsJobConfig.java

@@ -20,6 +20,9 @@ public class RsJobConfig implements java.io.Serializable {
	private String valid;
	private String jobContent;
	private String jobContentType;
	private Date repeatStartTime;
	private Date repeatEndTime;
	private Integer delayTime;
	// Constructors
@@ -126,4 +129,27 @@ public class RsJobConfig implements java.io.Serializable {
		this.valid = valid;
	}
	public Date getRepeatStartTime() {
		return repeatStartTime;
	}
	public void setRepeatStartTime(Date repeatStartTime) {
		this.repeatStartTime = repeatStartTime;
	}
	public Date getRepeatEndTime() {
		return repeatEndTime;
	}
	public void setRepeatEndTime(Date repeatEndTime) {
		this.repeatEndTime = repeatEndTime;
	}
	public Integer getDelayTime() {
		return delayTime;
	}
	public void setDelayTime(Integer delayTime) {
		this.delayTime = delayTime;
	}
}

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectService.java

@@ -464,6 +464,9 @@ public class DatacollectService implements IDatacollectService {
    /**
     * 执行任务
     */

Hos-resource/src/main/java/com/yihu/ehr/job/service/ArchiveUploadJob.java

@@ -0,0 +1,27 @@
package com.yihu.ehr.job.service;
import com.yihu.ehr.common.Services;
import com.yihu.ehr.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.framework.constrant.DateConvert;
import javax.annotation.Resource;
import java.util.Date;
/**
 * Created by hzp on 2016/5/11.
 */
public class ArchiveUploadJob implements IBaseJob {
    @Resource(name = Services.DatacollectService)
    IDatacollectService service;
    @Override
    public void execute(String jobId) throws Exception{
        
        System.out.println("档案上传quartz:"+DateConvert.toString(new Date()) + ":"+jobId);
        return;
    }
}

Hos-resource/src/main/resources/hbm/resource/RsJobConfig.hbm.xml

@@ -55,5 +55,21 @@
                <comment>任务内容类型</comment>
            </column>
        </property>
        <property name="repeatStartTime" type="java.util.Date">
            <column name="repeat_Start_Time">
                <comment>采集开始时间</comment>
            </column>
        </property>
        <property name="repeatEndTime" type="java.util.Date">
            <column name="repeat_End_Time">
                <comment>采集结束时间</comment>
            </column>
        </property>
        <property name="delayTime" type="java.lang.Integer">
            <column name="delay_Time">
                <comment>延迟时间</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

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

@@ -110,11 +110,32 @@
            </div>
        </div>
        <div class="m-form-group">
            <label>开始执行时间：</label>
            <label>任务开始执行时间：</label>
            <div class="m-form-control">
                <input id="dateNextTime" type="text" id="jobNextTime" />
            </div>
        </div>
        <div class="m-form-group" id="divRepeatStart" style="display: none">
            <label>采集开始时间：</label>
            <div class="m-form-control">
                <input id="repeatStartTime" type="text" />
            </div>
        </div>
        <div class="m-form-group" id="divRepeatEnd" style="display: none">
            <label>采集结束时间：</label>
            <div class="m-form-control">
                <input id="repeatEndTime" type="text" />
            </div>
        </div>
        <div id="divDelayTime" class="m-form-group" style="display: none">
            <label>延迟时间：</label>
            <div class="m-form-control">
                <input type="text" id="txtDelayTime" />
            </div>
            <div style="float:left;line-height:30px;padding-left:4px;">天</div>
        </div>
        <div class="m-form-group" id="divTimeInterval">
            <label>执行周期：</label>
            <div class="m-form-control">

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

@@ -5,6 +5,7 @@
<script>
    var editorJob={
        archiveUpload:"com.yihu.ehr.job.service.ArchiveUploadJob",
        $form:$("#div_form"),
        $listPlan:null,//适配方案列表
        $listDataset:null,//数据集列表
@@ -32,12 +33,34 @@
                        me.$listPlan.reRender();
                    }
                    else if(to==2){
                        //接口为档案上传时，数据集不可编辑
                        if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload)
                        {
                            me.$listDataset.set("columns", [
                                { display: '数据集代码', name: 'jobDatasetCode' },
                                { display: '数据集名称', name: 'jobDatasetName' }
                            ]);
                        }
                        else{
                            me.$listDataset.set("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;
                                } }
                            ]);
                        }
                        //刷新数据集
                        if(me.needReload)
                        {
                            me.$listDataset.set({
                                parms: {jobId:$('#txtId').val(),schemeId:$("#txtSchemeId").val(),schemeVersion:$("#txtSchemeVersion").val()}
                            });
                            me.$listDataset.reload();
                            me.needReload=false;
                        }
@@ -45,6 +68,10 @@
                            me.$listDataset.reRender();
                        }
                    }
                    else if(to==3)
                    {
                        me.setAchiveUploadType();
                    }
                },
                onFinishing:function(c,a){
                    editorJob.setCheckVal();
@@ -210,12 +237,7 @@
            $('input[name="interval_type"]').ligerRadio();
            $(document).on('click','input[name="jobType"]',function(){
                var value = $(this).val();
                if(value=="0"){//单次执行
                    $("#divTimeInterval").hide();
                }
                else{
                    $("#divTimeInterval").show();
                }
                me.setAchiveUploadType(value);
            });
            $(document).on('click','input[name="interval_type"]',function(){
                //清空数据
@@ -229,6 +251,7 @@
            $("#txtH").ligerSpinner({width: 208,type: 'int',minValue:1});
            $("#txtD").ligerSpinner({width: 208,type: 'int',minValue:1});
            $("#txtMD").ligerSpinner({width: 160,type: 'int',minValue:1});
            $('input[name="week_day"]').ligerCheckBox();
            $('input[name="month_day"]').ligerRadio();
@@ -244,6 +267,17 @@
                }
            });
            /** 档案上传参数 **/
            $("#txtDelayTime").ligerSpinner({width: 240,type: 'int',minValue:1});
            $("#repeatStartTime").ligerDateEditor({
                width: 240,
                showTime: true
            });
            $("#repeatEndTime").ligerDateEditor({
                width: 240,
                showTime: true
            });
            me.initData();
        },
        //初始化数据
@@ -265,7 +299,10 @@
                    schemeVersion: '${model.schemeVersion}',
                    valid: '${model.valid}',
                    cronExpression: '${cronExpression}',
                    jobNextTime: '${model.jobNextTime}'
                    jobNextTime: '${model.jobNextTime}',
                    repeatStartTime:'${model.repeatStartTime}',
                    repeatEndTime:'${model.repeatEndTime}',
                    delayTime:'${model.delayTime}'
                };
                $('#txtId').val(model.id);
@@ -275,12 +312,33 @@
                me.setJobContentType(model.jobContentType,model.jobContent);
                $('input[name="jobType"]').ligerRadio('setValue',model.jobType);
                //非档案上传时隐藏
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                    $("#divDelayTime").hide();
                    $("#divRepeat").hide();
                }
                if(model.jobType=="0")//单次执行
                {
                    $("#divTimeInterval").hide();
                    //接口为档案上传时
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                        $("#divDelayTime").hide();
                        $("#divRepeat").show();
                        $("#repeatStartTime").ligerDateEditor("setValue",model.repeatStartTime);
                        $("#repeatEndTime").ligerDateEditor("setValue",model.repeatEndTime);
                    }
                }
                else{
                    $("#divTimeInterval").show();
                    //接口为档案上传时
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                        $("#divDelayTime").show();
                        $("#divRepeat").hide();
                        $("#repeatStartTime").ligerDateEditor("setValue",model.repeatStartTime);
                        $("#txtDelayTime").val(model.delayTime);
                    }
                }
                $('#txtSchemeId').val(model.schemeId);
                $('#txtSchemeVersion').val(model.schemeVersion);
@@ -317,11 +375,52 @@
                valid:  $('#txtValid').val(),
                cronExpression: $('#txtCronExpression').val(),
                jobNextTime: $("#dateNextTime").ligerDateEditor('getValue'),
                jobDataset: $('#txtJobDataset').val()
                jobDataset: $('#txtJobDataset').val(),
                repeatStartTime: $("#repeatStartTime").ligerDateEditor('getValue'),
                repeatEndTime: $("#repeatEndTime").ligerDateEditor('getValue'),
                delayTime: $('#txtDelayTime').val(),
            };
            return model;
        },
        //改变为档案上传接口，执行方式修改时触发,清空数据
        setAchiveUploadType:function(jobType){
            var me = this;
            if(jobType==undefined)
            {
                jobType = $('input[name="jobType"]').ligerRadio("getValue");
            }
            if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload) {
                $("#divDelayTime").hide();
                $("#divRepeatStart").hide();
                $("#divRepeatEnd").hide();
                $("#txtM").val("");
                $("#repeatStartTime").ligerDateEditor("setValue","");
                $("#repeatEndTime").ligerDateEditor("setValue","");
            }
            if(jobType=="0")//单次执行
            {
                $("#divTimeInterval").hide();
                //接口为档案上传时
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                    $("#divDelayTime").hide();
                    $("#divRepeatStart").show();
                    $("#divRepeatEnd").show();
                    $("#txtDelayTime").val("");
                }
            }
            else{
                $("#divTimeInterval").show();
                //接口为档案上传时
                if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload) {
                    $("#divDelayTime").show();
                    $("#repeatEndTime").ligerDateEditor("setValue","");
                    $("#divRepeatStart").show();
                    $("#divRepeatEnd").hide();
                }
            }
        },
        //设置任务执行类型
        setJobContentType:function(jobContentType,jobContent){
            if(jobContentType == "0")
@@ -435,7 +534,7 @@
                    //下次执行时间不能为空
                    if(data.jobNextTime == null || data.jobNextTime == 0)
                    {
                        $.ligerDialog.error("请输入下次执行时间！");
                        $.ligerDialog.error("请输入任务开始执行时间！");
                        return false;
                    }
@@ -451,6 +550,18 @@
                    else{
                        $("#txtCronExpression").val("");
                    }
                    //档案上传接口值校验
                    if($('#jobContentClass').ligerComboBox("getValue")==me.archiveUpload)
                    {
                        if(data.jobType == "0") {
                            if($("#repeatStartTime").ligerDateEditor("getValue")==""&&$("#repeatEndTime").ligerDateEditor("getValue")=="")
                            {
                                $.ligerDialog.error("请输采集时间！");
                                return false;
                            }
                        }
                    }
                }
                case 1:
                {

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -319,6 +319,83 @@
            g._updateHorizontalScrollStatus.ligerDefer(g, 10);
        },
        //是否固定列
        _onResize: function ()
        {
            var g = this, p = this.options;
            if (p.height && p.height != 'auto')
            {
                var windowHeight = $(window).height();
                //if(g.windowHeight != undefined && g.windowHeight == windowHeight) return;
                var h = 0;
                var parentHeight = null;
                if (typeof (p.height) == "string" && p.height.indexOf('%') > 0)
                {
                    var gridparent = g.grid.parent();
                    if (p.inWindow)
                    {
                        parentHeight = windowHeight;
                        parentHeight -= parseInt($('body').css('paddingTop'));
                        parentHeight -= parseInt($('body').css('paddingBottom'));
                    }
                    else
                    {
                        parentHeight = gridparent.height();
                    }
                    h = parentHeight * parseInt(p.height) * 0.01;
                    if (p.inWindow || gridparent[0].tagName.toLowerCase() == "body")
                        h -= (g.grid.offset().top - parseInt($('body').css('paddingTop')));
                }
                else
                {
                    h = parseInt(p.height);
                }
                h += p.heightDiff;
                g.windowHeight = windowHeight;
                g._setHeight(h);
            }
            else
            {
                g._updateHorizontalScrollStatus.ligerDefer(g, 10);
            }
            if (g.enabledFrozen())
            {
                var gridView1Width = g.gridview1.width();
                var gridViewWidth = g.gridview.width();
                g.gridview2.css({
                    width: gridViewWidth - gridView1Width
                });
                if(gridView1Width>0)
                {
                    g.gridview1.css({
                        position:"absolute",
                        top:"0px",
                        left:"0px"
                    }).show();
                    g.gridview2.css({
                        position:"absolute",
                        top:"0px"
                    });
                }
            }
            else{
                var gridView1Width = g.gridview1.width();
                var gridViewWidth = g.gridview.width();
                if(gridView1Width>0)
                {
                    g.gridview1.hide();
                    g.gridview2.css({
                        position:"absolute",
                        left:"0px",
                        width: gridViewWidth
                    });
                }
            }
            g.trigger('SysGridHeightChanged');
        },
        _calculateGridBodyHeight: function (h) {
            var g = this, p = this.options;