From 1aae819f4ea21a103a75e77a289c4518696c2650 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 16 Apr 2025 16:07:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=87=E4=BB=BD=E7=9A=84bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/serviceimpl/FileRecycleServiceImpl.java | 2 +- .../industry/software/manage/tasks/BackupHandler.java | 2 +- .../industry/software/manage/tasks/BackupTask.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 5d75584..fce2e4b 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 @@ -136,7 +136,7 @@ public class FileRecycleServiceImpl implements FileRecycleService { .eq(EdFileInfo::getFileId, fileId)); for (EdFileInfo edFileInfo : edFileInfos) { String fileSysPath = commonService.getFileSysPath(edFileInfo.getId()); - backupHandler.backupFiles(fileSysPath, edFileInfo.getParentId()); + backupHandler.backupFiles(fileSysPath); String fileDbPath = commonService.getDbPath(edFileInfo.getFilePath()); // 移动到tmp目录，七天后删除 fileSystemService.moveFile(fileSysPath, elePropertyConfig.getEleTmpPath() + File.separator + new File(fileSysPath).getName()); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java index 4e6878e..20ef993 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupHandler.java @@ -21,7 +21,7 @@ public class BackupHandler { @Resource private ElePropertyConfig elePropertyConfig; - public BackupFileResLog backupFiles(String filePath, String id) { + public BackupFileResLog backupFiles(String filePath) { Map map = new HashMap<>(); map.put("file", new File(filePath)); String url = StrFormatter.format("http://{}:{}/data/file/backup/upload", elePropertyConfig.getRemoteHost(), elePropertyConfig.getRemotePort()); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java index 361f865..961ec1a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java @@ -68,7 +68,7 @@ public class BackupTask { .eq(EdFileInfo::getId, id)); String sysFilePath = commonService.getFileSysPath(fileInfo.getId()); long startTime = System.currentTimeMillis(); - BackupFileResLog resLog = backupHandler.backupFiles(sysFilePath, id); + BackupFileResLog resLog = backupHandler.backupFiles(sysFilePath); long endTime = System.currentTimeMillis(); fileBackupLogMapper.update(null, Wrappers.lambdaUpdate() .eq(FileBackupLog::getFileId, id) @@ -100,7 +100,7 @@ public class BackupTask { String fileSysPath = commonService.getFileSysPath(edFileInfo.getId()); UserThreadLocal.remove(); long startTime = System.currentTimeMillis(); - BackupFileResLog resLog = backupHandler.backupFiles(fileSysPath, edFileInfo.getId()); + BackupFileResLog resLog = backupHandler.backupFiles(fileSysPath); long endTime = System.currentTimeMillis(); FileBackupLog backupLog = new FileBackupLog() .setId(IdWorker.getSnowFlakeIdString())