From cf92b5055ec0c7c93af222940a6d6b392153b7a5 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 18 Aug 2022 13:07:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/panel/PanelGroupController.java | 9 ++++++++- .../request/panel/PanelViewDetailsRequest.java | 2 ++ .../service/panel/PanelGroupService.java | 6 ++++++ .../io/dataease/service/sys/log/LogService.java | 17 +++++++++++++---- .../resources/i18n/messages_en_US.properties | 1 + .../resources/i18n/messages_zh_CN.properties | 1 + .../resources/i18n/messages_zh_TW.properties | 1 + 7 files changed, 32 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java index 5c45b68005..fd2c029ae3 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java @@ -131,13 +131,20 @@ public class PanelGroupController { return panelGroupService.queryPanelComponents(id); } - @ApiOperation("导出仪表板视图明细") + @ApiOperation("公共连接导出仪表板视图明细") @PostMapping("/exportDetails") @I18n public void exportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException { panelGroupService.exportPanelViewDetails(request, response); } + @ApiOperation("站内导出仪表板视图明细") + @PostMapping("/innerExportDetails") + @I18n + public void innerExportDetails(@RequestBody PanelViewDetailsRequest request, HttpServletResponse response) throws IOException { + panelGroupService.exportPanelViewDetails(request, response); + } + @ApiOperation("更新仪表板状态") @PostMapping("/updatePanelStatus/{panelId}") @I18n diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java index 841ff36e8b..2523167f11 100644 --- a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java @@ -12,6 +12,8 @@ import java.util.List; @Data public class PanelViewDetailsRequest { + private String viewId; + private String viewName; private String[] header; diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index c80ab5631d..721354df67 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -620,6 +620,12 @@ public class PanelGroupService { } catch (Exception e) { DataEaseException.throwException(e); } + if (ObjectUtils.isNotEmpty(AuthUtils.getUser())) { + String viewId = request.getViewId(); + ChartViewWithBLOBs chartViewWithBLOBs = chartViewService.get(viewId); + String pid = chartViewWithBLOBs.getSceneId(); + DeLogUtils.save(SysLogConstants.OPERATE_TYPE.EXPORT, SysLogConstants.SOURCE_TYPE.VIEW, viewId,pid, null, null); + } } public void updatePanelStatus(String panelId, PanelGroupBaseInfoRequest request) { diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java index 1e43cf2ecc..3838bb7b47 100644 --- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java +++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java @@ -181,13 +181,18 @@ public class LogService { List folderItems = viewPanelTypes(); results.addAll(folderItems); + results.addAll(viewRelativeTypes()); return results; } - private List viewPanelTypes () { + private List viewRelativeTypes() { + Integer[] opTypes = new Integer[]{15}; + Integer[] sourceTypes = new Integer[]{4}; + return typesByArr(opTypes, sourceTypes); + } + + private List typesByArr(Integer[] opTypes, Integer[] sourceTypes) { List results = new ArrayList<>(); - Integer[] opTypes = new Integer[]{13, 14}; - Integer[] sourceTypes = new Integer[]{3}; for (int i = 0; i < sourceTypes.length; i++) { Integer sourceVal = sourceTypes[i]; String sourceTypeName = SysLogConstants.sourceTypeName(sourceVal); @@ -204,7 +209,11 @@ public class LogService { } } return results; - + } + private List viewPanelTypes () { + Integer[] opTypes = new Integer[]{13, 14}; + Integer[] sourceTypes = new Integer[]{3}; + return typesByArr(opTypes, sourceTypes); } public SysLogGridDTO convertDTO(SysLogWithBLOBs vo) { diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 3e93c86f78..2f5afb2967 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -145,6 +145,7 @@ OPERATE_TYPE_UPLOADFILE=Upload OPERATE_TYPE_LOGIN=Login OPERATE_TYPE_PC_VIEW=View with pc OPERATE_TYPE_MB_VIEW=View with mobile device +OPERATE_TYPE_EXPORT=Export SOURCE_TYPE_DATASOURCE=DATASOURCE SOURCE_TYPE_DATASET=DATASET diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 7ee0f4df52..00a0f7d2fd 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -143,6 +143,7 @@ OPERATE_TYPE_UPLOADFILE=\u4E0A\u4F20 OPERATE_TYPE_LOGIN=\u767B\u5F55 OPERATE_TYPE_PC_VIEW=\u4F7F\u7528PC\u67E5\u770B OPERATE_TYPE_MB_VIEW=\u4F7F\u7528\u79FB\u52A8\u7AEF\u67E5\u770B +OPERATE_TYPE_EXPORT=\u5BFC\u51FA SOURCE_TYPE_DATASOURCE=\u6570\u636E\u6E90 SOURCE_TYPE_DATASET=\u6570\u636E\u96C6 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index b5ecee389f..41b412d5e8 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -144,6 +144,7 @@ OPERATE_TYPE_UPLOADFILE=\u4E0A\u50B3 OPERATE_TYPE_LOGIN=\u767B\u9304 OPERATE_TYPE_PC_VIEW=\u4F7F\u7528PC\u67E5\u770B OPERATE_TYPE_MB_VIEW=\u4F7F\u7528\u79FB\u52D5\u7AEF\u67E5\u770B +OPERATE_TYPE_EXPORT=\u5C0E\u51FA SOURCE_TYPE_DATASOURCE=\u6578\u64DA\u6E90 SOURCE_TYPE_DATASET=\u6578\u64DA\u96C6