Merge branch 'master' of lyr/esb into master

Hos-resource/Hos-Resource.iml

@@ -39,7 +39,7 @@
    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3.0" level="project" />
    <orderEntry type="library" name="Maven: commons-dbutils:commons-dbutils:1.6" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.10" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />

Hos-resource/src/main/resources/spring/applicationContext.xml

@@ -42,10 +42,14 @@
        <property name="username" value="fujian"/>
        <property name="password" value="fujian"/>
        -->
        <!--<property name="url"-->
                  <!--value="jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&amp;characterEncoding=UTF-8"/>-->
        <!--<property name="username" value="hos"/>-->
        <!--<property name="password" value="hos"/>-->
        <property name="url"
                  value="jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos"/>
        <property name="password" value="hos"/>
                  value="jdbc:mysql://192.168.1.220:3306/hos2_resource?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos2"/>
        <property name="password" value="hos2"/>
        <property name="initialSize" value="1"/>
        <property name="maxTotal" value="100"/>
        <property name="maxIdle" value="50"/>
@@ -142,7 +146,7 @@
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">
        <property name="sessionFactory" ref="sessionFactory"></property>
    </bean>
    <bean id="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
    <bean id="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" scope="singleton">
        <property name="dataSource" ref="dataSource"/>
        <property name="configLocation" value="classpath:/config/quartz.properties" />
        <property name="autoStartup" value="true"/>

Hos-resource/src/main/webapp/WEB-INF/dispatcher-servlet.xml

@@ -58,5 +58,4 @@
        </mvc:message-converters>
    </mvc:annotation-driven>
</beans>

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

@@ -712,7 +712,8 @@
            var val = "";
            //解析cron表达式
            var interval_type =  $('input[name="interval_type"]').ligerRadio("getValue");
            var cronTime  = new Date($("#dateNextTime").ligerDateEditor('getValue'));
            var minute = cronTime.getMinutes(),hour = cronTime.getHours();
            if(interval_type =="0") //分钟
            {
@@ -730,30 +731,30 @@
            else if(interval_type =="2"){ //天
                var num = $("#txtD").val();
                if(num!=null && num.length>0) {
                    val = "0 0 0 1/" + num + " * ?";
                    val = "0 "+ minute +" "+ hour +" 1/" + num + " * ?";
                }
            }
            else if(interval_type =="3"){ //周
                var week_day = $('input[name="week_day"]').ligerCheckBox("getValue");
                if(week_day!=null && week_day.length>0) {
                    val = "0 0 0 ? * " + week_day;
                    val = "0 "+ minute +" "+ hour +" ? * " + week_day;
                }
            }
            else if(interval_type =="4"){ //月
                var month_day = $('input[name="month_day"]').ligerRadio("getValue");
                if(month_day == "0") //每月第一天
                {
                    val = "0 0 0 1 * ?";
                    val = "0 "+ minute +" "+ hour +" 1 * ?";
                }
                else if(month_day == "1") //每月最后一天
                {
                    val = "0 0 0 L * ?";
                    val = "0 "+ minute +" "+ hour +" L * ?";
                }
                else{
                    var num = $("#txtMD").val();
                    if(num!=null && num.length>0)
                    {
                        val = "0 0 0 "+num+" * ?";
                        val = "0 "+ minute +" "+ hour +" "+num+" * ?";
                    }
                }
            }

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

@@ -32,21 +32,7 @@
                    }
                }
            });
            //开关控件
            var changeCheckbox = document.querySelector('#jobStatusSwitch');
            me.switchery = new Switchery(changeCheckbox, { disabled: true,size: 'large' });
            changeCheckbox.onchange = function() {
                 var jobId = $("#selJob").ligerComboBox("getValue");
                 if(!changeCheckbox.checked)
                 {
                    me.valid(jobId,"0");
                 }
                 else{
                    me.valid(jobId,"1");
                 }
            };
            me.initSwitcher();
            me.chart=echarts.init(document.getElementById("echarts-bar-chart"));
            //列表控件
@@ -111,6 +97,25 @@
            });
        },
        initSwitcher:function(){
            var me = this;
            //开关控件
            var changeCheckbox = document.querySelector('#jobStatusSwitch');
            me.switchery = new Switchery(changeCheckbox, { disabled: true,size: 'large' });
            changeCheckbox.onchange = function() {
                debugger
                var a = me.switchery;
                var jobId = $("#selJob").ligerComboBox("getValue");
                if(!changeCheckbox.checked)
                {
                    me.valid(jobId,"0");
                }
                else{
                    me.valid(jobId,"1");
                }
            };
        },
        repeat:function() {
                parent.indexPage.openMenuByText("任务补采", {jobId: $("#selJob").ligerComboBox("getValue")}, false);
        },
@@ -120,8 +125,10 @@
        },
        //获取任务相关数据
        search:function(jobId){
            debugger
            var me = this;
            me.clearTop();
            me.initSwitcher();
            if(jobId!="" && jobId.length>0)
            {
                //获取运行状态
@@ -205,6 +212,10 @@
        //上部数据情况
        clearTop:function(){
            var me = this;
            var parent = $("#jobStatusSwitch").parent();
            $("#jobStatusSwitch").next().remove();
            $("#jobStatusSwitch").remove();
            $('<input type="checkbox" class="js-switch" id="jobStatusSwitch" checked />').appendTo(parent);
            $("#divCount").html("-");
            $("#divSuccess").html("-");
            $("#divPercent").html("-");