From 05ce07cc377dd83d47cc581401acea9d96a8fbfb Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 30 Nov 2023 09:31:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=870=E7=BA=A7=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsEnterpriseStandardServiceImpl.java    | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 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 4391adb5..300309b1 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
@@ -224,6 +224,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
 
     @Override
     public void importOldESAuthAllExcel(MultipartFile file, HttpServletResponse response) {
+        List<ESAuthAll> errImportList = new ArrayList<>();
         // 验证文件是否为压缩格式file.getContentType()).contains("xls")
         if (!Objects.requireNonNull(file.getOriginalFilename()).contains("xls")) {
             throw new JeroBootException("文件格式不正确，请上传Excel。");
@@ -248,7 +249,11 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                     i--;
                 }
             }
-            log.info("获取数据成功，数据条数：{}", datalist.size());
+            // 只取用企标数据
+            // 区分数据
+            log.info("获取数据成功，总数据条数：{}", datalist.size());
+            datalist = datalist.stream().filter(data -> data.getStandardType().startsWith("企业标准")).collect(Collectors.toList());
+            log.info("企标相关数据条数：{}", datalist.size());
             // 获取当前时间戳（毫秒）
             long endTime = System.currentTimeMillis();
             // 计算执行时间（毫秒）
@@ -263,10 +268,16 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
             // 遍历dataList 并且构造Update语句
             List<LawsEnterpriseStandard> updateList = new ArrayList<>();
             for (ESAuthAll data : datalist) {
-                LawsEnterpriseStandard es = esMap.get(data.getStandardId());
-                if (es != null) {
-                    es.setGradeClassification("1");
-                    updateList.add(es);
+                try {
+                    LawsEnterpriseStandard es = esMap.get(data.getStandardId());
+                    if (es != null) {
+                        es.setGradeClassification("1");
+                        updateList.add(es);
+                    } else {
+                        throw new JeroBootException("未找到该企标，标准编号：" + data.getStandardNumber() + "，标准名称：" + data.getStandardName());
+                    }
+                } catch (Exception e) {
+                    errImportList.add(data);
                 }
             }
             // 批量更新
@@ -275,6 +286,11 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
         } catch (Exception e) {
             log.error("导入失败；{}", e.getMessage());
         }
+        if (!errImportList.isEmpty()) {
+            log.info("导入失败数据条数：{}", errImportList.size());
+            this.exportWithExcel(response, errImportList, "ESAuthAllErrorData.xls");
+        }
+        log.info("企标所有人权限全部导入成功");
     }
 
     @Override