From 02aa7a44ca45794263afd0874670a7a1d6044d50 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 16 Apr 2024 22:51:31 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkerInfoServiceImpl.java   | 73 ++++++++++---------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 094d6045d..5629e9d9b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -2005,12 +2005,18 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         }
         StringBuilder formatSb = new StringBuilder();
         StringBuilder failSb = new StringBuilder();
+        StringBuilder sucSb = new StringBuilder();
         for (int i = 0; i < files.length; i++) {
             File f = files[i];
-            traverseFile(f.getAbsolutePath(), formatSb, failSb);
+            traverseFile(f.getAbsolutePath(), formatSb, failSb, sucSb);
         }
         //通知
         if (SecurityUtils.getUser().getUserId() != null) {
+            String msg = "";
+            String sucSbStr = sucSb.toString();
+            if (StrUtil.isNotBlank(sucSbStr)) {
+                msg = "成功>" + sucSbStr + ",";
+            }
             String failStr = failSb.toString();
             if (StrUtil.isNotBlank(failStr)) {
                 failStr = "更新失败>" + failStr;
@@ -2019,7 +2025,6 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             if (StrUtil.isNotBlank(formatStr)) {
                 formatStr = "图片格式不正确>" + formatStr;
             }
-            String msg = "";
             if (StrUtil.isNotBlank(failStr + formatStr)) {
                 msg = "失败的信息：" + failStr + formatStr;
             }
@@ -2032,43 +2037,45 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     /**
      * 真正递归的方法
      *
-     * @param path 根目录的抽象路径
+     * @param path  根目录的抽象路径
+     * @param sucSb
      */
-    public void traverseFile(String path, StringBuilder formatSb, StringBuilder failSb) {
+    public void traverseFile(String path, StringBuilder formatSb, StringBuilder failSb, StringBuilder sucSb) {
         File file = new File(path);
         if (file.exists()) {
-            File[] fileArray = file.listFiles();
-            for (File f : fileArray) {
-                if (f.isDirectory()) {
+            if (file.isDirectory()) {
+                File[] fileArray = file.listFiles();
+                for (File f : fileArray) {
                     System.out.println("【文件夹】-----" + f.getAbsolutePath());
                     // -----递归的方法体
-                    traverseFile(f.getAbsolutePath(), formatSb, failSb);
-                } else {
-                    System.out.println("【文件】-----" + f.getAbsolutePath());
-                    String name = f.getName();
-                    //处理
-                    //名称_身份证.jpg
-                    boolean isMatch = ReUtil.isMatch(".+_.+[.].+", name);
-                    if (!isMatch) {
-                        formatSb.append(name + ",");
-                        continue;
-                    }
-                    String idCard = name.split("_")[1].split("\\.")[0];
-                    String workerName = name.split("_")[0];
-                    String suffix = name.split("\\.")[1];
-                    String saveName = IdUtil.randomUUID() + "." + suffix;
-                    FileUtil.move(f, new File(basePath + "/" + saveName), true);
-                    List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
-                            .eq(WorkerInfo::getIdCard, idCard));
-                    try {
-                        for (WorkerInfo workerInfo : workerInfos) {
-                            workerInfo.setFieldAcquisitionUrl(saveName);
-                            editWorkerInfo(workerInfo);
-                        }
-                    } catch (Exception e) {
-                        log.error("error：", e);
-                        failSb.append(workerName + ":错误原因" + e.getMessage() + ",");
+                    traverseFile(f.getAbsolutePath(), formatSb, failSb, sucSb);
+                }
+            } else {
+                System.out.println("【文件】-----" + file.getAbsolutePath());
+                String name = file.getName();
+                //处理
+                //名称_身份证.jpg
+                boolean isMatch = ReUtil.isMatch(".+_.+[.].+", name);
+                if (!isMatch) {
+                    formatSb.append(name + ",");
+                    return;
+                }
+                String idCard = name.split("_")[1].split("\\.")[0];
+                String workerName = name.split("_")[0];
+                String suffix = name.split("\\.")[1];
+                String saveName = IdUtil.randomUUID() + "." + suffix;
+                FileUtil.move(file, new File(basePath + "/" + saveName), true);
+                List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
+                        .eq(WorkerInfo::getIdCard, idCard));
+                try {
+                    for (WorkerInfo workerInfo : workerInfos) {
+                        workerInfo.setFieldAcquisitionUrl(saveName);
+                        editWorkerInfo(workerInfo);
+                        sucSb.append(workerName + ",");
                     }
+                } catch (Exception e) {
+                    log.error("error：", e);
+                    failSb.append(workerName + ":错误原因" + e.getMessage() + ",");
                 }
             }
         } else {