center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #8779 from dataease/pr@dev@fix_accumulate_npe

Browse Source 
fix(视图): 快速计算累加空指针
This commit is contained in:
wisonic-s 2024-03-28 18:16:21 +08:00 committed by GitHub
commit 0db8470972
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -1515,7 +1515,11 @@ public class ChartViewService {
preDataItems.forEach(preDataItem -> { preDataItems.forEach(preDataItem -> {
String[] groupStackAxisArr = Arrays.copyOfRange(preDataItem, finalXAxisBase.size(), finalSubEndIndex); String[] groupStackAxisArr = Arrays.copyOfRange(preDataItem, finalXAxisBase.size(), finalSubEndIndex);
String groupStackAxis = StringUtils.join(groupStackAxisArr, '-'); String groupStackAxis = StringUtils.join(groupStackAxisArr, '-');
preDataMap.put(groupStackAxis, new BigDecimal(preDataItem[finalDataIndex])); String preVal = preDataItem[finalDataIndex];
if (StringUtils.isBlank(preVal)) {
preVal = "0";
}
preDataMap.put(groupStackAxis, new BigDecimal(preVal));
}); });
curDataItems.forEach(curDataItem -> { curDataItems.forEach(curDataItem -> {
String[] groupStackAxisArr = Arrays.copyOfRange(curDataItem, finalXAxisBase.size(), finalSubEndIndex); String[] groupStackAxisArr = Arrays.copyOfRange(curDataItem, finalXAxisBase.size(), finalSubEndIndex);
@ -1532,10 +1536,14 @@ public class ChartViewService {
final int index = dataIndex; final int index = dataIndex;
final AtomicReference<BigDecimal> accumValue = new AtomicReference<>(new BigDecimal(0)); final AtomicReference<BigDecimal> accumValue = new AtomicReference<>(new BigDecimal(0));
data.forEach(item -> { data.forEach(item -> {
BigDecimal curVal = new BigDecimal(item[index]); String val = item[index];
BigDecimal curAccumValue = accumValue.get().add(curVal); BigDecimal curAccumValue = accumValue.get();
if (!StringUtils.isBlank(val)) {
BigDecimal curVal = new BigDecimal(val);
curAccumValue = curAccumValue.add(curVal);
accumValue.set(curAccumValue);
}
item[index] = curAccumValue.toString(); item[index] = curAccumValue.toString();
accumValue.set(curAccumValue);
}); });
} }
} }