From 9da19d7e4e193e3c89b463ada3926524aeb0cb4c Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 25 Mar 2025 17:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/pojo/resp/OperationModuleVO.java        | 11 +++++++++++
 .../serviceimpl/FileBackLogServiceImpl.java        |  8 ++++++--
 .../serviceimpl/UserAccessLogServiceImpl.java      | 14 ++++++--------
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/OperationModuleVO.java

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/OperationModuleVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/OperationModuleVO.java
new file mode 100644
index 0000000..d6ab983
--- /dev/null
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/OperationModuleVO.java
@@ -0,0 +1,11 @@
+package com.electromagnetic.industry.software.manage.pojo.resp;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class OperationModuleVO {
+    private String text;
+    private String value;
+}
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 fb86a5d..0071c2f 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
@@ -66,9 +66,13 @@ public class FileBackLogServiceImpl extends ServiceImpl<FileBackupLogMapper, Fil
                 .eq(EdFileInfo::getPermanentDeleted, false)
                 .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code));
         for (EdFileInfo edFileInfo : edFileInfos) {
-            byte[] bytes = backupHandler.downloadFile(edFileInfo.getId());
             String destPath = commonService.getFileSysPath(edFileInfo.getFilePath(), edFileInfo.getDataOwn());
-            FileUtil.writeBytes(bytes, destPath);
+            if (!FileUtil.exist(destPath)) {
+                byte[] bytes = backupHandler.downloadFile(edFileInfo.getId());
+                FileUtil.writeBytes(bytes, destPath);
+                String dbPath = commonService.getDbPath(edFileInfo.getFilePath());
+                UserThreadLocal.setSuccessInfo(edFileInfo.getParentId(), edFileInfo.getId(), "{} 恢复成功，路径为 {}", edFileInfo.getFileName() + "." + edFileInfo.getFileType(), dbPath);
+            }
         }
         UserThreadLocal.setSuccessInfo("", "", "数据库恢复成功");
     }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
index e73eac7..122dba5 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
@@ -17,16 +17,14 @@ import com.electromagnetic.industry.software.manage.pojo.models.User;
 import com.electromagnetic.industry.software.manage.pojo.models.UserAccessLog;
 import com.electromagnetic.industry.software.manage.pojo.req.AccessLogQueryDTO;
 import com.electromagnetic.industry.software.manage.pojo.resp.AccessLogQueryVO;
+import com.electromagnetic.industry.software.manage.pojo.resp.OperationModuleVO;
 import com.electromagnetic.industry.software.manage.pojo.resp.RespPageVO;
 import com.electromagnetic.industry.software.manage.service.UserAccessLogService;
 import com.google.common.collect.Maps;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -79,13 +77,13 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
     @Override
     public ElectromagneticResult<?> operationModule() {
 
-        Map<String, String> map = new HashMap<>();
-
+        List<OperationModuleVO> res = new ArrayList<>();
         for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) {
-            map.put(e.key, e.desc);
+            OperationModuleVO vo = new OperationModuleVO().setText(e.desc).setValue(e.key);
+            res.add(vo);
         }
 
-        return ElectromagneticResultUtil.success(map);
+        return ElectromagneticResultUtil.success(res);
     }
 
     private void setOtherInfo(List<AccessLogQueryVO> res) {