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 202f1d9a17..e919224bd1 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -2,10 +2,7 @@ package io.dataease.service.chart; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import io.dataease.base.domain.ChartViewExample; -import io.dataease.base.domain.ChartViewWithBLOBs; -import io.dataease.base.domain.DatasetTable; -import io.dataease.base.domain.Datasource; +import io.dataease.base.domain.*; import io.dataease.base.mapper.ChartViewMapper; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.chart.ChartViewRequest; @@ -45,6 +42,7 @@ public class ChartViewService { private SparkCalc sparkCalc; public ChartViewWithBLOBs save(ChartViewWithBLOBs chartView) { + checkName(chartView); long timestamp = System.currentTimeMillis(); chartView.setUpdateTime(timestamp); int i = chartViewMapper.updateByPrimaryKeySelective(chartView); @@ -224,4 +222,25 @@ public class ChartViewService { return ""; } } + + private void checkName(ChartViewWithBLOBs chartView) { + if (StringUtils.isEmpty(chartView.getId())) { + return; + } + ChartViewExample chartViewExample = new ChartViewExample(); + ChartViewExample.Criteria criteria = chartViewExample.createCriteria(); + if (StringUtils.isNotEmpty(chartView.getId())) { + criteria.andIdNotEqualTo(chartView.getId()); + } + if (StringUtils.isNotEmpty(chartView.getSceneId())) { + criteria.andSceneIdEqualTo(chartView.getSceneId()); + } + if (StringUtils.isNotEmpty(chartView.getName())) { + criteria.andNameEqualTo(chartView.getName()); + } + List list = chartViewMapper.selectByExampleWithBLOBs(chartViewExample); + if (list.size() > 0) { + throw new RuntimeException("Name can't repeat in same group."); + } + } } 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 15629e6679..12fee6e58b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -48,6 +48,7 @@ public class DataSetTableService { } public DatasetTable save(DatasetTable datasetTable) throws Exception { + checkName(datasetTable); if (StringUtils.isEmpty(datasetTable.getId())) { datasetTable.setId(UUID.randomUUID().toString()); datasetTable.setCreateTime(System.currentTimeMillis()); @@ -364,34 +365,56 @@ public class DataSetTableService { } } - public DatasetTableIncrementalConfig incrementalConfig(DatasetTableIncrementalConfig datasetTableIncrementalConfig){ - if(StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())){return new DatasetTableIncrementalConfig();} + public DatasetTableIncrementalConfig incrementalConfig(DatasetTableIncrementalConfig datasetTableIncrementalConfig) { + if (StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) { + return new DatasetTableIncrementalConfig(); + } DatasetTableIncrementalConfigExample example = new DatasetTableIncrementalConfigExample(); example.createCriteria().andTableIdEqualTo(datasetTableIncrementalConfig.getTableId()); List configs = datasetTableIncrementalConfigMapper.selectByExample(example); - if(CollectionUtils.isNotEmpty(configs)){ + if (CollectionUtils.isNotEmpty(configs)) { return configs.get(0); - }else { + } else { return new DatasetTableIncrementalConfig(); } } - public DatasetTableIncrementalConfig incrementalConfig(String datasetTableId){ + public DatasetTableIncrementalConfig incrementalConfig(String datasetTableId) { DatasetTableIncrementalConfig datasetTableIncrementalConfig = new DatasetTableIncrementalConfig(); datasetTableIncrementalConfig.setTableId(datasetTableId); return incrementalConfig(datasetTableIncrementalConfig); } - public void saveIncrementalConfig(DatasetTableIncrementalConfig datasetTableIncrementalConfig){ - if(StringUtils.isEmpty(datasetTableIncrementalConfig.getId())){ + public void saveIncrementalConfig(DatasetTableIncrementalConfig datasetTableIncrementalConfig) { + if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) { datasetTableIncrementalConfig.setId(UUID.randomUUID().toString()); datasetTableIncrementalConfigMapper.insertSelective(datasetTableIncrementalConfig); - }else{ + } else { DatasetTableIncrementalConfigExample example = new DatasetTableIncrementalConfigExample(); example.createCriteria().andTableIdEqualTo(datasetTableIncrementalConfig.getTableId()); datasetTableIncrementalConfigMapper.updateByExample(datasetTableIncrementalConfig, example); } } + private void checkName(DatasetTable datasetTable) { + if (StringUtils.isEmpty(datasetTable.getId()) && StringUtils.equalsIgnoreCase("db", datasetTable.getType())) { + return; + } + DatasetTableExample datasetTableExample = new DatasetTableExample(); + DatasetTableExample.Criteria criteria = datasetTableExample.createCriteria(); + if (StringUtils.isNotEmpty(datasetTable.getId())) { + criteria.andIdNotEqualTo(datasetTable.getId()); + } + if (StringUtils.isNotEmpty(datasetTable.getSceneId())) { + criteria.andSceneIdEqualTo(datasetTable.getSceneId()); + } + if (StringUtils.isNotEmpty(datasetTable.getName())) { + criteria.andNameEqualTo(datasetTable.getName()); + } + List list = datasetTableMapper.selectByExample(datasetTableExample); + if (list.size() > 0) { + throw new RuntimeException("Name can't repeat in same group."); + } + } }