Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/src/main/resources/config/quartz.properties

@@ -15,7 +15,7 @@ org.quartz.threadPool.threadPriority: 5
org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
#表示实际执行时间与下一次应该执行时间之间的差值，超过这个差值就不会执行，低于这个差值就会执行
org.quartz.jobStore.misfireThreshold: 5000
org.quartz.jobStore.misfireThreshold: 59000
 
#============================================================================
# Configure JobStore
@@ -38,7 +38,7 @@ org.quartz.dataSource.qzDS.driver:com.mysql.jdbc.Driver
org.quartz.dataSource.qzDS.URL:jdbc:mysql://192.168.1.220:3306/hos2_resource?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&autoReconnectForPools=true
org.quartz.dataSource.qzDS.user:hos2
org.quartz.dataSource.qzDS.password:hos2
org.quartz.dataSource.qzDS.maxConnection:10
org.quartz.dataSource.qzDS.maxConnection:100
org.quartz.dataSource.qzDS.validateOnCheckout:true
org.quartz.dataSource.qzDS.validationQuery:select 1

Hos-resource/src/main/resources/resource.properties

@@ -6,8 +6,8 @@ serverip=192.168.131.17
port=6020
####################http\u914D\u7F6E\u4FE1\u606F####################
#http.url=http://192.168.131.103:6020/api/v1.0/
http.url=http://172.19.103.56:6020/api/v1.0/
http.username=user
http.password=standard
#http.url=http://172.19.103.56:6020/api/v1.0/
#http.username=user
#http.password=standard
http.gateway=http://172.19.103.57:8890/gateway/transfer

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

@@ -14,25 +14,25 @@
        <div class="m-form-group">
            <label>任务名称：</label>
            <div class="m-form-control">
                <input type="text" id="selJob" name="jobId" ltype="combobox">
                <input type="text" id="selJob" name="jobId">
            </div>
            <label>数据集名称：</label>
            <div class="m-form-control">
                <input type="text" id="selJobDataset" name="jobDatasetId" ltype="combobox">
                <input type="text" id="selJobDataset" name="jobDatasetId">
            </div>
            <label>采集状态：</label>
            <div class="m-form-control">
                <input type="text" id="selJobStatus" name="jobStatus" ltype="combobox">
                <input type="text" id="selJobStatus" name="jobStatus">
            </div>
            <label>采集时间：</label>
            <div class="m-form-control">
               <input id="txtJobTimeFrom" type="text" name="jobTimeFrom" ltype="date"/>
               <input id="txtJobTimeFrom" type="text" name="jobTimeFrom"/>
            </div>
            <div class="m-form-control" style="line-height: 30px;">
                &nbsp;-&nbsp;
            </div>
            <div class="m-form-control" style="margin-right:10px;">
                <input id="txtJobTimeTo" type="text" name="jobTimeTo" ltype="date"/>
                <input id="txtJobTimeTo" type="text" name="jobTimeTo"/>
            </div>
            <div class="m-form-control">
                <div id="btnSearch" class="l-button" >

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

@@ -12,10 +12,6 @@
            var me = this;
            //控件初始化
            me.dataset = $("#selJobDataset").ligerComboBox({
                url:"${contextRoot}/datacollect/getJobDatasetByJobId",
                delayLoad:true
            });
            $("#selJob").ligerComboBox({
                dict:true,
                dictName:"RS_JOB_CONFIG",
@@ -26,6 +22,10 @@
                    me.dataset.reload();
                }
            });
            me.dataset = $("#selJobDataset").ligerComboBox({
                url:"${contextRoot}/datacollect/getJobDatasetByJobId",
                delayLoad:true
            });
            $("#selJobStatus").ligerComboBox({dict:true,dictName:"JOB_STATUS"});
            $("#txtJobTimeFrom").ligerDateEditor();
@@ -60,11 +60,13 @@
                jobId:'${jobId}',
                jobDatasetId:'${jobDatasetId}',
                jobStatus:'${jobStatus}',
                jobTimeFrom:'${jobTimeFrom}'.substr(0,10),
                jobTimeTo:'${jobTimeTo}'.substr(0,10)
                jobTimeFrom:'${jobTimeFrom}',
                jobTimeTo:'${jobTimeTo}'
            };
            $('#dataForm').ligerForm();
            liger.get('dataForm').setData(data);
debugger
            $("#dataForm").ligerAutoForm({
                data:data
            });
            me.bindEvents();
            me.search();
@@ -102,7 +104,7 @@
        //搜索事件
        search:function(){
            var me = this;
            var data = liger.get('dataForm').getData();
            var data =$("#dataForm").ligerAutoForm("getData");
            me.grid.set({
                parms: data
            });

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

@@ -76,7 +76,7 @@
                if (re != null) {
                    if (re != "loading") {
                        return me.listToDict(re);
                        return re;
                    }
                }
                else {