From 491a0d5dd536f3236db022e761de1933880147b0 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 6 Apr 2021 12:32:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(backend):=E5=A2=9E=E5=8A=A0create=5Fby?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartGroupService.java | 4 ++++ .../java/io/dataease/service/chart/ChartViewService.java | 3 +++ .../io/dataease/service/dataset/DataSetGroupService.java | 4 ++++ .../io/dataease/service/dataset/DataSetTableService.java | 6 +++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java b/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java index bdc787d6b2..6db01437be 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java @@ -2,6 +2,7 @@ package io.dataease.service.chart; import io.dataease.base.domain.*; import io.dataease.base.mapper.ChartGroupMapper; +import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; @@ -28,6 +29,7 @@ public class ChartGroupService { checkName(chartGroup); if (StringUtils.isEmpty(chartGroup.getId())) { chartGroup.setId(UUID.randomUUID().toString()); + chartGroup.setCreateBy(AuthUtils.getUser().getUsername()); chartGroup.setCreateTime(System.currentTimeMillis()); chartGroupMapper.insert(chartGroup); } else { @@ -65,6 +67,7 @@ public class ChartGroupService { public List tree(ChartGroupRequest ChartGroup) { ChartGroupExample ChartGroupExample = new ChartGroupExample(); ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria(); + criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername()); if (StringUtils.isNotEmpty(ChartGroup.getName())) { criteria.andNameLike("%" + ChartGroup.getName() + "%"); } @@ -92,6 +95,7 @@ public class ChartGroupService { for (ChartGroupDTO obj : list) { ChartGroupExample ChartGroupExample = new ChartGroupExample(); ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria(); + criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername()); if (StringUtils.isNotEmpty(ChartGroup.getName())) { criteria.andNameLike("%" + ChartGroup.getName() + "%"); } diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 3bfb5bba5a..5ec118fd32 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -4,6 +4,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import io.dataease.base.domain.*; import io.dataease.base.mapper.ChartViewMapper; +import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.chart.ChartViewRequest; import io.dataease.datasource.constants.DatasourceTypes; @@ -48,6 +49,7 @@ public class ChartViewService { int i = chartViewMapper.updateByPrimaryKeySelective(chartView); if (i == 0) { chartView.setId(UUID.randomUUID().toString()); + chartView.setCreateBy(AuthUtils.getUser().getUsername()); chartView.setCreateTime(timestamp); chartView.setUpdateTime(timestamp); chartViewMapper.insert(chartView); @@ -58,6 +60,7 @@ public class ChartViewService { public List list(ChartViewRequest chartViewRequest) { ChartViewExample chartViewExample = new ChartViewExample(); ChartViewExample.Criteria criteria = chartViewExample.createCriteria(); + criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername()); if (StringUtils.isNotEmpty(chartViewRequest.getSceneId())) { criteria.andSceneIdEqualTo(chartViewRequest.getSceneId()); } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java index 7a68bd83ff..45460e2477 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java @@ -4,6 +4,7 @@ import io.dataease.base.domain.DatasetGroup; import io.dataease.base.domain.DatasetGroupExample; import io.dataease.base.domain.DatasetTable; import io.dataease.base.mapper.DatasetGroupMapper; +import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; @@ -33,6 +34,7 @@ public class DataSetGroupService { checkName(datasetGroup); if (StringUtils.isEmpty(datasetGroup.getId())) { datasetGroup.setId(UUID.randomUUID().toString()); + datasetGroup.setCreateBy(AuthUtils.getUser().getUsername()); datasetGroup.setCreateTime(System.currentTimeMillis()); datasetGroupMapper.insert(datasetGroup); } else { @@ -75,6 +77,7 @@ public class DataSetGroupService { public List tree(DataSetGroupRequest datasetGroup) { DatasetGroupExample datasetGroupExample = new DatasetGroupExample(); DatasetGroupExample.Criteria criteria = datasetGroupExample.createCriteria(); + criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername()); if (StringUtils.isNotEmpty(datasetGroup.getName())) { criteria.andNameLike("%" + datasetGroup.getName() + "%"); } @@ -102,6 +105,7 @@ public class DataSetGroupService { for (DataSetGroupDTO obj : list) { DatasetGroupExample datasetGroupExample = new DatasetGroupExample(); DatasetGroupExample.Criteria criteria = datasetGroupExample.createCriteria(); + criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername()); if (StringUtils.isNotEmpty(datasetGroup.getName())) { criteria.andNameLike("%" + datasetGroup.getName() + "%"); } 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 ec133babe6..83bce948d1 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -6,6 +6,7 @@ import io.dataease.base.domain.*; import io.dataease.base.mapper.DatasetTableIncrementalConfigMapper; import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasourceMapper; +import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.datasource.constants.DatasourceTypes; @@ -51,6 +52,7 @@ public class DataSetTableService { checkName(datasetTable); if (StringUtils.isEmpty(datasetTable.getId())) { datasetTable.setId(UUID.randomUUID().toString()); + datasetTable.setCreateBy(AuthUtils.getUser().getUsername()); datasetTable.setCreateTime(System.currentTimeMillis()); DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO(); if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) { @@ -77,8 +79,10 @@ public class DataSetTableService { public List list(DataSetTableRequest dataSetTableRequest) { DatasetTableExample datasetTableExample = new DatasetTableExample(); + DatasetTableExample.Criteria criteria = datasetTableExample.createCriteria(); + criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername()); if (StringUtils.isNotEmpty(dataSetTableRequest.getSceneId())) { - datasetTableExample.createCriteria().andSceneIdEqualTo(dataSetTableRequest.getSceneId()); + criteria.andSceneIdEqualTo(dataSetTableRequest.getSceneId()); } if (StringUtils.isNotEmpty(dataSetTableRequest.getSort())) { datasetTableExample.setOrderByClause(dataSetTableRequest.getSort());