mirror of
https://github.com/tencentmusic/supersonic.git
synced 2026-06-26 14:49:31 +08:00
feat(data): 添加时间戳数据类型支持并优化维度转换逻辑
- 新增 TIMESTAMP 数据类型枚举值 - 为整型数据类型匹配添加 INT 关键字识别 - 移除维度转换中的冗余数据类型设置逻辑 - 修复数据类型转换过程中的潜在问题
This commit is contained in:
@@ -79,11 +79,11 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
|
||||
public DataSetResp getDataSet(Long id) {
|
||||
DataSetDO dataSetDO = getById(id);
|
||||
DataSetResp dataSetResp = convert(dataSetDO);
|
||||
|
||||
|
||||
if (dataSetResp.getDataSetDetail() != null) {
|
||||
expandIncludesAllModels(dataSetResp);
|
||||
}
|
||||
|
||||
|
||||
return dataSetResp;
|
||||
}
|
||||
|
||||
@@ -286,10 +286,8 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
|
||||
return;
|
||||
}
|
||||
|
||||
Set<Long> includeAllModelIds = configs.stream()
|
||||
.filter(DataSetModelConfig::getIncludesAll)
|
||||
.map(DataSetModelConfig::getId)
|
||||
.collect(Collectors.toSet());
|
||||
Set<Long> includeAllModelIds = configs.stream().filter(DataSetModelConfig::getIncludesAll)
|
||||
.map(DataSetModelConfig::getId).collect(Collectors.toSet());
|
||||
|
||||
if (CollectionUtils.isEmpty(includeAllModelIds)) {
|
||||
return;
|
||||
@@ -302,28 +300,26 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
|
||||
List<DimensionResp> allDimensions = dimensionService.getDimensions(metaFilter);
|
||||
List<MetricResp> allMetrics = metricService.getMetrics(metaFilter);
|
||||
|
||||
Map<Long, List<Long>> modelDimensionMap = allDimensions.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
DimensionResp::getModelId,
|
||||
Collectors.mapping(DimensionResp::getId, Collectors.toList())
|
||||
));
|
||||
Map<Long, List<Long>> modelDimensionMap =
|
||||
allDimensions.stream().collect(Collectors.groupingBy(DimensionResp::getModelId,
|
||||
Collectors.mapping(DimensionResp::getId, Collectors.toList())));
|
||||
|
||||
Map<Long, List<Long>> modelMetricMap = allMetrics.stream()
|
||||
.collect(Collectors.groupingBy(
|
||||
MetricResp::getModelId,
|
||||
Collectors.mapping(MetricResp::getId, Collectors.toList())
|
||||
));
|
||||
Map<Long, List<Long>> modelMetricMap =
|
||||
allMetrics.stream().collect(Collectors.groupingBy(MetricResp::getModelId,
|
||||
Collectors.mapping(MetricResp::getId, Collectors.toList())));
|
||||
|
||||
for (DataSetModelConfig config : configs) {
|
||||
if (Boolean.TRUE.equals(config.getIncludesAll())) {
|
||||
Long modelId = config.getId();
|
||||
|
||||
List<Long> modelDimensions = modelDimensionMap.getOrDefault(modelId, Lists.newArrayList());
|
||||
|
||||
List<Long> modelDimensions =
|
||||
modelDimensionMap.getOrDefault(modelId, Lists.newArrayList());
|
||||
Set<Long> existingDimensions = new HashSet<>(config.getDimensions());
|
||||
existingDimensions.addAll(modelDimensions);
|
||||
config.setDimensions(new ArrayList<>(existingDimensions));
|
||||
|
||||
List<Long> modelMetrics = modelMetricMap.getOrDefault(modelId, Lists.newArrayList());
|
||||
List<Long> modelMetrics =
|
||||
modelMetricMap.getOrDefault(modelId, Lists.newArrayList());
|
||||
Set<Long> existingMetrics = new HashSet<>(config.getMetrics());
|
||||
existingMetrics.addAll(modelMetrics);
|
||||
config.setMetrics(new ArrayList<>(existingMetrics));
|
||||
|
||||
@@ -73,9 +73,6 @@ public class DimensionConverter {
|
||||
if (dimensionReq.getTypeParams() != null) {
|
||||
dimensionDO.setTypeParams(JSONObject.toJSONString(dimensionReq.getTypeParams()));
|
||||
}
|
||||
if (dimensionReq.getDataType() != null) {
|
||||
dimensionDO.setDataType(dimensionReq.getDataType().getType());
|
||||
}
|
||||
dimensionDO.setStatus(StatusEnum.ONLINE.getCode());
|
||||
return dimensionDO;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user