From 584803e086d86c80927ea9f14e363b4cad478f27 Mon Sep 17 00:00:00 2001
From: wangchun <2838138608@qq.com>
Date: Mon, 6 Jul 2020 15:22:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ureport/console/BaseServletAction.java    | 68 +++++++++++++++++--
 1 file changed, 62 insertions(+), 6 deletions(-)

diff --git a/ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java b/ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java
index fd4cfb3..a6ddfdd 100644
--- a/ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java
+++ b/ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java
@@ -15,18 +15,22 @@
  ******************************************************************************/
 package com.bstek.ureport.console;
 
+import com.bstek.ureport.Utils;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 import java.net.URLDecoder;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-
 
 /**
  * @author Jacky.gao
@@ -119,7 +123,59 @@ public abstract class BaseServletAction implements ServletAction {
 			if(pos>0){
 				reportFileName=reportFileName.substring(0,pos);
 			}
+			String finalFileName = getFileName(reportFileName);
+			if(StringUtils.isNotBlank(finalFileName)){
+				return finalFileName+extName;
+			}
 			return "ureport-"+reportFileName+extName;
 		}
 	}
+
+	/**
+	 * 从数据库种获取文件导出名称
+	 * @param reportTitle
+	 * @return
+	 */
+	private String getFileName(String reportTitle){
+		System.out.println("查询数据库开始");
+		Connection connection = Utils.getBuildinConnection(Utils.getApplicationContext().getEnvironment().getProperty("ureport.datasource.name"));
+		String fileName = "";
+		PreparedStatement preparedStatement = null;
+		ResultSet resultSet = null;
+		try {
+			String sql = "select file_name from ureport_export_name where title_name = ?";
+			preparedStatement = connection.prepareStatement(sql);
+		   	preparedStatement.setString(1,reportTitle);
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()){
+				fileName = resultSet.getString("file_name");
+			}
+			System.out.println("查询数据库结束");
+		} catch (SQLException throwables) {
+			throwables.printStackTrace();
+		}finally {
+			if(connection != null){
+				try {
+					connection.close();
+				} catch (SQLException throwables) {
+					throwables.printStackTrace();
+				}
+			}
+			if(preparedStatement != null){
+				try {
+					preparedStatement.close();
+				} catch (SQLException throwables) {
+					throwables.printStackTrace();
+				}
+			}
+			if(resultSet != null){
+				try {
+					resultSet.close();
+				} catch (SQLException throwables) {
+					throwables.printStackTrace();
+				}
+			}
+		}
+		return fileName;
+	}
 }