nelson
/
ureport2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改文件名称

master
wangchun 4 years ago
parent
a60aa33ae5
commit
0cdc65660b
5 changed files with 46 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java
  2. 20
      ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java
  3. 22
      ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java
  4. 20
      ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java
  5. 4
      ureport2-console/upload.bat

20
ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java
View File

@ -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 {

20
ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java
View File

@ -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 + "\"");

22
ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java
View File

@ -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");

20
ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java
View File

@ -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 + "\"");

4
ureport2-console/upload.bat
View File

@ -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%

Write Preview
Loading…
Cancel
Save