From ead9940bf28def7cf16010498d5ef22dfbda002c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Sep 2022 15:08:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E6=98=BE=E7=A4=BA=E5=88=AB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java | 2 ++ backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml | 2 ++ frontend/src/api/panel/panel.js | 1 + frontend/src/views/panel/list/common/PanelDetailInfo.vue | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java index 9a19f1516e..00b570a236 100644 --- a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java +++ b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java @@ -17,6 +17,8 @@ import java.util.Map; public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase { @ApiModelProperty("创建用户名") private String creatorName; + @ApiModelProperty("更新用户名") + private String updateName; @ApiModelProperty("标签") private String label; @ApiModelProperty("是否叶子节点") diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml index 3709b06ff3..d9249ab5d9 100644 --- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml @@ -10,6 +10,7 @@ + @@ -17,6 +18,7 @@ select panel_group.*, panel_group.name as label, (select nick_name from sys_user where username = panel_group.create_by) as creator_name, + (select nick_name from sys_user where username = panel_group.update_by) as update_name, get_auths(panel_group.id, 'panel', #{userId}) as `privileges` from panel_group where id = #{panelId} diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js index a904ecbd47..e7da3e0ff7 100644 --- a/frontend/src/api/panel/panel.js +++ b/frontend/src/api/panel/panel.js @@ -170,6 +170,7 @@ export function initPanelData(panelId, useCache = false, callback) { createTime: response.data.createTime, creatorName: response.data.creatorName, updateBy: response.data.updateBy, + updateName: response.data.updateName, updateTime: response.data.updateTime }) // 刷新联动信息 diff --git a/frontend/src/views/panel/list/common/PanelDetailInfo.vue b/frontend/src/views/panel/list/common/PanelDetailInfo.vue index 23270aa9dd..437c62a750 100644 --- a/frontend/src/views/panel/list/common/PanelDetailInfo.vue +++ b/frontend/src/views/panel/list/common/PanelDetailInfo.vue @@ -10,7 +10,7 @@

{{ $t('panel.update_by') }}

-

{{ panelInfo.updateBy || 'N/A' }}

+

{{ panelInfo.updateName || 'N/A' }}

{{ $t('panel.update_time') }}

From 6b885857ad50045c6c6deb0c211c92e15717ab69 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 29 Sep 2022 17:33:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=88=AB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/response/DataSetDetail.java | 3 +- .../dataease/dto/dataset/DataSetTableDTO.java | 2 + .../dataease/ext/ExtDataSetTableMapper.java | 2 +- .../io/dataease/ext/ExtDataSetTableMapper.xml | 73 ++++++++++--------- .../service/dataset/DataSetTableService.java | 2 +- .../views/dataset/common/DatasetDetail.vue | 2 +- frontend/src/views/dataset/data/ViewTable.vue | 2 +- 7 files changed, 46 insertions(+), 40 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java b/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java index 18edf1b8c2..5a6b6b3376 100644 --- a/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java +++ b/backend/src/main/java/io/dataease/controller/response/DataSetDetail.java @@ -1,5 +1,6 @@ package io.dataease.controller.response; +import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.plugins.common.base.domain.DatasetTable; import io.dataease.plugins.common.base.domain.Datasource; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +9,7 @@ import lombok.Data; @Data public class DataSetDetail { @ApiModelProperty("数据集") - private DatasetTable table; + private DataSetTableDTO table; @ApiModelProperty("数据源") private Datasource datasource; } diff --git a/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java b/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java index 448ec79b23..34bff56c86 100644 --- a/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java +++ b/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java @@ -22,4 +22,6 @@ public class DataSetTableDTO extends DatasetTable { private Boolean isLeaf; @ApiModelProperty("父ID") private String pid; + @ApiModelProperty("创建者姓名") + private String creatorName; } diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.java b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.java index 996038710b..a28e4145f3 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.java +++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.java @@ -11,7 +11,7 @@ public interface ExtDataSetTableMapper { List search(DataSetTableRequest request); DataSetTableDTO searchOne(DataSetTableRequest request); - + DataSetTableDTO findOneDetails(@Param("datasetTableId") String datasetTableId); List searchDataSetTableWithPanelId(@Param("panelId") String panelId, @Param("userId") String userId); List findByPanelId(@Param("panelId") String panelId); diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml index 657c805fdc..a2e4df7896 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml @@ -6,6 +6,7 @@ extends="io.dataease.plugins.common.base.mapper.DatasetTableMapper.BaseResultMap"> + @@ -14,9 +15,25 @@ + + - select - id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time, - get_auths(id,'dataset',#{userId}) as `privileges` + select id, + `name`, + scene_id, + data_source_id, + `type`, + `mode`, + `info`, + create_by, + create_time, + get_auths(id, 'dataset', #{userId}) as `privileges` from dataset_table - where id in ( - SELECT - table_id - FROM - chart_view - WHERE - id IN ( - SELECT - chart_view_id - FROM - panel_view - WHERE - panel_id = #{panelId} - ) - ) + where id in (SELECT table_id + FROM chart_view + WHERE id IN (SELECT chart_view_id + FROM panel_view + WHERE panel_id = #{panelId})) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 1486fc545f..1ae29a4c2b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2190,7 +2190,7 @@ public class DataSetTableService { public DataSetDetail getDatasetDetail(String id) { DataSetDetail dataSetDetail = new DataSetDetail(); - DatasetTable table = datasetTableMapper.selectByPrimaryKey(id); + DataSetTableDTO table = extDataSetTableMapper.findOneDetails(id); dataSetDetail.setTable(table); if (ObjectUtils.isNotEmpty(table)) { Datasource datasource = datasourceMapper.selectByPrimaryKey(table.getDataSourceId()); diff --git a/frontend/src/views/dataset/common/DatasetDetail.vue b/frontend/src/views/dataset/common/DatasetDetail.vue index 877ac8d7d8..3f44d8bf66 100644 --- a/frontend/src/views/dataset/common/DatasetDetail.vue +++ b/frontend/src/views/dataset/common/DatasetDetail.vue @@ -77,7 +77,7 @@

{{ $t('dataset.create_by') }}

-

{{ detail.table.createBy }}

+

{{ detail.table.creatorName || 'N/A' }}

{{ $t('dataset.create_time') }}

diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 9cd0e1b7b6..611e9116e6 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -22,7 +22,7 @@ {{ $t('dataset.create_by') }} - :{{ table.createBy }} + :{{ table.creatorName || 'N/A' }}