From 34c51c775e32f58fc624722273979e6d55f27529 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 21 Apr 2025 15:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/CommonService.java      |  9 +++------
 .../service/serviceimpl/FileBackLogServiceImpl.java    | 10 ++++------
 .../industry/software/common/util/EleCommonUtil.java   |  4 ++++
 .../industry/software/common/util/SignUtils.java       |  5 ++++-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
index e9ec4b2..a86a7b7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
@@ -198,12 +198,9 @@ public class CommonService {
         StringBuilder path = new StringBuilder();
         for (String id : ids) {
             EdFileInfo fileInfo = map.get(id);
-            String tmp;
-            if (fileInfo.getDataType().equals(EleDataTypeEnum.FILE.code)) {
-                tmp = fileInfo.getFileName() + "." + fileInfo.getFileType();
-            } else {
-                tmp = fileInfo.getFileName() + File.separator;
-            }
+            String tmp = EleCommonUtil.simpleTrueFalse(Objects.equals(fileInfo.getDataType(), EleDataTypeEnum.FILE.code),
+                    fileInfo.getFileName() + "." + fileInfo.getFileType(),
+                    fileInfo.getFileName() + File.separator);
             path.append(tmp);
         }
         return path.toString();
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
index 4eb1d01..ddc7688 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java
@@ -13,6 +13,7 @@ import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum;
 import com.electromagnetic.industry.software.common.enums.FileBackupSource;
 import com.electromagnetic.industry.software.common.pojo.RespPageVO;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
+import com.electromagnetic.industry.software.common.util.EleCommonUtil;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper;
@@ -87,12 +88,9 @@ public class FileBackLogServiceImpl extends ServiceImpl<FileBackupLogMapper, Fil
         List<String> restoreFilePaths = new ArrayList<>();
         for (EdFileInfo edFileInfo : edFileInfos) {
 
-            String destPath;
-            if (DataOwnEnum.isUserCode(edFileInfo.getDataOwn())) {
-                destPath = commonService.getPrjRootPath1(edFileInfo.getDataOwn()) + File.separator + edFileInfo.getCreatedBy() + File.separator + edFileInfo.getId();
-            } else {
-                destPath = commonService.getPrjRootPath1(edFileInfo.getDataOwn()) + File.separator + edFileInfo.getId();
-            }
+            String destPath = EleCommonUtil.simpleTrueFalse(DataOwnEnum.isUserCode(edFileInfo.getDataOwn()),
+                    commonService.getPrjRootPath1(edFileInfo.getDataOwn()) + File.separator + edFileInfo.getCreatedBy() + File.separator + edFileInfo.getId(),
+                    commonService.getPrjRootPath1(edFileInfo.getDataOwn()) + File.separator + edFileInfo.getId());
             destPath = destPath.replace("//", "/");
             log.info("back up file path is {}", destPath);
             if (!FileUtil.exist(destPath)) {
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
index dd628e2..c8dfd63 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java
@@ -133,4 +133,8 @@ public final class EleCommonUtil {
         }
     }
 
+    public static <T> T simpleTrueFalse(Boolean match, T t1, T t2) {
+        return match ? t1 : t2;
+    }
+
 }
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java
index 6c769c3..693cb92 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/SignUtils.java
@@ -1,7 +1,10 @@
 package com.electromagnetic.industry.software.common.util;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.security.MessageDigest;
 
+@Slf4j
 public class SignUtils {
 
     /**
@@ -26,7 +29,7 @@ public class SignUtils {
             }
             return md5StrBuff.toString();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             return null;
         }
     }