From b1d8e8f22b2dc349cb58b98f0022c6594e861284 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 20 九月 2023 10:56:42 +0800
Subject: [PATCH] 下载日志修改
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index e4a78f5..d217eb3 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
@@ -207,7 +208,8 @@
return new Response().setIIII(1,list.size()>0,list,listsoft,fIleSilkLock,"杩斿洖鐗╂枡淇℃伅鍙婂叧鑱旂墿鏂�");
}
//鍘嗗彶浜у搧涓嬭浇(浜у搧id鍜岀増鏈�<涓嬭浇鐨勭増鏈�>)
- public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, int productId, int version) {
+ public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, int productId, int version
+ , String oprateReason, String oprateInfo) {
//璇诲彇浜у搧淇℃伅
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("id",productId);
@@ -247,10 +249,11 @@
withOutDwg+=File.separator+"standard"+File.separator+version;
}
//鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉
- creatBomHsitoryExcel(req,resp,pHistory,endList,withOutDwg);
+ creatBomHsitoryExcel(req,resp,pHistory,endList,withOutDwg,oprateReason,oprateInfo,version);
}
//鏍规嵁浜у搧淇℃伅鍒涘缓excel琛ㄦ牸骞跺瓨鏀惧湪鎸囧畾鐩綍
- public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list,String withOutDwg){
+ public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list,String withOutDwg
+ , String oprateReason, String oprateInfo,int version){
String fileDirName = FileDirPath.getFileDirName();
String rootFace="";
String excelName="";
@@ -462,7 +465,8 @@
e.printStackTrace();
}
//璁板綍鏃ュ織
- logService.recordOperationLog(ActionUtil.getUser().getId(),ActionUtil.getUser().getName(), UserOperation.TYPE_DOWNLOAD_NEW.getType(),new Date(),req.getRemoteAddr(),excelName+".zip",rootFace+".zip");
+ logService.recordOperationLogDownLoad(ActionUtil.getUser().getId(),ActionUtil.getUser().getName(), UserOperation.TYPE_DOWNLOAD_PRODUCT.getType(),new Date(),req.getRemoteAddr()
+ ,excelName+".zip",rootFace+".zip",oprateReason,oprateInfo,String.valueOf(version));
}
//灏嗙墿鏂欏瓨鏀句负涓�涓猙omHistory涓轰笅杞藉仛鍑嗗
--
Gitblit v1.9.1