From 59fb1df6902d467edc9cb397efdf214eac604253 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 19 九月 2023 16:37:56 +0800
Subject: [PATCH] 下载日志修改
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index 08c597a..c6a0abd 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
+import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
@@ -247,12 +248,6 @@
}
//鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉
creatBomHsitoryExcel(req,resp,pHistory,endList,withOutDwg);
- //璁板綍鏃ュ織
- DocUser docUser= ActionUtil.getUser();
- String operationDetail="鍏蜂綋浜у搧涓�:"+pHistory.toString();
- String opreationMsg="鎵ц浜�"+pHistory.getVersion()+"鐗堟湰浜у搧鐨勪笅杞芥搷浣�";
- String terminalIp=req.getRemoteAddr();
- logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
}
//鏍规嵁浜у搧淇℃伅鍒涘缓excel琛ㄦ牸骞跺瓨鏀惧湪鎸囧畾鐩綍
public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list,String withOutDwg){
@@ -445,9 +440,10 @@
FileOutputStream forootFace = new FileOutputStream(file);
ZipUtils.toZip(rootFace, forootFace,true);
// 杞爜闃叉涔辩爜
- resp.addHeader("Content-Disposition", "attachment;filename="
+ /*resp.addHeader("Content-Disposition", "attachment;filename="
+ new String(excelName.getBytes("UTF-8"), "ISO8859-1")
- + ".zip");
+ + ".zip");*/
+ resp.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode ( excelName+".zip", "utf-8"));
OutputStream out = resp.getOutputStream();
FileInputStream in = new FileInputStream(rootFace+".zip");
int len=0;
@@ -465,6 +461,8 @@
} catch (IOException e) {
e.printStackTrace();
}
+ //璁板綍鏃ュ織
+ logService.recordOperationLog(ActionUtil.getUser().getId(),ActionUtil.getUser().getName(), UserOperation.TYPE_DOWNLOAD_New.getType(),new Date(),req.getRemoteAddr(),excelName+".zip",rootFace+".zip");
}
//灏嗙墿鏂欏瓨鏀句负涓�涓猙omHistory涓轰笅杞藉仛鍑嗗
--
Gitblit v1.9.1