From b2452cc48efe3d2479bf0c336ea6993cee419ef8 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 07 九月 2022 13:41:44 +0800
Subject: [PATCH] 软件上传更新

---
 src/main/java/com/whyc/service/SoftwareService.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index 0030f16..631e0df 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -156,7 +156,8 @@
         file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
         //瀛樺偍璺緞
         String rootFile = CommonUtil.getRootFile();
-        String softwareDir = rootFile + software.getOwner() + File.separator + dateUnion;
+        String softwareDir = rootFile + "software" + File.separator + software.getOwner() + File.separator + dateUnion;
+        String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
         File softwareDirFile = new File(softwareDir);
         if(!softwareDirFile.exists()){
             softwareDirFile.mkdirs();
@@ -164,10 +165,11 @@
         file1.transferTo(new File(softwareDir+File.separator+file1Name));
         file2.transferTo(new File(softwareDir+File.separator+file2Name));
         //璁剧疆璺緞
-        softwareList.forEach(software1 -> {
-            software1.setFileUrl(softwareDir);
+        for (Software software1:softwareList){
+            software1.setFileUrl(softwareHttpUrl+File.separator+file1Name);
+            software1.setExcelUrl(softwareHttpUrl+File.separator+file2Name);
             software1.setCreateTime(date);
-        });
+        }
         //鍐欏叆鏁版嵁搴�
         insertBatch(softwareList);
         return new Response().setII(1,"涓婁紶瀹屾垚");

--
Gitblit v1.9.1