From 86576fbbbc178f9765e690a55e5729fd38dcd7ec Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 28 Nov 2023 19:04:46 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E6=B3=A8=E9=87=8A=E6=8E=89=E8=80=81?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=AF=BC=E5=85=A5=E6=96=87=E4=BB=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=85=B3=E7=B3=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsEnterpriseStandardServiceImpl.java    | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
index 3c44fad5..4bb88fc8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
@@ -287,19 +287,19 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                 }
 
                 // 根据文件路径获取文件Id
-                String originPath = dto.getSclj();
-                if (StrUtil.isNotBlank(originPath)) {
-                    String filePath = this.getFilePath(originPath);
-                    if (MinioUtil.doesObjectExist(filePath)) {
-                        // 存入关系表
-                        OSSFile ossFile = new OSSFile();
-                        ossFile.setUrl(filePath);
-                        ossFile.setStandardNo(dto.getBzh());
-                        ossFile.setFileName(FileUtil.getName(filePath));
-                        ossFile.setStandardFileType("publish_of_original");
-                        ossFileList.add(ossFile);
-                    }
-                }
+//                String originPath = dto.getSclj();
+//                if (StrUtil.isNotBlank(originPath)) {
+//                    String filePath = this.getFilePath(originPath);
+//                    if (MinioUtil.doesObjectExist(filePath)) {
+//                        // 存入关系表
+//                        OSSFile ossFile = new OSSFile();
+//                        ossFile.setUrl(filePath);
+//                        ossFile.setStandardNo(dto.getBzh());
+//                        ossFile.setFileName(FileUtil.getName(filePath));
+//                        ossFile.setStandardFileType("publish_of_original");
+//                        ossFileList.add(ossFile);
+//                    }
+//                }
                 gbList.add(gb);
             } catch (Exception e) {
                 log.error("导入转换国标数据时发生错误：{}", e.getMessage());
@@ -318,7 +318,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
         }
 
         // 3. 将文件关系列表转为Map，用于快速查找
-        Map<String, List<OSSFile>> standardNumberToFileMap = ossFileList.stream().collect(Collectors.groupingBy(OSSFile::getStandardNo));
+//        Map<String, List<OSSFile>> standardNumberToFileMap = ossFileList.stream().collect(Collectors.groupingBy(OSSFile::getStandardNo));
 
         // 4. 遍历待保存或更新的列表，设置ID
         StringBuilder oldIds = new StringBuilder();
@@ -355,11 +355,11 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
             entity.setReplacedByStandardNumber(null);
             domesticStandardService.saveOrUpdate(entity);
             String standardId = entity.getId();
-            // 保存文件关联
-            OSSFile ossFile = standardNumberToFileMap.get(entity.getStandardNumber()).get(0);
-            ossFile.setStandardId(standardId);
-            ossFileService.save(ossFile);
-            entity.setId(standardId);
+            // 保存文件关联 //TODO 处理空指针
+//            OSSFile ossFile = standardNumberToFileMap.get(entity.getStandardNumber()).get(0);
+//            ossFile.setStandardId(standardId);
+//            ossFileService.save(ossFile);
+//            entity.setId(standardId);
         }
         log.info("老法规国标覆盖导入完成");
         // 获取当前时间戳（毫秒）
@@ -439,19 +439,19 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                     es.setCategoryCode(excelUtils.translateDictValue("standard_category_code", categoryCode, listDict));
                 }
                 // 根据文件路径获取文件Id
-                String originPath = dto.getSclj();
-                if (StrUtil.isNotBlank(originPath)) {
-                    String filePath = this.getFilePath(originPath);
-                    if (MinioUtil.doesObjectExist(filePath)) {
-                        // 存入关系表
-                        OSSFile ossFile = new OSSFile();
-                        ossFile.setUrl(filePath);
-                        ossFile.setStandardNo(dto.getBzh());
-                        ossFile.setFileName(FileUtil.getName(filePath));
-                        ossFile.setStandardFileType("publish_of_original");
-                        ossFileList.add(ossFile);
-                    }
-                }
+//                String originPath = dto.getSclj();
+//                if (StrUtil.isNotBlank(originPath)) {
+//                    String filePath = this.getFilePath(originPath);
+//                    if (MinioUtil.doesObjectExist(filePath)) {
+//                        // 存入关系表
+//                        OSSFile ossFile = new OSSFile();
+//                        ossFile.setUrl(filePath);
+//                        ossFile.setStandardNo(dto.getBzh());
+//                        ossFile.setFileName(FileUtil.getName(filePath));
+//                        ossFile.setStandardFileType("publish_of_original");
+//                        ossFileList.add(ossFile);
+//                    }
+//                }
                 esList.add(es);
             } catch (Exception e) {
                 log.error("导入转换企标数据时发生错误：{}", e.getMessage());
@@ -470,7 +470,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
         }
 
         // 3. 将文件关系列表转为Map，用于快速查找
-        Map<String, List<OSSFile>> standardNumberToFileMap = ossFileList.stream().collect(Collectors.groupingBy(OSSFile::getStandardNo));
+//        Map<String, List<OSSFile>> standardNumberToFileMap = ossFileList.stream().collect(Collectors.groupingBy(OSSFile::getStandardNo));
 
         // 4. 遍历待保存或更新的列表，设置ID
         StringBuilder oldIds = new StringBuilder();
@@ -511,12 +511,12 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
             // 保存文件关联
             String standardId = entity.getId();
             // 保存文件关联
-            List<OSSFile> ossFiles = standardNumberToFileMap.get(entity.getStandardNumber());
-            if (ossFiles != null && !ossFiles.isEmpty()) {
-                OSSFile ossFile = ossFiles.get(0);
-                ossFile.setStandardId(standardId);
-                ossFileService.save(ossFile);
-            }
+//            List<OSSFile> ossFiles = standardNumberToFileMap.get(entity.getStandardNumber());
+//            if (ossFiles != null && !ossFiles.isEmpty()) {
+//                OSSFile ossFile = ossFiles.get(0);
+//                ossFile.setStandardId(standardId);
+//                ossFileService.save(ossFile);
+//            }
             entity.setId(standardId);
             // 拼接新id
             newIds.append(standardId).append(",");