linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改用druid连接池

Browse Source
master
lixin 6 years ago
parent 65f1f537a1
commit 681566c847
7 changed files with 110 additions and 83 deletions
Show Stats Download Patch File Download Diff File

29
pom.xml
Unescape Escape View File

@ -34,7 +34,6 @@
<servlet.version>2.4</servlet.version>
<jsp.version>2.1</jsp.version>
<jstl.version>1.2</jstl.version>
<c3p0.version>0.9.5-pre6</c3p0.version>
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<postgresql.version>9.2-1004-jdbc4</postgresql.version>
<activiti.version>5.17.0</activiti.version>
@ -51,7 +50,7 @@
<slf4j.version>1.6.4</slf4j.version>
<json-lib.version>2.4</json-lib.version>
<jackson.version>2.9.4</jackson.version>
<druid.version>1.0.9</druid.version>
<druid.version>1.1.22</druid.version>
<httpclient.version>4.3.5</httpclient.version>
<javax-servlet-api.version>4.0.1</javax-servlet-api.version>
<jsp-api.version>2.0</jsp-api.version>
@ -143,6 +142,13 @@
<version>${mysql.version}</version>
</dependency>
<!-- sql-server -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>7.4.1.jre8</version>
</dependency>
<!-- 连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
@ -255,10 +261,9 @@
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>jstl</groupId>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
<scope>provided</scope>
</dependency>
<!-- <dependency>
<groupId>javax.servlet</groupId>
@ -364,12 +369,6 @@
<version>${groovy.version}</version>
</dependency>-->
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>${c3p0.version}</version>
</dependency>
<!--<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
@ -535,7 +534,6 @@
</dependency>
</dependencies>
<build>
<finalName>emr_record</finalName>
<plugins>
@ -560,15 +558,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<path>/emr_record</path>
<port>8083</port>
</configuration>
</plugin>
</plugins>
</build>

2
src/main/java/com/emr/vo/PdfWaterSetVo.java
Unescape Escape View File

@ -2,7 +2,9 @@ package com.emr.vo;
import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class PdfWaterSetVo extends EmrPdfWaterSet {
private String allSrc;

71
src/main/resources/config/applicationContext.xml
Unescape Escape View File

@ -28,26 +28,54 @@
<context:property-placeholder ignore-resource-not-found="true" location="classpath:/config/*.properties"/>
<!--配置数据源-->
<bean id="master" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username}"/> <!--用户名-->
<bean id="master" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
<property name="driverClassName" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="url" value="${jdbc.url}"/> <!--数据库地址-->
<property name="username" value="${jdbc.username}"/> <!--用户名-->
<property name="password" value="${jdbc.password}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数-->
<property name="minPoolSize" value="1"/> <!--最小连接数-->
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxIdleTime" value="20"/> <!--最大空闲时间-->
<property name="initialSize" value="100"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxActive" value="1000"/>
<property name="maxWait" value="60000"/>
<property name="minEvictableIdleTimeMillis" value="300000"/>
<property name="keepAlive" value="true"/>
<property name="timeBetweenEvictionRunsMillis" value="-1"/>
<property name="minIdle" value="20"/>
<property name="removeAbandoned" value="true"/>
<property name="removeAbandonedTimeout" value="180"/>
<property name="logAbandoned" value="true"/>
<property name="testWhileIdle" value="true"/>
<property name="validationQuery" value="SELECT 'x'"/>
<property name="testOnBorrow" value="false"/>
<property name="testOnReturn" value="false"/>
<property name="poolPreparedStatements" value="true"/>
<property name="maxPoolPreparedStatementPerConnectionSize" value="20"/>
<property name="filters" value="stat,wall,slf4j"/>
<property name="connectionProperties" value="druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000"/>
</bean>
<bean id="salve" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url2}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username2}"/> <!--用户名-->
<bean id="salve" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
<property name="driverClassName" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="url" value="${jdbc.url2}"/> <!--数据库地址-->
<property name="username" value="${jdbc.username2}"/> <!--用户名-->
<property name="password" value="${jdbc.password2}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数-->
<property name="minPoolSize" value="1"/> <!--最小连接数-->
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxIdleTime" value="20"/> <!--最大空闲时间-->
<property name="initialSize" value="100"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxActive" value="1000"/>
<property name="maxWait" value="60000"/>
<property name="minEvictableIdleTimeMillis" value="300000"/>
<property name="keepAlive" value="true"/>
<property name="timeBetweenEvictionRunsMillis" value="-1"/>
<property name="minIdle" value="20"/>
<property name="removeAbandoned" value="true"/>
<property name="removeAbandonedTimeout" value="180"/>
<property name="logAbandoned" value="true"/>
<property name="testWhileIdle" value="true"/>
<property name="validationQuery" value="SELECT 'x'"/>
<property name="testOnBorrow" value="false"/>
<property name="testOnReturn" value="false"/>
<property name="poolPreparedStatements" value="true"/>
<property name="maxPoolPreparedStatementPerConnectionSize" value="20"/>
<property name="filters" value="stat,wall,slf4j"/>
<property name="connectionProperties" value="druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000"/>
</bean>
<bean id="dataSource" class="com.emr.annotation.DynamicDataSource">
@ -73,10 +101,10 @@
</bean>
<!-- mapper扫描 -->
<!-- <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"></property>
<property name="basePackage" value="com.emr.dao"></property>
</bean>-->
<!-- <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"></property>
<property name="basePackage" value="com.emr.dao"></property>
</bean>-->
<!-- 配置扫描器，将mybatis接口的实现加入到IOC容器中 -->
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
@ -131,7 +159,7 @@
<!-- 使用annotation定义事务 -->
<!-- <tx:annotation-driven transaction-manager="transactionManager"/> -->
<!-- 定义切面功能 -->
<!-- <aop:aspectj-autoproxy />-->
<!-- <aop:aspectj-autoproxy />-->
<!--<bean id="logAopAction" class="com.emr.controller.LogAopAction"/>-->
<!-- 配置启用Shiro的注解功能 -->
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"
@ -144,7 +172,6 @@
</bean>
<bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
<!--<property name="realm" ref="userRealm"/>
<property name="sessionManager" ref="sessionManager"/>

BIN
src/main/webapp/WEB-INF/lib/sqljdbc4-2.0.jar
View File

Binary file not shown.

6
src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList.jsp
Unescape Escape View File

@ -12,6 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv=X-UA-Compatible IE=EmulateIE7>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css" type="text/css">
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
<!--[if lt IE 9]>
<script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
@ -121,11 +122,6 @@
.table-hover > tbody > tr:hover > th {
cursor: pointer;
}
/**固定列样式*/
.fixed-table-body-columns{
top:391px!important;
/*height:226px!important;*/
}
.fht-cell{width:70px!important;}
</style>
</head>

7
src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
Unescape Escape View File

@ -12,6 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv=X-UA-Compatible IE=EmulateIE7>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css" type="text/css">
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet"/>
@ -145,12 +146,6 @@
cursor: pointer;
}
/**固定列样式*/
.fixed-table-body-columns {
top:48%!important;
/*height:226px!important;*/
}
.fht-cell {
width: 75px !important;
}

78
src/main/webapp/index.jsp
Unescape Escape View File

@ -11,43 +11,48 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<%@ include file="/WEB-INF/jspf/common.jspf" %>
<!--[if lt IE 9]>
<style>
.container-fluid{
height: 1000px;
}
</style>
<style>
.container-fluid {
height: 1000px;
}
</style>
<![endif]-->
<style>
body { margin-right: -15px; margin-bottom: -15px; }
.navbar-custom-menu{
padding-right:20px;
.navbar-custom-menu {
padding-right: 20px;
}
.hidden-xs{
.hidden-xs {
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.logo{
height: 59px!important;
.logo {
height: 59px !important;
}
.container-fluid {
margin: 0;
padding: 0;
}
.indexSelected{
.indexSelected {
background-color: #42515F;
}
</style>
<%
String POWER_URLHEAD = (String)request.getParameter("POWER_URLHEAD");
String POWER_JSP = (String)request.getParameter("POWER_JSP");
String token = (String)request.getSession().getAttribute("token");
String POWER_URLHEAD = (String) request.getParameter("POWER_URLHEAD");
String POWER_JSP = (String) request.getParameter("POWER_JSP");
String token = (String) request.getSession().getAttribute("token");
// String token = (String)request.getParameter("token");
String WEBSOCKET_URLHEAD = (String)request.getParameter("WEBSOCKET_URLHEAD");
String STR_SPLIT = (String)request.getParameter("STR_SPLIT");
String WEBSOCKET_URLHEAD = (String) request.getParameter("WEBSOCKET_URLHEAD");
String STR_SPLIT = (String) request.getParameter("STR_SPLIT");
%>
<script type="text/javascript">
var path = "${path}"
</script>
</head>
<body class="skin-blue" onkeydown="disabledPrint()">
<body class="hold-transition skin-blue sidebar-mini" onkeydown="disabledPrint()">
<input type="hidden" id="token" value="<%=token%>"/>
<input type="hidden" id="roleId" value="${CURRENT_USER.roleId}"/>
<!--webSocket所需-->
@ -57,7 +62,7 @@
<input type="hidden" id="POWER_JSP" value="<%=POWER_JSP%>">
<input type="hidden" id="webSocketUrl" value="<%=WEBSOCKET_URLHEAD%>">
<input type="hidden" id="strSplit" value="<%=STR_SPLIT%>">
<div class="">
<div class="wrapper">
<header class="main-header">
<!--logo-->
<div class=" logo">
@ -79,7 +84,7 @@
<li class="user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="noticeManage1(-1)">
<span class="label label-warning" id="noticeCount">0</span>
<i class="fa fa-envelope-o" style="font-size: 25px;"></i>
<i class="fa fa-envelope-o" style="font-size: 25px;"></i>
</a>
</li>
<li class="user user-menu">
@ -90,20 +95,24 @@
<c:when test="${CURRENT_USER.remark == '' || CURRENT_USER.remark == null || CURRENT_USER.remark == 'null'}">
<c:choose>
<c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.userPosition}">${CURRENT_USER.userPosition}</p>
<p class="hidden-xs"
title="${CURRENT_USER.userPosition}">${CURRENT_USER.userPosition}</p>
</c:when>
<c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p>
<p class="hidden-xs"
title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${CURRENT_USER.userPosition != null && CURRENT_USER.userPosition != '' && CURRENT_USER.userPosition != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.userPosition}(${CURRENT_USER.remark})">${CURRENT_USER.userPosition}(${CURRENT_USER.remark})</p>
<p class="hidden-xs"
title="${CURRENT_USER.userPosition}(${CURRENT_USER.remark})">${CURRENT_USER.userPosition}(${CURRENT_USER.remark})</p>
</c:when>
<c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.remark})">${CURRENT_USER.userName}(${CURRENT_USER.remark})</p>
<p class="hidden-xs"
title="${CURRENT_USER.userName}(${CURRENT_USER.remark})">${CURRENT_USER.userName}(${CURRENT_USER.remark})</p>
</c:otherwise>
</c:choose>
</c:otherwise>
@ -139,11 +148,11 @@
<!-- 菜单列表-->
<ul id="indexTreeMenu" class="sidebar-menu" data-widget="tree">
<%--<li><a href="${path}/commom/test" target="iFrame1"><i class="fa fa-circle-o"></i>测试页</a></li>--%>
<%-- <li><a href="${path}/commom/showRecord?patientId=3d2c5fb596764cdb89b247b138de8a0b" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>--%>
<%-- <li><a href="${path}/commom/showRecord?patientId=00000A70E4584D048F866BB75112EBBC" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>--%>
<%--
<li><a href="${path}/commom/showRecord?patientId=0f6e6941028c44b8b8ea070f27480416" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>
--%>
<%-- <li><a href="${path}/commom/showRecord?patientId=3d2c5fb596764cdb89b247b138de8a0b" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>--%>
<%-- <li><a href="${path}/commom/showRecord?patientId=00000A70E4584D048F866BB75112EBBC" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>--%>
<%--
<li><a href="${path}/commom/showRecord?patientId=0f6e6941028c44b8b8ea070f27480416" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>
--%>
<%--<li><a href="${path}/commom/showRecord?patientId=2AE9566F20AB430DB6DD6F6A88F1DCDA" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>--%>
<%--<li><a href="${path}/commom/showRecord?patientId=00001EEDE74747709805E88A410496AE" target="iFrame1"><i class="fa fa-circle-o"></i>病案浏览测试页</a></li>--%>
<%--<li class="active treeview">
@ -210,7 +219,8 @@
<div class="page-content-wrapper">
<div class="page-content">
<div class="container-fluid">
<iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList" id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
<iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList"
id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
</div>
</div>
</div>
@ -228,5 +238,13 @@
</div>
<script type="text/javascript" src="${path}/static/js/menu.js?time=2019-12-15"></script>
<%@ include file="/WEB-INF/jspf/webSocket.jspf" %>
<script>
$(document).ready(function () {
const headerHeight = $(".main-header").height() || 0;
const footerHeight = ($(".main-footer").height() || 0) + 31;
const windowHeight = $(window).height();
$("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 37);
})
</script>
</body>
</html>

Write Preview
Loading…
Cancel
Save