系统测试与修改

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/common/indexJs.jsp

@@ -1,6 +1,50 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<script>
    // 设置jQuery Ajax全局的参数
    $.ajaxSetup({
        type: "POST",
        error: function(jqXHR, textStatus, errorThrown){
            isLogin();
            switch (jqXHR.status){
                case(500):
                    $.ligerDialog.error("服务器系统内部错误");
                    break;
                case(401):
                    $.ligerDialog.error("未登录");
                    break;
                case(403):
                    $.ligerDialog.error("无权限执行此操作");
                    break;
                case(408):
                    $.ligerDialog.error("请求超时");
                    break;
                default:
                    $.ligerDialog.error("未知错误");
            }
        }
    });
    //判断是否登录
    function isLogin(){
        $.ajax({ //获取是否
            type: "POST",
            url : "${contextRoot}/system/isLogin",
            dataType : "json",
            cache:false,
            success :function(data){
                if(!data.successFlg) {
                    location.href = "${contextRoot}/loginPage";
                }
            },
            error :function(data){
                location.href = "${contextRoot}/loginPage";
            }
        });
    }
    var indexPage = {
        localNav:[],
        init:function(){
@@ -216,22 +260,8 @@
        }
    }
    $(function () {
        $.ajax({ //获取表的字段列表
            type: "POST",
            url : "${contextRoot}/system/isLogin",
            dataType : "json",
            cache:false,
            success :function(data){
                if(!data.successFlg) {
                    location.href = "${contextRoot}/loginPage";
                }
            },
            error :function(data){
                location.href = "${contextRoot}/loginPage";
            }
        });
        isLogin();
        indexPage.init();
    });
</script>

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/common/loginJs.jsp

@@ -45,6 +45,18 @@
    };
    $(function(){
        //session过期
        if(location.href.indexOf('loginPage')<0)
        {
            location.href = "${contextRoot}/loginPage";
        }
        //内嵌页面
        if(self.location!=top.location)
        {
            top.location.href = "${contextRoot}/loginPage";
        }
        loginPage.init();
    });

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/system/dataSource.jsp

@@ -2,51 +2,51 @@
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<div class="m-form-page">
<div class="m-form-page" id="divForm">
    <div>
        <input type="hidden" id="txtId"/>
        <input type="hidden" name="id"/>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>数据源名称：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="txtName"/>
            <input type="text" class="l-textbox" name="name"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>数据库类型：</label>
        <div class="m-form-control">
            <input type="text" id="txtType"/>
            <input type="text" name="type" id="txtType"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>主机名或IP地址：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="txtIp"/>
            <input type="text" class="l-textbox" name="ip"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>端口：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="txtPort"/>
            <input type="text" class="l-textbox" name="port"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>数据库名：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="txtDbName"/>
            <input type="text" class="l-textbox" name="dbName"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>用户名：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="txtDbUser" autocomplete=false/>
            <input type="text" class="l-textbox" autocomplete=false name="dbUser"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>密码：</label>
        <div class="m-form-control">
            <input type="password" class="l-textbox" id="txtDbPassword" autocomplete=false/>
            <input type="password" class="l-textbox" autocomplete=false name="dbPassword"/>
        </div>
    </div>
    <div id="dataSourceInfo" class="m-info" style="margin-left: 150px;display: none">

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/system/dataSourceJs.jsp

@@ -10,7 +10,27 @@
            var me = this;
            $("#txtType").ligerComboBox({data:[{code:'mysql',value:'MySQL'},{code:'oracle',value:'Oracle'},{code:'sqlserver',value:'SQL Server'}]});
            me.initData();
            $("#divForm").ligerAutoForm({
                data:me.getModel(),
                validate:{
                    name:"required",
                    type:"required",
                    ip:"required",
                    port:"required",
                    dbName:"required",
                    dbUser:"required",
                    dbPassword:"required"
                },
                message:{
                    name:"请输入数据源名称",
                    type:"请选择数据库类型",
                    ip:"请输入主机名或IP地址",
                    port:"请输入端口",
                    dbName:"请输入数据库名",
                    dbUser:"请输入用户名",
                    dbPassword:"请输入密码"
                }
            });
            me.initEven();
        },
        //绑定按钮事件
@@ -25,130 +45,77 @@
            });
            $("#btnCancel").click(function(){
                me.initData();
                var model = me.getModel();
                $("#divForm").ligerAutoForm("setData",model);
            });
        },
        setConfigString:function(configStr){
            //反解析连接字符串
            if(configStr!=null && configStr.length>0)
            {
                $("#txtType").ligerComboBox("setValue",(configStr.split("\/")[0]).split(":")[1]);
                var type = $("#txtType").ligerComboBox("getValue");
                if( type == "mysql" || type == "sqlserver"){
                    $("#txtIp").val((configStr.split("\/")[2]).split(":")[0]);
                    $("#txtPort").val((configStr.split("\/")[2]).split(":")[1]);
                    $("#txtDbName").val((configStr.split("\/")[3]).split("?")[0]);
                    $("#txtDbUser").val((configStr.split("\/")[3]).split("?")[1].split("&")[0].split("=")[1]);
                    $("#txtDbPassword").val((configStr.split("\/")[3]).split("?")[1].split("&")[1].split("=")[1]);
                }else{
                    $("#txtIp").val(configStr.split("\/")[3].split(":")[0]);
                    $("#txtPort").val(configStr.split("\/")[3].split(":")[1]);
                    $("#txtDbName").val(configStr.split("\/")[4]);
                    $("#txtDbUser").val(configStr.split("\/")[0].split(":")[3]);
                    $("#txtDbPassword").val(configStr.split("\/")[1].split("@")[0]);
                }
            }
        },
        //生成数据库连接字符串
        getConfigString:function(){
        getConfigString:function(data){
            var resultStr="";
            var type = $("#txtType").ligerComboBox("getValue");
            var ip = $("#txtIp").val();
            var port = $("#txtPort").val();
            var dbName = $("#txtDbName").val();
            var dbUser = $("#txtDbUser").val();
            var dbPassword = $("#txtDbPassword").val();
            if(type=="mysql"){//mysql
                resultStr ="jdbc:mysql://"+ ip +":"+ port +"/"+ dbName +"?user="+ dbUser +"&password="+ dbPassword;
            if(data.type=="mysql"){//mysql
                resultStr ="jdbc:mysql://"+ data.ip +":"+ data.port +"/"+ data.dbName +"?user="+ data.dbUser +"&password="+ data.dbPassword;
            }
            else if(type=="oracle"){//oracle
                resultStr ="jdbc:oracle:thin:"+ dbUser +"/"+ dbPassword +"@//"+ ip +":"+ port +"/"+ dbName ;
            else if(data.type=="oracle"){//oracle
                resultStr ="jdbc:oracle:thin:"+ data.dbUser +"/"+ data.dbPassword +"@//"+ data.ip +":"+ data.port +"/"+ data.dbName ;
            }
            else{//sqlserver
                resultStr ="jdbc:sqlserver://"+ip+":"+port+"/"+dbName+"?user="+dbUser+"&password="+dbPassword;
                resultStr ="jdbc:sqlserver://"+data.ip+":"+data.port+"/"+data.dbName+"?user="+data.dbUser+"&password="+data.dbPassword;
            }
            return resultStr;
        },
        //初始化值
        initData:function(){
            var me =this;
        //获取初始值
        getModel:function(){
            var model;
            if('${model.id}'.length>0) {
                var model = {
                var configStr = '${model.config}';
                model = {
                    id : '${model.id}',
                    name : '${model.name}',
                    config : '${model.config}'
                    name : '${model.name}'
                };
                $('#txtId').val(model.id);
                $('#txtName').val(model.name);
                me.setConfigString(model.config);
                //反解析连接字符串
                if(configStr!=null && configStr.length>0)
                {
                    var type = (configStr.split("\/")[0]).split(":")[1];
                    model.type = type;
                    if( type == "mysql" || type == "sqlserver"){
                        model.ip = (configStr.split("\/")[2]).split(":")[0];
                        model.port = (configStr.split("\/")[2]).split(":")[1];
                        model.dbName = (configStr.split("\/")[3]).split("?")[0];
                        model.dbUser = (configStr.split("\/")[3]).split("?")[1].split("&")[0].split("=")[1];
                        model.dbPassword = (configStr.split("\/")[3]).split("?")[1].split("&")[1].split("=")[1];
                    }else{
                        model.ip = (configStr.split("\/")[3]).split(":")[0];
                        model.port = (configStr.split("\/")[3]).split(":")[1];
                        model.dbName = configStr.split("\/")[4];
                        model.dbUser = (configStr.split("\/")[0]).split(":")[3];
                        model.dbPassword = (configStr.split("\/")[1]).split("@")[0];
                    }
                }
            }
            else{
                $('#dataSourceInfo').show();
            }
        },
        //校验
        validata:function(){
            var me = this;
            var name = $('#txtName').val();
            var type = $('#txtType').ligerComboBox("getValue");
            var ip = $("#txtIp").val();
            var port = $("#txtPort").val();
            var dbName = $("#txtDbName").val();
            var dbUser = $("#txtDbUser").val();
            var dbPassword = $("#txtDbPassword").val();
            if(name.length==0)
            {
                $.ligerDialog.error("请输入数据源名称！");
                return false;
            }
            if(type.length==0)
            {
                $.ligerDialog.error("请选择数据库类型！");
                return false;
            }
            if(ip.length==0)
            {
                $.ligerDialog.error("请输入主机名或IP地址！");
                return false;
            }
            if(port.length==0)
            {
                $.ligerDialog.error("请输入端口！");
                return false;
            }
            if(dbName.length==0)
            {
                $.ligerDialog.error("请输入数据库名！");
                return false;
            }
            if(dbUser.length==0)
            {
                $.ligerDialog.error("请输入用户名！");
                return false;
            }
            if(dbPassword.length==0)
            {
                $.ligerDialog.error("请输入密码！");
                return false;
            }
            return true;
            return model;
        },
        //测试数据库连接
        test:function(){
            var me = this;
            if(!me.validata()) return;
            if(!$("#divForm").ligerAutoForm("validate"))
            {
                return;
            }
            var data = $("#divForm").ligerAutoForm("getData");
            $.ajax({
                type: "POST",
                url : "${contextRoot}/system/testDataSource",
                dataType : "json",
                data:{config:me.getConfigString()},
                data:{config:me.getConfigString(data)},
                cache:false,
                success :function(data){
                    if(data.successFlg) {
@@ -157,26 +124,23 @@
                    else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error :function(data){
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                }
            });
        },
        //保存操作
        save:function(){
            var me = this;
            if(!me.validata()) return;
            var id = $('#txtId').val();
            var name = $('#txtName').val();
            var config = me.getConfigString();
            if(!$("#divForm").ligerAutoForm("validate"))
            {
                return;
            }
            var data = $("#divForm").ligerAutoForm("getData");
            $.ajax({
                type: "POST",
                url : "${contextRoot}/system/saveDataSource",
                dataType : "json",
                data:{id:id,name:name,config:config},
                data:{id:data.id,name:data.name,config:me.getConfigString(data)},
                cache:false,
                success :function(data){
                    if(data.successFlg) {
@@ -186,9 +150,6 @@
                    else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error :function(data){
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                }
            });
        }

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/system/paramManager.jsp

@@ -2,7 +2,7 @@
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<div class="m-form-page">
<div class="m-form-page" id="divForm">
    <div class="m-form-group">
        <label>机构名称：</label>
        <div class="m-form-control" style="line-height: 32px;">${model.orgName}</div>
@@ -16,20 +16,19 @@
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>采集频率：</label>
        <div class="m-form-control">
            <input type="text" id="txtInterval"/>
            <input type="text" id="txtInterval" name="interval"/>
        </div>
        <div class="m-form-control" style="margin-left:10px;">
            <input type="text" id="txtIntervalType"/>
            <input type="text" id="txtIntervalType" name="intervalType"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>标准更新频率：</label>
        <div class="m-form-control">
            <input type="text" id="txtUpdateInterval"/>
            <input type="text" id="txtUpdateInterval" name="updateInterval"/>
        </div>
        <div class="m-form-control" style="margin-left:10px;">
            <input type="text" id="txtUpdateIntervalType"/>
            <input type="text" id="txtUpdateIntervalType" name="updateIntervalType"/>
        </div>
    </div>
    <div class="m-form-page-bottom">

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/system/paramManagerJs.jsp

@@ -16,7 +16,21 @@
            $('#txtUpdateInterval').ligerSpinner({width:130,type: 'int',minValue:1});
            $('#txtUpdateIntervalType').ligerComboBox({width:100,data:[{value:"秒钟",code:"0"},{value:"分钟",code:"1"},{value:"小时",code:"2"},{value:"天",code:"3"}]});
            me.initData();
            $("#divForm").ligerAutoForm({
                data:me.getModel(),
                validate:{
                    interval:"required",
                    intervalType:"required",
                    updateInterval:"required",
                    updateIntervalType:"required"
                },
                message:{
                    interval:"请输入采集频率",
                    intervalType:"请输入采集频率类型",
                    updateInterval:"请输入标准更新频率",
                    updateIntervalType:"请输入标准更新频率类型"
                }
            });
            me.initEven();
        },
        //绑定按钮事件
@@ -27,11 +41,13 @@
            });
            $("#btnCancel").click(function(){
                me.initData();
                var model = me.getModel();
                $("#divForm").ligerAutoForm("setData",model);
            });
        },
        //初始化值
        initData:function(){
        //获取数据
        getModel :function(){
            var model = {};
            var interval = '${model.interval}';
            if(interval.length>0)
            {
@@ -43,26 +59,26 @@
                        if(int%86400==0)
                        {
                            //天
                            $('#txtInterval').val(int/86400);
                            $('#txtIntervalType').ligerComboBox("setValue",'3');
                            model.interval = int/86400;
                            model.intervalType = '3';
                        }
                        else{
                            //时
                            $('#txtInterval').val(int/3600);
                            $('#txtIntervalType').ligerComboBox("setValue",'2');
                            model.interval = int/3600;
                            model.intervalType = '2';
                        }
                    }
                    else{
                        //分
                        $('#txtInterval').val(int/60);
                        $('#txtIntervalType').ligerComboBox("setValue",'1');
                        model.interval = int/60;
                        model.intervalType = '1';
                    }
                }
                else
                {
                    //秒
                    $('#txtInterval').val(int);
                    $('#txtIntervalType').ligerComboBox("setValue",'0');
                    model.interval = int;
                    model.intervalType = '0';
                }
            }
@@ -77,61 +93,29 @@
                        if(int%86400==0)
                        {
                            //天
                            $('#txtUpdateInterval').val(int/86400);
                            $('#txtUpdateIntervalType').ligerComboBox("setValue",'3');
                            model.updateInterval = int/86400;
                            model.updateIntervalType = '3';
                        }
                        else{
                            //时
                            $('#txtUpdateInterval').val(int/3600);
                            $('#txtUpdateIntervalType').ligerComboBox("setValue",'2');
                            model.updateInterval = int/3600;
                            model.updateIntervalType = '2';
                        }
                    }
                    else{
                        //分
                        $('#txtUpdateInterval').val(int/60);
                        $('#txtUpdateIntervalType').ligerComboBox("setValue",'1');
                        model.updateInterval = int/60;
                        model.updateIntervalType = '1';
                    }
                }
                else
                {
                    //秒
                    $('#txtUpdateInterval').val(int);
                    $('#txtUpdateIntervalType').ligerComboBox("setValue",'0');
                    model.updateInterval = int;
                    model.updateIntervalType = '0';
                }
            }
        },
        //校验
        validata:function(){
            var me = this;
            var interval = $('#txtInterval').ligerSpinner("getValue");
            var intervalType = $('#txtIntervalType').ligerComboBox("getValue");
            if(interval.length==0)
            {
                $.ligerDialog.error("请输入采集频率！");
                return false;
            }
            if(intervalType.length==0)
            {
                $.ligerDialog.error("请输入采集频率类型！");
                return false;
            }
            var intervalUpdate = $('#txtUpdateInterval').ligerSpinner("getValue");
            var intervalUpdateType = $('#txtUpdateIntervalType').ligerComboBox("getValue");
            if(intervalUpdate.length==0)
            {
                $.ligerDialog.error("请输入标准更新频率！");
                return false;
            }
            if(intervalUpdateType.length==0)
            {
                $.ligerDialog.error("请输入标准更新频率类型！");
                return false;
            }
            return true;
            return model;
        },
        //获取秒数
        getNum:function(num,intervalType){
@@ -155,15 +139,13 @@
        //保存操作
        save:function(){
            var me =this;
            if(!me.validata()) return;
            var num = parseInt($('#txtInterval').ligerSpinner("getValue"));
            var intervalType = $('#txtIntervalType').ligerComboBox("getValue");
            var interval = me.getNum(num,intervalType);
            var numUpdate = parseInt($('#txtUpdateInterval').ligerSpinner("getValue"));
            var intervalUpdateType = $('#txtUpdateIntervalType').ligerComboBox("getValue");
            var updateInterval = me.getNum(numUpdate,intervalUpdateType);
            if(!$("#divForm").ligerAutoForm("validate"))
            {
                return;
            }
            var data = $("#divForm").ligerAutoForm("getData");
            var interval = me.getNum(data.interval,data.intervalType);
            var updateInterval = me.getNum(data.updateInterval,data.updateIntervalType);
            $.ajax({ //获取表的字段列表
                type: "POST",
@@ -178,9 +160,6 @@
                    else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error :function(data){
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                }
            });
        }

Hos-Resource-Mini/src/main/webapp/develop/common/base.css

@@ -83,7 +83,7 @@ scrollbar-track-color:#F3F3F3; /!*滑道*!/
.m-form-mult-control-panel{border: 1px solid #e1e1e1;width:200px;background: #fff;height:40px;display: none}
.m-form-mult-control-panel .l-text-wrapper{float:left;margin-top:5px;}
.m-form-mult-control-panel .m-btn-ok,.m-form-mult-control-panel .m-btn-cancle{width:25px;height:40px;}
.m-from-error .l-text,.m-from-error .l-textbox{border:#FF7777 1px solid}
.m-from-error .l-text,.m-from-error .l-textbox{border:#FF7777 1px solid;float:left}
.m-from-error-msg{float:right;height:32px;width:25px;background:url(../images/index/error_icon.png) center no-repeat;cursor: pointer}
/** 按钮样式 **/

Hos-Resource-Mini/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js

@@ -976,7 +976,7 @@
                    var control = me.controls[i].control;
                    var controlType = me.controls[i].controlType;
                    var controlData = data[controlName];
                    if(controlData!=undefined&&controlData.length>0)
                    if(controlData!=undefined)
                    {
                        if(controlType=="ui"&&typeof(control.setValue)=="function")
                        {

Hos-resource/src/main/java/com/yihu/ehr/system/controller/SystemController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -22,6 +23,30 @@ public class SystemController {
    @Autowired
    private ISystemManager ehr;
    /**
     * 判断是否登录
     * @return
     */
    @RequestMapping("isLogin")
    @ResponseBody
    public Result isLogin(HttpServletRequest request, HttpServletResponse response)
    {
        try {
            HttpSession session = request.getSession();
            Object userInfo = session.getAttribute("userInfo");
            if(userInfo==null){
                //重定向到指定页面
                response.sendRedirect(request.getContextPath() + "/loginPage");
                return Result.success("未登录！");
            }
            return Result.success("已登录！");
        }
        catch (Exception ex)
        {
            return Result.error(ex.getMessage());
        }
    }
    /*
    登录操作
     */

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -1,6 +1,49 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    // 设置jQuery Ajax全局的参数
    $.ajaxSetup({
        type: "POST",
        error: function(jqXHR, textStatus, errorThrown){
            isLogin();
            switch (jqXHR.status){
                case(500):
                    $.ligerDialog.error("服务器系统内部错误");
                    break;
                case(401):
                    $.ligerDialog.error("未登录");
                    break;
                case(403):
                    $.ligerDialog.error("无权限执行此操作");
                    break;
                case(408):
                    $.ligerDialog.error("请求超时");
                    break;
                default:
                    $.ligerDialog.error("未知错误");
            }
        }
    });
    //判断是否登录
    function isLogin(){
        $.ajax({ //获取是否
            type: "POST",
            url : "${contextRoot}/system/isLogin",
            dataType : "json",
            cache:false,
            success :function(data){
                if(!data.successFlg) {
                    location.href = "${contextRoot}/loginPage";
                }
            },
            error :function(data){
                location.href = "${contextRoot}/loginPage";
            }
        });
    }
    var indexPage = {
        localNav:[],
        homeUrl:"${contextRoot}/homePage",
@@ -296,6 +339,7 @@
    $(function () {
        isLogin();
        indexPage.init();
    });
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/loginJs.jsp

@@ -45,6 +45,17 @@
    };
    $(function(){
        //session过期
        if(location.href.indexOf('loginPage')<0)
        {
            location.href = "${contextRoot}/loginPage";
        }
        //内嵌页面
        if(self.location!=top.location)
        {
            top.location.href = "${contextRoot}/loginPage";
        }
        loginPage.init();
    });

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

@@ -976,7 +976,7 @@
                    var control = me.controls[i].control;
                    var controlType = me.controls[i].controlType;
                    var controlData = data[controlName];
                    if(controlData!=undefined&&controlData.length>0)
                    if(controlData!=undefined)
                    {
                        if(controlType=="ui"&&typeof(control.setValue)=="function")
                        {