From 532cdf67b4c8792b81cc4393893a0042e32b6bbf Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 2 Aug 2021 21:18:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=A7=E8=A1=8C=E9=97=AE=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=90=8E=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java   | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 4270576ee7..d49469e0e7 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -184,15 +184,15 @@ public class ExtractDataService {
                     replaceTable(DorisTableUtils.dorisName(datasetTableId));
                     saveSucessLog(datasetTableTaskLog);
 //                    sendWebMsg(datasetTable, null, true);
-                    deleteFile("all_scope", datasetTableId);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
                 } catch (Exception e) {
                     saveErrorLog(datasetTableId, null, e);
 //                    sendWebMsg(datasetTable, null, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
                     dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
-                    deleteFile("all_scope", datasetTableId);
                 } finally {
+                    deleteFile("all_scope", datasetTableId);
+                    deleteFile(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getData());
                 }
                 break;
 
@@ -210,9 +210,9 @@ public class ExtractDataService {
                     saveErrorLog(datasetTableId, null, e);
 //                    sendWebMsg(datasetTable, null, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
+                } finally {
                     deleteFile("incremental_add", datasetTableId);
                     deleteFile("incremental_delete", datasetTableId);
-                } finally {
                 }
                 break;
         }
@@ -930,38 +930,36 @@ public class ExtractDataService {
             case "all_scope":
                 transName = "trans_" + DorisTableUtils.dorisName(dataSetTableId);
                 jobName = "job_" + DorisTableUtils.dorisName(dataSetTableId);
-                fileName = DorisTableUtils.dorisTmpName(dataSetTableId);
+                fileName = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(dataSetTableId));
                 break;
             case "incremental_add":
                 transName = "trans_add_" + DorisTableUtils.dorisName(dataSetTableId);
                 jobName = "job_add_" + DorisTableUtils.dorisName(dataSetTableId);
-                fileName = DorisTableUtils.dorisAddName(dataSetTableId);
+                fileName = DorisTableUtils.dorisAddName(DorisTableUtils.dorisName(dataSetTableId));
                 break;
             case "incremental_delete":
                 transName = "trans_delete_" + DorisTableUtils.dorisName(dataSetTableId);
                 jobName = "job_delete_" + DorisTableUtils.dorisName(dataSetTableId);
-                fileName = DorisTableUtils.dorisDeleteName(dataSetTableId);
+                fileName = DorisTableUtils.dorisDeleteName(DorisTableUtils.dorisName(dataSetTableId));
                 break;
             default:
                 break;
         }
-        try {
-            File file = new File(root_path + fileName + "." + extention);
-            FileUtils.forceDelete(file);
-        } catch (Exception e) {
+        deleteFile(root_path + fileName + "." + extention);
+        deleteFile(root_path + jobName + ".kjb");
+        deleteFile(root_path + transName + ".ktr");
+    }
+
+    private void deleteFile(String filePath){
+        if(StringUtils.isEmpty(filePath)){
+            return;
         }
         try {
-            File file = new File(root_path + jobName + ".kjb");
-            FileUtils.forceDelete(file);
-        } catch (Exception e) {
-        }
-        try {
-            File file = new File(root_path + transName + ".ktr");
+            File file = new File(filePath);
             FileUtils.forceDelete(file);
         } catch (Exception e) {
         }
     }
-
     public boolean isKettleRunning() {
         try {
             if (!InetAddress.getByName(carte).isReachable(1000)) {