From 76feeb358a0368142f45dfdb440c1e872ed8338c Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 13 Feb 2023 11:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=B5=81=E7=A8=8B=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileSplitItemsEOController.java        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
index 9f73defb..48fb084a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
@@ -418,25 +418,23 @@ public class SarFileSplitItemsEOController extends BaseController<SarFileSplitIt
                     "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
             response.setContentType("application/force-download");
             response.flushBuffer();
-
             os = response.getOutputStream();
             workbook.write(excelOS);
             excelOS.flush();
             excelOS.close();
-//            ZipUtil.zip(fileNowPath,fileNowPath+".zip");
-//            FileInputStream fis = new FileInputStream(fileNowPath+".zip");
-//            int len = 0;
-//            while ((len = fis.read()) != -1) {
-//                os.write(len);
-//            }
-//            os.flush();
-//            os.close(); // 后开先关
-//            fis.close(); // 先开后关
-
             List<AttFileEO> multiFileInfos = this.attFileEOService.getMultiFileInfos(fileIds);
             if(CollectionUtils.isNotEmpty(multiFileInfos)){
+                for (AttFileEO data : multiFileInfos){
+                    if(StringUtils.isNotBlank(data.getOldFileName())){
+                        String[] split = data.getOldFileName().split("\\.");
+                        //存在则更换后缀
+                        if(split.length>0){
+                            data.setOldFileName(split[0]+".png");
+                        }
+                    }
+                }
                 this.attFileEOService.downLoadFileList(multiFileInfos,fileNowPath);
-
+            }
                 ZipUtil.zip(fileNowPath,fileNowPath+".zip");
                 FileInputStream fis = new FileInputStream(fileNowPath+".zip");
                 int len = 0;
@@ -446,7 +444,6 @@ public class SarFileSplitItemsEOController extends BaseController<SarFileSplitIt
                 os.flush();
                 os.close(); // 后开先关
                 fis.close(); // 先开后关
-            }
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             throw new AdcDaBaseException("下载文件失败，请重试");