From a4fcfc80059445f9f6760f389adac41ec32ac9e4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 4 Jun 2024 19:05:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/manage/ChartDataManage.java | 2 +- .../dataease/dataset/manage/DatasetGroupManage.java | 4 ++++ .../factory/DeWebSocketHandlerDecorator.java | 12 ++++++++---- .../views/visualized/data/dataset/ExportExcel.vue | 1 - 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index d37ef830d2..974e2a1b0b 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -175,7 +175,7 @@ public class ChartDataManage { FilterTreeObj fieldCustomFilter = view.getCustomFilter(); List drill = new ArrayList<>(view.getDrillFields()); - DatasetGroupInfoDTO table = datasetGroupManage.get(view.getTableId(), null); + DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null); if (table == null) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), Translator.get("i18n_no_ds")); } diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java index 75a63d969e..daecbe6449 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java @@ -371,6 +371,10 @@ public class DatasetGroupManage { return dto; } + public DatasetGroupInfoDTO getDatasetGroupInfoDTO(Long id, String type) throws Exception { + return get(id, type); + } + public DatasetGroupInfoDTO get(Long id, String type) throws Exception { CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(id); if (coreDatasetGroup == null) { diff --git a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java b/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java index bb3f8f4f4d..68526a6256 100644 --- a/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java +++ b/core/core-backend/src/main/java/io/dataease/websocket/factory/DeWebSocketHandlerDecorator.java @@ -20,8 +20,10 @@ public class DeWebSocketHandlerDecorator extends WebSocketHandlerDecorator { public void afterConnectionEstablished(WebSocketSession session) throws Exception { Optional.ofNullable(session.getPrincipal()).ifPresent(principal -> { String name = principal.getName(); - Long userId = Long.parseLong(name); - WsUtil.onLine(userId); + if(name != null){ + Long userId = Long.parseLong(name); + WsUtil.onLine(userId); + } }); super.afterConnectionEstablished(session); } @@ -30,8 +32,10 @@ public class DeWebSocketHandlerDecorator extends WebSocketHandlerDecorator { public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception { Optional.ofNullable(session.getPrincipal()).ifPresent(principal -> { String name = principal.getName(); - Long userId = Long.parseLong(name); - WsUtil.offLine(userId); + if(name != null){ + Long userId = Long.parseLong(name); + WsUtil.offLine(userId); + } }); super.afterConnectionClosed(session, closeStatus); diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue index 97186d51a0..fef42fd26e 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue @@ -190,7 +190,6 @@ const callbackExport = () => { const downLoadAll = () => { if (multipleSelection.value.length === 0) { tableData.value.forEach(item => { - console.log(item.id) downloadFile(item.id) .then(res => { const blob = new Blob([res], { type: 'application/vnd.ms-excel' })