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;