From caf2b2cf4e9b3c12c61713c425b92d11b6abc1b3 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Jun 2025 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E3=80=91=E6=98=8E=E7=BB=86=E8=A1=A8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AF=BC=E5=87=BAexcel=E6=88=96=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E6=98=8E=E7=BB=86-=E5=AF=BC=E5=87=BA=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=8F=90=E7=A4=BA=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exportCenter/manage/ExportCenterDownLoadManage.java     | 6 ++----
 .../io/dataease/exportCenter/manage/ExportCenterManage.java | 1 -
 .../visualization/server/DataVisualizationServer.java       | 4 ++--
 core/core-frontend/src/websocket/index.ts                   | 5 +++--
 .../src/main/java/io/dataease/model/ExportTaskDTO.java      | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java
index 7b213cd00d..bfa84a9f2d 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java
@@ -150,9 +150,7 @@ public class ExportCenterDownLoadManage {
                     setExportFromName(exportTaskDTO);
                     WsMessage message = new WsMessage(exportTask.getUserId(), "/task-export-topic", exportTaskDTO);
                     wsService.releaseMessage(message);
-                } catch (Exception e) {
-
-                }
+                } catch (Exception e) {}
             }
         }
     }
@@ -165,7 +163,7 @@ public class ExportCenterDownLoadManage {
             exportTaskDTO.setExportFromName(coreDatasetGroupMapper.selectById(exportTaskDTO.getExportFrom()).getName());
         }
         if (exportTaskDTO.getExportFromType().equalsIgnoreCase("data_filling")) {
-            exportTaskDTO.setExportFromName(getDataFillingApi().get(Long.parseLong(exportTaskDTO.getExportFrom())).getName());
+            exportTaskDTO.setExportFromName(getDataFillingApi().get(exportTaskDTO.getExportFrom()).getName());
         }
     }
 
diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index eeba29375d..78e3ed287b 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -24,7 +24,6 @@ import io.dataease.visualization.dao.auto.entity.VisualizationWatermark;
 import io.dataease.visualization.dao.auto.mapper.VisualizationWatermarkMapper;
 import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper;
 import io.dataease.visualization.server.DataVisualizationServer;
-import io.dataease.websocket.WsMessage;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.Data;
diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
index cfa777ba65..89bb04da87 100644
--- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
@@ -976,8 +976,8 @@ public class DataVisualizationServer implements DataVisualizationApi {
         }
     }
 
-    public String getAbsPath(String id) {
-        ChartViewDTO viewDTO = chartViewManege.findChartViewAround(id);
+    public String getAbsPath(Long id) {
+        ChartViewDTO viewDTO = chartViewManege.findChartViewAround(String.valueOf(id));
         if (viewDTO == null) {
             return null;
         }
diff --git a/core/core-frontend/src/websocket/index.ts b/core/core-frontend/src/websocket/index.ts
index 1818024793..63ac379a0f 100644
--- a/core/core-frontend/src/websocket/index.ts
+++ b/core/core-frontend/src/websocket/index.ts
@@ -4,7 +4,6 @@ import { useCache } from '@/hooks/web/useCache'
 import { useEmitt } from '@/hooks/web/useEmitt'
 const { wsCache } = useCache()
 let stompClient: Stomp.Client
-let timeInterval
 import dev from '../../config/dev'
 const env = import.meta.env
 const basePath = env.VITE_API_BASEPATH
@@ -64,6 +63,7 @@ export default {
           })
         },
         error => {
+          disconnect()
           console.error('连接失败: ' + error)
         }
       )
@@ -80,11 +80,12 @@ export default {
           }
         )
       }
+      stompClient = null
     }
 
     function initialize() {
       connection()
-      timeInterval = setInterval(() => {
+      const timeInterval = setInterval(() => {
         if (!isLoginStatus()) {
           disconnect()
           return
diff --git a/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java b/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java
index f8cc1124f9..e7cb1c9035 100644
--- a/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java
+++ b/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java
@@ -17,7 +17,7 @@ public class ExportTaskDTO  {
 
     private String fileSizeUnit;
 
-    private String exportFrom;
+    private Long exportFrom;
 
     private String exportStatus;