From 0cdc65660b40286a4b9e0a006590b66c8b7980de Mon Sep 17 00:00:00 2001 From: wangchun <2838138608@qq.com> Date: Fri, 24 Jul 2020 13:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ureport/console/BaseServletAction.java | 20 +++++++++++++---- .../excel/ExportExcelServletAction.java | 20 ++++++++--------- .../console/pdf/ExportPdfServletAction.java | 22 +++++++++---------- .../console/word/ExportWordServletAction.java | 20 ++++++++--------- ureport2-console/upload.bat | 4 ++-- 5 files changed, 46 insertions(+), 40 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 ec9bc12..1cb1f4b 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 @@ -107,7 +107,7 @@ public abstract class BaseServletAction implements ServletAction { return null; } - protected String buildDownloadFileName(String reportFileName,String fileName,String extName){ + protected String buildDownloadFileName(String reportFileName,String fileName,String extName,HttpServletRequest req){ if(StringUtils.isNotBlank(fileName)){ fileName=decode(fileName); if(!fileName.toLowerCase().endsWith(extName)){ @@ -123,7 +123,8 @@ public abstract class BaseServletAction implements ServletAction { if(pos>0){ reportFileName=reportFileName.substring(0,pos); } - String finalFileName = getFileName(reportFileName); + String projId = req.getParameter("projId"); + String finalFileName = getFileName(reportFileName,projId); if(StringUtils.isNotBlank(finalFileName)){ return finalFileName+extName; } @@ -136,19 +137,30 @@ public abstract class BaseServletAction implements ServletAction { * @param reportTitle * @return */ - private String getFileName(String reportTitle){ + private String getFileName(String reportTitle,String projId){ Connection connection = Utils.getBuildinConnection(Utils.getApplicationContext().getEnvironment().getProperty("ureport.datasource.name")); String fileName = ""; PreparedStatement preparedStatement = null; ResultSet resultSet = null; + String sql = ""; try { - String sql = "select file_name from ureport_export_name where title_name = ?"; + + 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"); } + if(StringUtils.isNotBlank(projId)){ + sql = "SELECT org_name FROM tb_org_structure WHERE id = ?"; + preparedStatement = connection.prepareStatement(sql); + preparedStatement.setString(1,projId); + resultSet = preparedStatement.executeQuery(); + while (resultSet.next()){ + fileName = resultSet.getString("org_name") + "-" + fileName; + } + } } catch (SQLException throwables) { throwables.printStackTrace(); }finally { diff --git a/ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java b/ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java index 60b1054..9b814da 100644 --- a/ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java +++ b/ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java @@ -15,16 +15,6 @@ ******************************************************************************/ package com.bstek.ureport.console.excel; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringUtils; - import com.bstek.ureport.build.ReportBuilder; import com.bstek.ureport.console.BaseServletAction; import com.bstek.ureport.console.cache.TempObjectCache; @@ -37,6 +27,14 @@ import com.bstek.ureport.export.ExportConfigureImpl; import com.bstek.ureport.export.ExportManager; import com.bstek.ureport.export.excel.high.ExcelProducer; import com.bstek.ureport.model.Report; +import org.apache.commons.lang.StringUtils; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; /** * @author Jacky.gao @@ -73,7 +71,7 @@ public class ExportExcelServletAction extends BaseServletAction { OutputStream outputStream=resp.getOutputStream(); try { String fileName=req.getParameter("_n"); - fileName=buildDownloadFileName(file, fileName, ".xlsx"); + fileName=buildDownloadFileName(file, fileName, ".xlsx",req); resp.setContentType("application/octet-stream;charset=ISO8859-1"); fileName=new String(fileName.getBytes("UTF-8"),"ISO8859-1"); resp.setHeader("Content-Disposition","attachment;filename=\"" + fileName + "\""); diff --git a/ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java b/ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java index 3c755f7..b08f93a 100644 --- a/ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java +++ b/ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java @@ -15,17 +15,6 @@ ******************************************************************************/ package com.bstek.ureport.console.pdf; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.map.ObjectMapper; - import com.bstek.ureport.build.ReportBuilder; import com.bstek.ureport.console.BaseServletAction; import com.bstek.ureport.console.cache.TempObjectCache; @@ -40,6 +29,15 @@ import com.bstek.ureport.export.ExportManager; import com.bstek.ureport.export.ReportRender; import com.bstek.ureport.export.pdf.PdfProducer; import com.bstek.ureport.model.Report; +import org.apache.commons.lang.StringUtils; +import org.codehaus.jackson.map.ObjectMapper; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; /** * @author Jacky.gao @@ -72,7 +70,7 @@ public class ExportPdfServletAction extends BaseServletAction{ OutputStream outputStream=null; try { String fileName=req.getParameter("_n"); - fileName=buildDownloadFileName(file, fileName, ".pdf"); + fileName=buildDownloadFileName(file, fileName, ".pdf",req); fileName=new String(fileName.getBytes("UTF-8"),"ISO8859-1"); if(forPrint){ resp.setContentType("application/pdf"); diff --git a/ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java b/ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java index c068aa9..574c037 100644 --- a/ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java +++ b/ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java @@ -15,16 +15,6 @@ ******************************************************************************/ package com.bstek.ureport.console.word; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringUtils; - import com.bstek.ureport.build.ReportBuilder; import com.bstek.ureport.console.BaseServletAction; import com.bstek.ureport.console.cache.TempObjectCache; @@ -37,6 +27,14 @@ import com.bstek.ureport.export.ExportConfigureImpl; import com.bstek.ureport.export.ExportManager; import com.bstek.ureport.export.word.high.WordProducer; import com.bstek.ureport.model.Report; +import org.apache.commons.lang.StringUtils; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; /** * @author Jacky.gao @@ -66,7 +64,7 @@ public class ExportWordServletAction extends BaseServletAction { OutputStream outputStream=resp.getOutputStream(); try { String fileName=req.getParameter("_n"); - fileName=buildDownloadFileName(file, fileName, ".docx"); + fileName=buildDownloadFileName(file, fileName, ".docx",req); fileName=new String(fileName.getBytes("UTF-8"),"ISO8859-1"); resp.setContentType("application/octet-stream;charset=ISO8859-1"); resp.setHeader("Content-Disposition","attachment;filename=\"" + fileName + "\""); diff --git a/ureport2-console/upload.bat b/ureport2-console/upload.bat index ac561f2..dcaa812 100644 --- a/ureport2-console/upload.bat +++ b/ureport2-console/upload.bat @@ -1,11 +1,11 @@ set mvn_repo_home=G:\maven\repository\ set deploy_tmp_folder=G:\maven\mvn_deploy\ set repositoryId=maven-releases -set repoUrl=http://192.168.31.188:8081/repository/maven-releases/ +set repoUrl=http://47.114.154.180:8081/repository/maven-releases/ call mvn clean install xcopy %mvn_repo_home%com\bstek\ureport\ureport2-console\2.2.9\ureport2-console-2.2.9* %deploy_tmp_folder% /y call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% -call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%