From 12b9190cccd18a739a3779d128bc4d76f682159c Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 7 May 2026 17:09:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=85=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FishDraftDataController.java   |  2 +-
 .../data/controller/ImportTaskController.java |  2 +-
 .../data/service/IImportTaskService.java      |  2 +-
 .../service/impl/ImportTaskServiceImpl.java   | 26 ++++++++++++-------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java
index 21b7e4b..3f103ac 100644
--- a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java
+++ b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java
@@ -393,7 +393,7 @@ public class FishDraftDataController {
             if ("1".equals(result.getCode())) {
                 status = "FAILED";
             }
-            importTaskService.updateStatus(taskId, status, null);
+            importTaskService.updateStatus(taskId, status, result.getTempDir(), null);
             importTaskService.updateProgress(taskId, result.getTotalCount(), result.getSuccessCount(), result.getFailedCount());
 
             try {
diff --git a/backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java b/backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java
index 176f640..3682d35 100644
--- a/backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java
+++ b/backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java
@@ -101,7 +101,7 @@ public class ImportTaskController {
     public ResponseResult updateStatus(@RequestParam String id,
                                        @RequestParam String status,
                                        @RequestParam(required = false) String errorMsg) {
-        boolean result = importTaskService.updateStatus(id, status, errorMsg);
+        boolean result = importTaskService.updateStatus(id, status,null, errorMsg);
         return result ? ResponseResult.success("更新成功") : ResponseResult.error("更新失败");
     }
 
diff --git a/backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java b/backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java
index 901bf65..9726983 100644
--- a/backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java
+++ b/backend/src/main/java/com/yfd/platform/data/service/IImportTaskService.java
@@ -41,7 +41,7 @@ public interface IImportTaskService extends IService<ImportTask> {
     /**
      * 更新任务状态
      */
-    boolean updateStatus(String id, String status, String errorMsg);
+    boolean updateStatus(String id, String status,String tempDir, String errorMsg);
 
     /**
      * 更新解析进度
diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java
index 46028ef..56b84d7 100644
--- a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java
@@ -83,12 +83,13 @@ public class ImportTaskServiceImpl extends ServiceImpl<ImportTaskMapper, ImportT
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateStatus(String id, String status, String errorMsg) {
+    public boolean updateStatus(String id, String status,String tempDir, String errorMsg) {
         ImportTask importTask = this.getById(id);
         if (importTask == null) {
             return false;
         }
         importTask.setStatus(status);
+        importTask.setTempDir(tempDir);
         if (StringUtils.hasText(errorMsg)) {
             importTask.setErrorMsg(errorMsg);
         }
@@ -184,15 +185,20 @@ public class ImportTaskServiceImpl extends ServiceImpl<ImportTaskMapper, ImportT
         if ("CONFIRMED".equals(currentStatus) || "FAILED".equals(currentStatus) || "CANCELLED".equals(currentStatus)) {
             return false;
         }
-        if (importTask.getResultJson() != null && !importTask.getResultJson().isEmpty()) {
-            try {
-                FishImportResult importResult = objectMapper.readValue(importTask.getResultJson(), FishImportResult.class);
-                String tempDir = importResult.getTempDir();
-                // del 方法会递归删除目录及其所有内容
-                FileUtil.del(tempDir);
-            } catch (Exception e) {
-                e.printStackTrace();
-                // ignore parse error
+        String temp = importTask.getTempDir();
+        if (StrUtil.isNotBlank( temp)) {
+            FileUtil.del(temp);
+        }else{
+            if (importTask.getResultJson() != null && !importTask.getResultJson().isEmpty()) {
+                try {
+                    FishImportResult importResult = objectMapper.readValue(importTask.getResultJson(), FishImportResult.class);
+                    String tempDir = importResult.getTempDir();
+                    // del 方法会递归删除目录及其所有内容
+                    FileUtil.del(tempDir);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    // ignore parse error
+                }
             }
         }
         importTask.setStatus("CANCELLED");