提交 491a0d5d authored 作者: junjie's avatar junjie

feat(backend):增加create_by字段

上级 93ce2bbe
...@@ -2,6 +2,7 @@ package io.dataease.service.chart; ...@@ -2,6 +2,7 @@ package io.dataease.service.chart;
import io.dataease.base.domain.*; import io.dataease.base.domain.*;
import io.dataease.base.mapper.ChartGroupMapper; import io.dataease.base.mapper.ChartGroupMapper;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.BeanUtils;
import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.controller.request.chart.ChartGroupRequest;
import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTableRequest;
...@@ -28,6 +29,7 @@ public class ChartGroupService { ...@@ -28,6 +29,7 @@ public class ChartGroupService {
checkName(chartGroup); checkName(chartGroup);
if (StringUtils.isEmpty(chartGroup.getId())) { if (StringUtils.isEmpty(chartGroup.getId())) {
chartGroup.setId(UUID.randomUUID().toString()); chartGroup.setId(UUID.randomUUID().toString());
chartGroup.setCreateBy(AuthUtils.getUser().getUsername());
chartGroup.setCreateTime(System.currentTimeMillis()); chartGroup.setCreateTime(System.currentTimeMillis());
chartGroupMapper.insert(chartGroup); chartGroupMapper.insert(chartGroup);
} else { } else {
...@@ -65,6 +67,7 @@ public class ChartGroupService { ...@@ -65,6 +67,7 @@ public class ChartGroupService {
public List<ChartGroupDTO> tree(ChartGroupRequest ChartGroup) { public List<ChartGroupDTO> tree(ChartGroupRequest ChartGroup) {
ChartGroupExample ChartGroupExample = new ChartGroupExample(); ChartGroupExample ChartGroupExample = new ChartGroupExample();
ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria(); ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria();
criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername());
if (StringUtils.isNotEmpty(ChartGroup.getName())) { if (StringUtils.isNotEmpty(ChartGroup.getName())) {
criteria.andNameLike("%" + ChartGroup.getName() + "%"); criteria.andNameLike("%" + ChartGroup.getName() + "%");
} }
...@@ -92,6 +95,7 @@ public class ChartGroupService { ...@@ -92,6 +95,7 @@ public class ChartGroupService {
for (ChartGroupDTO obj : list) { for (ChartGroupDTO obj : list) {
ChartGroupExample ChartGroupExample = new ChartGroupExample(); ChartGroupExample ChartGroupExample = new ChartGroupExample();
ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria(); ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria();
criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername());
if (StringUtils.isNotEmpty(ChartGroup.getName())) { if (StringUtils.isNotEmpty(ChartGroup.getName())) {
criteria.andNameLike("%" + ChartGroup.getName() + "%"); criteria.andNameLike("%" + ChartGroup.getName() + "%");
} }
......
...@@ -4,6 +4,7 @@ import com.google.gson.Gson; ...@@ -4,6 +4,7 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import io.dataease.base.domain.*; import io.dataease.base.domain.*;
import io.dataease.base.mapper.ChartViewMapper; import io.dataease.base.mapper.ChartViewMapper;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.BeanUtils;
import io.dataease.controller.request.chart.ChartViewRequest; import io.dataease.controller.request.chart.ChartViewRequest;
import io.dataease.datasource.constants.DatasourceTypes; import io.dataease.datasource.constants.DatasourceTypes;
...@@ -48,6 +49,7 @@ public class ChartViewService { ...@@ -48,6 +49,7 @@ public class ChartViewService {
int i = chartViewMapper.updateByPrimaryKeySelective(chartView); int i = chartViewMapper.updateByPrimaryKeySelective(chartView);
if (i == 0) { if (i == 0) {
chartView.setId(UUID.randomUUID().toString()); chartView.setId(UUID.randomUUID().toString());
chartView.setCreateBy(AuthUtils.getUser().getUsername());
chartView.setCreateTime(timestamp); chartView.setCreateTime(timestamp);
chartView.setUpdateTime(timestamp); chartView.setUpdateTime(timestamp);
chartViewMapper.insert(chartView); chartViewMapper.insert(chartView);
...@@ -58,6 +60,7 @@ public class ChartViewService { ...@@ -58,6 +60,7 @@ public class ChartViewService {
public List<ChartViewWithBLOBs> list(ChartViewRequest chartViewRequest) { public List<ChartViewWithBLOBs> list(ChartViewRequest chartViewRequest) {
ChartViewExample chartViewExample = new ChartViewExample(); ChartViewExample chartViewExample = new ChartViewExample();
ChartViewExample.Criteria criteria = chartViewExample.createCriteria(); ChartViewExample.Criteria criteria = chartViewExample.createCriteria();
criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername());
if (StringUtils.isNotEmpty(chartViewRequest.getSceneId())) { if (StringUtils.isNotEmpty(chartViewRequest.getSceneId())) {
criteria.andSceneIdEqualTo(chartViewRequest.getSceneId()); criteria.andSceneIdEqualTo(chartViewRequest.getSceneId());
} }
......
...@@ -4,6 +4,7 @@ import io.dataease.base.domain.DatasetGroup; ...@@ -4,6 +4,7 @@ import io.dataease.base.domain.DatasetGroup;
import io.dataease.base.domain.DatasetGroupExample; import io.dataease.base.domain.DatasetGroupExample;
import io.dataease.base.domain.DatasetTable; import io.dataease.base.domain.DatasetTable;
import io.dataease.base.mapper.DatasetGroupMapper; import io.dataease.base.mapper.DatasetGroupMapper;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.BeanUtils;
import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetGroupRequest;
import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTableRequest;
...@@ -33,6 +34,7 @@ public class DataSetGroupService { ...@@ -33,6 +34,7 @@ public class DataSetGroupService {
checkName(datasetGroup); checkName(datasetGroup);
if (StringUtils.isEmpty(datasetGroup.getId())) { if (StringUtils.isEmpty(datasetGroup.getId())) {
datasetGroup.setId(UUID.randomUUID().toString()); datasetGroup.setId(UUID.randomUUID().toString());
datasetGroup.setCreateBy(AuthUtils.getUser().getUsername());
datasetGroup.setCreateTime(System.currentTimeMillis()); datasetGroup.setCreateTime(System.currentTimeMillis());
datasetGroupMapper.insert(datasetGroup); datasetGroupMapper.insert(datasetGroup);
} else { } else {
...@@ -75,6 +77,7 @@ public class DataSetGroupService { ...@@ -75,6 +77,7 @@ public class DataSetGroupService {
public List<DataSetGroupDTO> tree(DataSetGroupRequest datasetGroup) { public List<DataSetGroupDTO> tree(DataSetGroupRequest datasetGroup) {
DatasetGroupExample datasetGroupExample = new DatasetGroupExample(); DatasetGroupExample datasetGroupExample = new DatasetGroupExample();
DatasetGroupExample.Criteria criteria = datasetGroupExample.createCriteria(); DatasetGroupExample.Criteria criteria = datasetGroupExample.createCriteria();
criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername());
if (StringUtils.isNotEmpty(datasetGroup.getName())) { if (StringUtils.isNotEmpty(datasetGroup.getName())) {
criteria.andNameLike("%" + datasetGroup.getName() + "%"); criteria.andNameLike("%" + datasetGroup.getName() + "%");
} }
...@@ -102,6 +105,7 @@ public class DataSetGroupService { ...@@ -102,6 +105,7 @@ public class DataSetGroupService {
for (DataSetGroupDTO obj : list) { for (DataSetGroupDTO obj : list) {
DatasetGroupExample datasetGroupExample = new DatasetGroupExample(); DatasetGroupExample datasetGroupExample = new DatasetGroupExample();
DatasetGroupExample.Criteria criteria = datasetGroupExample.createCriteria(); DatasetGroupExample.Criteria criteria = datasetGroupExample.createCriteria();
criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername());
if (StringUtils.isNotEmpty(datasetGroup.getName())) { if (StringUtils.isNotEmpty(datasetGroup.getName())) {
criteria.andNameLike("%" + datasetGroup.getName() + "%"); criteria.andNameLike("%" + datasetGroup.getName() + "%");
} }
......
...@@ -6,6 +6,7 @@ import io.dataease.base.domain.*; ...@@ -6,6 +6,7 @@ import io.dataease.base.domain.*;
import io.dataease.base.mapper.DatasetTableIncrementalConfigMapper; import io.dataease.base.mapper.DatasetTableIncrementalConfigMapper;
import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasetTableMapper;
import io.dataease.base.mapper.DatasourceMapper; import io.dataease.base.mapper.DatasourceMapper;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.BeanUtils;
import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.datasource.constants.DatasourceTypes; import io.dataease.datasource.constants.DatasourceTypes;
...@@ -51,6 +52,7 @@ public class DataSetTableService { ...@@ -51,6 +52,7 @@ public class DataSetTableService {
checkName(datasetTable); checkName(datasetTable);
if (StringUtils.isEmpty(datasetTable.getId())) { if (StringUtils.isEmpty(datasetTable.getId())) {
datasetTable.setId(UUID.randomUUID().toString()); datasetTable.setId(UUID.randomUUID().toString());
datasetTable.setCreateBy(AuthUtils.getUser().getUsername());
datasetTable.setCreateTime(System.currentTimeMillis()); datasetTable.setCreateTime(System.currentTimeMillis());
DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO(); DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO();
if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) { if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) {
...@@ -77,8 +79,10 @@ public class DataSetTableService { ...@@ -77,8 +79,10 @@ public class DataSetTableService {
public List<DatasetTable> list(DataSetTableRequest dataSetTableRequest) { public List<DatasetTable> list(DataSetTableRequest dataSetTableRequest) {
DatasetTableExample datasetTableExample = new DatasetTableExample(); DatasetTableExample datasetTableExample = new DatasetTableExample();
DatasetTableExample.Criteria criteria = datasetTableExample.createCriteria();
criteria.andCreateByEqualTo(AuthUtils.getUser().getUsername());
if (StringUtils.isNotEmpty(dataSetTableRequest.getSceneId())) { if (StringUtils.isNotEmpty(dataSetTableRequest.getSceneId())) {
datasetTableExample.createCriteria().andSceneIdEqualTo(dataSetTableRequest.getSceneId()); criteria.andSceneIdEqualTo(dataSetTableRequest.getSceneId());
} }
if (StringUtils.isNotEmpty(dataSetTableRequest.getSort())) { if (StringUtils.isNotEmpty(dataSetTableRequest.getSort())) {
datasetTableExample.setOrderByClause(dataSetTableRequest.getSort()); datasetTableExample.setOrderByClause(dataSetTableRequest.getSort());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论