diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 99b55ae644..e637663948 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -308,7 +308,7 @@ public class ChartDataServer implements ChartDataApi { DEException.throwException(e); } } else { - exportCenterManage.addTask(request.getViewId(), "chart", request); + exportCenterManage.addTask(request.getViewId(), "chart", request, request.getBusiFlag()); } } 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 986eb7a9f0..dbb3f7d44f 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 @@ -169,7 +169,7 @@ public class ExportCenterDownLoadManage { } } - @DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.DRIVER_FILE) + @DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.DATA_FILLING) public void startDataFillingTask(CoreExportTask exportTask, HashMap request) { if (ObjectUtils.isEmpty(getDataFillingApi())) { return; @@ -412,7 +412,17 @@ public class ExportCenterDownLoadManage { Running_Task.put(exportTask.getId(), future); } - @DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.VIEW) + @DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.PANEL) + public void startPanelViewTask(CoreExportTask exportTask, ChartExcelRequest request) { + startViewTask(exportTask, request); + } + + @DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.SCREEN) + public void startDataVViewTask(CoreExportTask exportTask, ChartExcelRequest request) { + startViewTask(exportTask, request); + } + + public void startViewTask(CoreExportTask exportTask, ChartExcelRequest request) { String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); 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 6f5213f2fa..eeba29375d 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 @@ -246,7 +246,7 @@ public class ExportCenterManage implements BaseExportApi { return hostname; } - public void addTask(String exportFrom, String exportFromType, ChartExcelRequest request) { + public void addTask(String exportFrom, String exportFromType, ChartExcelRequest request, String busiFlag) { CoreExportTask exportTask = new CoreExportTask(); exportTask.setId(IDUtils.snowID().toString()); exportTask.setUserId(AuthUtils.getUser().getUserId()); @@ -259,7 +259,12 @@ public class ExportCenterManage implements BaseExportApi { exportTask.setParams(JsonUtil.toJSONString(request).toString()); exportTask.setExportMachineName(hostName()); exportTaskMapper.insert(exportTask); - exportCenterDownLoadManage.startViewTask(exportTask, request); + if(busiFlag.equalsIgnoreCase("dashboard")){ + exportCenterDownLoadManage.startPanelViewTask(exportTask, request); + }else { + exportCenterDownLoadManage.startDataVViewTask(exportTask, request); + } + } public void addTask(Long exportFrom, String exportFromType, DataSetExportRequest request) throws Exception { @@ -338,6 +343,7 @@ public class ExportCenterManage implements BaseExportApi { downLoadInfos.add(downLoadInfo); } } + private List downLoadInfos = new ArrayList<>(); @Scheduled(fixedRate = 10 * 1000) diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java index 1022dff379..c812375a56 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java @@ -76,8 +76,8 @@ public interface InteractiveAuthApi { @PostMapping("/queryAuth/{id}") PermissionValVO queryAuth(@PathVariable("id") Long id); - @GetMapping("/query2Root/{id}/{flag}") - List query2Root(@PathVariable("id") Long id, @PathVariable("flag") Integer flag); + @GetMapping("/query2Root/{id}/{flag}/{logOT}") + List query2Root(@PathVariable("id") Long id, @PathVariable("flag") Integer flag, Integer logOT); @GetMapping("/checkEmpty") boolean checkEmpty();