From aca5d3b1ff81b9c1072a82a768cb339a6880e01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 30 Mar 2023 22:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaBaSjGgnrfsServiceImpl.java        |  8 +--
 .../service/impl/OtaBaSjListServiceImpl.java  |  6 +-
 .../impl/OtaBaSjSjmbclServiceImpl.java        |  8 +--
 .../impl/OtaBaSjSjyxpgServiceImpl.java        | 60 +++++++++----------
 4 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
index 3b056ab13..2cd2a3801 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
@@ -277,10 +277,10 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl<OtaBaSjGgnrfsMapper, O
             cell.setCellValue(ComparisonUtil.queryDictTextByKey("user_notification_mode", fs.getGzyhfs(), sysDictService));
 
             String attStr = fs.getXgwj();
-            List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
-            if (ObjectUtils.isNotEmpty(attList)) {
-                for (AttachmentEO aeo : attList) {
-                    List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
+            if(StringUtils.isNotEmpty(attStr)){
+                String[] strs = attStr.split(",");
+                for (String str : strs) {
+                    List<OSSFile> ossFileList = ossFileService.getFileInfos(str);
                     for (OSSFile ossFile : ossFileList) {
                         String filePath = ossFile.getUrl();
                         boolean b = CosBootUtil.doesObjectExist(filePath);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
index 2178ab1c9..84def1daf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
@@ -187,7 +187,7 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
     @Override
     public void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception {
         String cut = "cn";
-        File template = new File(templatePath + "在线升级活动备案.zip");
+        File template = new File(templatePath + "在线升级活动备案导出.zip");
         File exportFile = ImportFileUtil.copyZip(ImportFileUtil.createMfileByFile(template), cut, uploadPath);
 
         File sjmbcxFile = ImportFileUtil.findFile(exportFile, "升级目标车型.xlsx");
@@ -211,8 +211,8 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
         otaBaSjSjfzbhService.exportData(sjfzbhFile, otaId, cut);
 
         File fsFile = ImportFileUtil.findFile(exportFile, "用户告知内容及方式.xlsx");
-        File fsAttFile = ImportFileUtil.findFile(exportFile, "用户告知内容及方式");
-        otaBaSjGgnrfsService.exportData(sjfzbhFile, fsAttFile, otaId, cut);
+        File fsAttFile = ImportFileUtil.findFoder(exportFile, "用户告知内容及方式");
+        otaBaSjGgnrfsService.exportData(fsFile, fsAttFile, otaId, cut);
 
         File qtFile = ImportFileUtil.findFile(exportFile, "其他升级任务信息.xlsx");
         otaBaSjQtsjxxService.exportData(qtFile, otaId, cut);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index cbecdecbc..96bd36cbc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -292,10 +292,10 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
             cell.setCellValue(cl.getVinList());
 
             String attStr = cl.getCsv();
-            List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
-            if (ObjectUtils.isNotEmpty(attList)) {
-                for (AttachmentEO aeo : attList) {
-                    List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
+            if (StringUtils.isNotEmpty(attStr)) {
+                String[] strs = attStr.split(",");
+                for (String str : strs) {
+                    List<OSSFile> ossFileList = ossFileService.getFileInfos(str);
                     for (OSSFile ossFile : ossFileList) {
                         String filePath = ossFile.getUrl();
                         boolean b = CosBootUtil.doesObjectExist(filePath);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
index 0acf2c91e..dcd0e7a11 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
@@ -291,7 +291,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
     }
 
     @Override
-    public void exportData(File file, File attFile1, File attFile2,String otaId, String cut) throws Exception {
+    public void exportData(File file, File attFile1, File attFile2, String otaId, String cut) throws Exception {
         OtaBaSjSjyxpg pg = this.getByOtaId(otaId);
         if (ObjectUtils.isNotEmpty(pg)) {
             Workbook wb = ImportFileUtil.readExcel(file);
@@ -329,46 +329,40 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             row = s.getRow(10);
             cell = row.getCell(1);
             cell.setCellValue(ComparisonUtil.queryDictTextByKey("package_test", pg.getSjbcs(), sysDictService));
-            row = s.getRow(9);
+            row = s.getRow(11);
             cell = row.getCell(1);
             cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(pg.getAqkkx()));
 
-
-            String attStr = pg.getBgfj();
-            if(StringUtils.isNotEmpty(attStr)){
-                List<AttachmentEO> attList = JSONArray.parseArray(attStr, AttachmentEO.class);
-                if (ObjectUtils.isNotEmpty(attList)) {
-                    for (AttachmentEO aeo : attList) {
-                        List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
-                        for (OSSFile ossFile : ossFileList) {
-                            String filePath = ossFile.getUrl();
-                            boolean b = CosBootUtil.doesObjectExist(filePath);
-                            if (b) {
-                                InputStream download = CosBootUtil.download(filePath);
-                                ImportFileUtil.writeToLocal(attFile1.getCanonicalPath() + "/" + ossFile.getFileName(), download);
-                            }
-                        }
-                    }
-                }
-            }
             String attStr1 = pg.getBgfj();
-            if(StringUtils.isNotEmpty(attStr1)){
-                List<AttachmentEO> attList = JSONArray.parseArray(attStr1, AttachmentEO.class);
-                if (ObjectUtils.isNotEmpty(attList)) {
-                    for (AttachmentEO aeo : attList) {
-                        List<OSSFile> ossFileList = ossFileService.getFileInfos(aeo.getId());
-                        for (OSSFile ossFile : ossFileList) {
-                            String filePath = ossFile.getUrl();
-                            boolean b = CosBootUtil.doesObjectExist(filePath);
-                            if (b) {
-                                InputStream download = CosBootUtil.download(filePath);
-                                ImportFileUtil.writeToLocal(attFile2.getCanonicalPath() + "/" + ossFile.getFileName(), download);
-                            }
+            if (StringUtils.isNotEmpty(attStr1)) {
+                String[] strs = attStr1.split(",");
+                for (String str : strs) {
+                    List<OSSFile> ossFileList = ossFileService.getFileInfos(str);
+                    for (OSSFile ossFile : ossFileList) {
+                        String filePath = ossFile.getUrl();
+                        boolean b = CosBootUtil.doesObjectExist(filePath);
+                        if (b) {
+                            InputStream download = CosBootUtil.download(filePath);
+                            ImportFileUtil.writeToLocal(attFile1.getCanonicalPath() + "/" + ossFile.getFileName(), download);
+                        }
+                    }
+                }
+            }
+            String attStr2 = pg.getBgfj();
+            if (StringUtils.isNotEmpty(attStr2)) {
+                String[] strs = attStr2.split(",");
+                for (String str : strs) {
+                    List<OSSFile> ossFileList = ossFileService.getFileInfos(str);
+                    for (OSSFile ossFile : ossFileList) {
+                        String filePath = ossFile.getUrl();
+                        boolean b = CosBootUtil.doesObjectExist(filePath);
+                        if (b) {
+                            InputStream download = CosBootUtil.download(filePath);
+                            ImportFileUtil.writeToLocal(attFile2.getCanonicalPath() + "/" + ossFile.getFileName(), download);
                         }
                     }
                 }
             }
-
             wb.write(new FileOutputStream(file));
             wb.close();
         }