支持B2C打印订单报表

src/main/java/com/uas/report/controller/PrintController.java

@@ -70,7 +70,7 @@ public class PrintController {
 		if (printType.equals(ReportConstants.PREVIEW_PRINT_TYPE)
 				|| printType.equals(ReportConstants.PRINT_PRINT_TYPE)) {
 			try {
-				request.getRequestDispatcher("preview2").forward(request, response);
+				request.getRequestDispatcher("preview").forward(request, response);
 			} catch (IOException | ServletException e) {
 				throw new SystemError(e);
 			}

src/main/java/com/uas/report/service/impl/PrintServiceImpl.java

@@ -379,6 +379,10 @@ public class PrintServiceImpl implements PrintService {
 	 * @return
 	 */
 	private DataSource getDataSource(String userName) {
+		// 如果userName是B2C，直接获取配置好的B2C数据源
+		if (userName.equals("B2C")) {
+			return ContextUtils.getApplicationContext().getBean("b2cDataSource", DruidDataSource.class);
+		}
 		// 默认数据源（主数据库）
 		DruidDataSource defaultDataSource = ContextUtils.getApplicationContext().getBean("defaultSob",
 				DruidDataSource.class);

src/main/resources/dev/jdbc-b2c.properties

@@ -0,0 +1,12 @@
+#B2C的数据库信息
+jdbc.b2c.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.b2c.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+jdbc.b2c.username=uuplatformdemo
+jdbc.b2c.password=selectuuplatform
+jdbc.b2c.initialSize=1
+jdbc.b2c.maxActive=100
+jdbc.b2c.maxIdle=50
+jdbc.b2c.minIdle=50
+jdbc.b2c.suspectTimeout=60
+jdbc.b2c.timeBetweenEvictionRunsMillis=30000
+jdbc.b2c.minEvictableIdleTimeMillis=60000

src/main/resources/dev/jdbc.properties

@@ -1,3 +1,4 @@
+#多账套情况下的主账套
 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
 jdbc.username=UAS
@@ -5,7 +6,7 @@ jdbc.password=select!#%*(
 jdbc.initialSize=10
 jdbc.maxActive=100
 jdbc.maxIdle=50
-jdbc.minIdle=20
+jdbc.minIdle=50
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
 jdbc.minEvictableIdleTimeMillis=60000

src/main/resources/spring/applicationContext.xml

@@ -16,34 +16,64 @@
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.report.support.ApplicationContextRegister" />
 	<!-- jasperserver rest_v2 api 相关参数注入 -->
-	<util:properties id="js_rest_api" location="classpath:${profile}/js-rest-api.properties" />
+	<util:properties id="js_rest_api"
+		location="classpath:${profile}/js-rest-api.properties" />
 
 	<!-- 扫描注解 -->
 	<context:annotation-config />
 	<!-- 扫描的包 -->
 	<context:component-scan base-package="com.uas.report" />
 
+	<!-- 标准帐套 -->
 	<bean id="defaultSob" class="com.alibaba.druid.pool.DruidDataSource"
-		init-method="init" destroy-method="close"><!-- 标准帐套 -->
+		init-method="init" destroy-method="close">
 		<property name="driverClassName" value="${jdbc.driverClassName}" />
 		<property name="url" value="${jdbc.url}" />
 		<property name="username" value="${jdbc.username}" />
 		<property name="password" value="${jdbc.password}" />
-		<property name="initialSize" value="10" />
-		<property name="maxActive" value="200" />
-		<property name="minIdle" value="10" />
-
+		<property name="initialSize" value="${jdbc.initialSize}" />
+		<property name="maxActive" value="${jdbc.maxActive}" />
+		<property name="maxIdle" value="${jdbc.maxIdle}" />
+		<property name="minIdle" value="${jdbc.minIdle}" />
 		<!-- 配置获取连接等待超时的时间 -->
 		<property name="maxWait" value="60000" />
+		<property name="testOnBorrow" value="false" />
+		<property name="testOnReturn" value="false" />
+		<property name="testWhileIdle" value="true" />
+		<property name="validationQuery" value="SELECT 1 FROM SYS.DUAL" />
+		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接 -->
+		<property name="timeBetweenEvictionRunsMillis" value="${jdbc.timeBetweenEvictionRunsMillis}" />
+		<!-- 配置一个连接在池中最小生存的时间 -->
+		<property name="minEvictableIdleTimeMillis" value="${jdbc.minEvictableIdleTimeMillis}" />
+		<!-- 打开PSCache，并且指定每个连接上PSCache的大小 -->
+		<property name="poolPreparedStatements" value="true" />
+		<property name="maxPoolPreparedStatementPerConnectionSize"
+			value="100" />
+		<!-- 配置监控统计拦截的filters -->
+		<property name="filters" value="stat" />
+	</bean>
 
+	<!-- B2C数据库 -->
+	<bean id="b2cDataSource" class="com.alibaba.druid.pool.DruidDataSource"
+		init-method="init" destroy-method="close">
+		<property name="driverClassName" value="${jdbc.b2c.driverClassName}" />
+		<property name="url" value="${jdbc.b2c.url}" />
+		<property name="username" value="${jdbc.b2c.username}" />
+		<property name="password" value="${jdbc.b2c.password}" />
+		<property name="initialSize" value="${jdbc.b2c.initialSize}" />
+		<property name="maxActive" value="${jdbc.b2c.maxActive}" />
+		<property name="maxIdle" value="${jdbc.b2c.maxIdle}" />
+		<property name="minIdle" value="${jdbc.b2c.minIdle}" />
+		<!-- 配置获取连接等待超时的时间 -->
+		<property name="maxWait" value="60000" />
 		<property name="testOnBorrow" value="false" />
 		<property name="testOnReturn" value="false" />
 		<property name="testWhileIdle" value="true" />
 		<property name="validationQuery" value="SELECT 1 FROM SYS.DUAL" />
 		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接 -->
-		<property name="timeBetweenEvictionRunsMillis" value="60000" />
+		<property name="timeBetweenEvictionRunsMillis" value="${jdbc.b2c.timeBetweenEvictionRunsMillis}" />
 		<!-- 配置一个连接在池中最小生存的时间 -->
-		<property name="minEvictableIdleTimeMillis" value="1800000" />
+		<property name="minEvictableIdleTimeMillis" value="${jdbc.b2c.minEvictableIdleTimeMillis}" />
 		<!-- 打开PSCache，并且指定每个连接上PSCache的大小 -->
 		<property name="poolPreparedStatements" value="true" />
 		<property name="maxPoolPreparedStatementPerConnectionSize"

src/main/resources/test/jdbc-b2c.properties

@@ -0,0 +1,12 @@
+#B2C的数据库信息
+jdbc.b2c.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.b2c.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+jdbc.b2c.username=uuplatformdemo
+jdbc.b2c.password=selectuuplatform
+jdbc.b2c.initialSize=1
+jdbc.b2c.maxActive=100
+jdbc.b2c.maxIdle=50
+jdbc.b2c.minIdle=50
+jdbc.b2c.suspectTimeout=60
+jdbc.b2c.timeBetweenEvictionRunsMillis=30000
+jdbc.b2c.minEvictableIdleTimeMillis=60000

src/main/resources/test/jdbc.properties

@@ -1,3 +1,4 @@
+#多账套情况下的主账套
 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
 jdbc.username=UAS
@@ -5,7 +6,7 @@ jdbc.password=select!#%*(
 jdbc.initialSize=10
 jdbc.maxActive=100
 jdbc.maxIdle=50
-jdbc.minIdle=20
+jdbc.minIdle=50
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
 jdbc.minEvictableIdleTimeMillis=60000

src/main/webapp/resources/js/preview/app.js

@@ -33,11 +33,6 @@ $("#download_excel_with_only_data").click(function() {
 //获取数据
 function loadPdfData() {
 	var loadPdfDataUrl = "print/loadPdfData" + window.location.search;
-	pageIndex = getParameter("pageIndex");
-	if (!pageIndex) {
-		pageIndex = 1;
-		loadPdfDataUrl = loadPdfDataUrl + "&pageIndex=" + pageIndex;
-	}
 	$.ajax({
 		type : "get",
 		async : false,