mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 19:51:00 +00:00
Merge pull request #2362 from wangyong00/fixed-bug-npe-1
(fix)(headless)修复维度和指标信息不存在时,遍历List<NULL>数据抛出NPE异常
This commit is contained in:
@@ -519,6 +519,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
|
|||||||
|
|
||||||
private DataItem getDataItem(DimensionDO dimensionDO) {
|
private DataItem getDataItem(DimensionDO dimensionDO) {
|
||||||
ModelResp modelResp = modelService.getModel(dimensionDO.getModelId());
|
ModelResp modelResp = modelService.getModel(dimensionDO.getModelId());
|
||||||
|
if(modelResp == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
DimensionResp dimensionResp = DimensionConverter.convert2DimensionResp(dimensionDO,
|
DimensionResp dimensionResp = DimensionConverter.convert2DimensionResp(dimensionDO,
|
||||||
ImmutableMap.of(modelResp.getId(), modelResp));
|
ImmutableMap.of(modelResp.getId(), modelResp));
|
||||||
return DataItem.builder().id(dimensionResp.getId().toString()).name(dimensionResp.getName())
|
return DataItem.builder().id(dimensionResp.getId().toString()).name(dimensionResp.getName())
|
||||||
@@ -528,7 +531,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
|
|||||||
|
|
||||||
private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType) {
|
private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType) {
|
||||||
List<DataItem> dataItems =
|
List<DataItem> dataItems =
|
||||||
dimensionDOS.stream().map(this::getDataItem).collect(Collectors.toList());
|
dimensionDOS.stream().map(this::getDataItem)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.collect(Collectors.toList());
|
||||||
return new DataEvent(this, dataItems, eventType);
|
return new DataEvent(this, dataItems, eventType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -683,7 +683,9 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
|
|||||||
|
|
||||||
private DataEvent getDataEvent(List<MetricDO> metricDOS, EventType eventType) {
|
private DataEvent getDataEvent(List<MetricDO> metricDOS, EventType eventType) {
|
||||||
List<DataItem> dataItems =
|
List<DataItem> dataItems =
|
||||||
metricDOS.stream().map(this::getDataItem).collect(Collectors.toList());
|
metricDOS.stream().map(this::getDataItem)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.collect(Collectors.toList());
|
||||||
return new DataEvent(this, dataItems, eventType);
|
return new DataEvent(this, dataItems, eventType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user