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

---
 .../serviceimpl/FileBackLogServiceImpl.java   |  2 +-
 .../serviceimpl/FileRecycleServiceImpl.java   |  2 +-
 .../software/common/enums/DataOwnEnum.java    | 21 +++++++------------
 3 files changed, 10 insertions(+), 15 deletions(-)

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 5d0f2cc..e8cfc89 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
@@ -69,7 +69,7 @@ public class FileBackLogServiceImpl extends ServiceImpl<FileBackupLogMapper, Fil
             fileBackLogVO.setBackStartTime(DateUtil.date(fileBackupLog.getStartTime()));
             fileBackLogVO.setBackEndTime(DateUtil.date(fileBackupLog.getEndTime()));
             fileBackLogVO.setDataOwn(map.get(fileBackupLog.getFileId()).getDataOwn());
-            fileBackLogVO.setDataOwner(DataOwnEnum.getTypeByCode(map.get(fileBackupLog.getFileId()).getDataOwn()));
+            fileBackLogVO.setDataOwner(DataOwnEnum.getEnumByCode(map.get(fileBackupLog.getFileId()).getDataOwn()).type);
             fileBackLogVO.setFilePath(paths.get(map.get(fileBackupLog.getFileId()).getFilePath()));
             list.add(fileBackLogVO);
         }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
index fce2e4b..fcf10bc 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
@@ -118,7 +118,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
         Map<String, String> filesPath = commonService.getFilesPath(filePaths);
         Map<String, String> userIdNameMap = getUserIdNameMap(records.stream().map(FileRecycleQueryVO::getUpdatedBy).toList());
         records.forEach(e -> {
-            e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwn()));
+            e.setDataOwner(DataOwnEnum.getEnumByCode(e.getDataOwn()).type);
             e.setFilePrjPath(filesPath.get(e.getFilePath()));
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setUserName(userIdNameMap.get(e.getUpdatedBy()));
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java
index f405a11..ee5a63a 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java
@@ -17,11 +17,13 @@ public enum DataOwnEnum {
     REPO_FILE(3, "库数据文件（文件夹）", "库数据");
 
     private static final Map<Integer, Integer> FILE_PRJ_MAP = new HashMap<>();
+    private static final Map<Integer, DataOwnEnum> CODE_ENUM = new HashMap<>();
 
     static {
         FILE_PRJ_MAP.put(DataOwnEnum.SYS_FILE.code, DataOwnEnum.SYS_PRJ.code);
         FILE_PRJ_MAP.put(DataOwnEnum.USER_FILE.code, DataOwnEnum.USER_PRJ.code);
         FILE_PRJ_MAP.put(DataOwnEnum.REPO_FILE.code, DataOwnEnum.REPO_PRJ.code);
+        addEnum();
     }
 
     public final int code;
@@ -52,21 +54,14 @@ public enum DataOwnEnum {
         return code == REPO_FILE.code || code == REPO_PRJ.code;
     }
 
-    public static String getTypeByCode(int code) {
-        for (DataOwnEnum e : DataOwnEnum.values()) {
-            if (e.code == code) {
-                return e.type;
-            }
-        }
-        return "";
+    public static DataOwnEnum getEnumByCode(int code) {
+        return CODE_ENUM.getOrDefault(code, null);
     }
 
-    public static DataOwnEnum getEnumByCode(int code) {
-        for (DataOwnEnum e : DataOwnEnum.values()) {
-            if (e.code == code) {
-                return e;
-            }
+    private static void addEnum() {
+        for (DataOwnEnum value : DataOwnEnum.values()) {
+            CODE_ENUM.put(value.code, value);
         }
-        return null;
     }
+
 }
\ No newline at end of file