From dc014eb097de2fbf2664b3164076361019dcfcbb Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 12 五月 2025 13:37:10 +0800
Subject: [PATCH] getPreDataChart
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index 600c80e..3a13312 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -222,20 +222,19 @@
preDataView.setTrendsDataL(newList);
}
- if (StringUtils.isNotBlank(culIndex)) {
- if(!CollectionUtils.isEmpty(preDataView.getCurData())){
- AtomicReference<Double> culData = new AtomicReference<>(0d);
- List<Object[]> newList = preDataView.getCurData().stream()
- .map(item -> {
- culData.updateAndGet(v -> v + Double.parseDouble(String.format("%.2f", Double.parseDouble(item[1].toString()) / 60)));
- item[1] = culData;
- return item;
- })
- .collect(Collectors.toList());
- preDataView.setCulData(newList);
+ List<Object[]> culData = new ArrayList<>();
+ double leiji = 0;
+ if (StringUtils.isNotBlank(culIndex) && !CollectionUtils.isEmpty(preDataView.getCurData())) {
+ for(int i = 0; i < preDataView.getCurData().size(); i++) {
+ Object[] item = preDataView.getCurData().get(i);
+ Object[] dataItem = new Object[2];
+ dataItem[0] = item[0];
+ leiji = leiji + new BigDecimal(item[1].toString()).doubleValue();
+ dataItem[1] = new BigDecimal(leiji).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP) ;
+ culData.add(dataItem);
}
}
-
+ preDataView.setCulData(culData);
preDataView.setPreData(resultOld.getDataView().getPreDataL());
result.setPreDataView(preDataView);
return result;
--
Gitblit v1.9.3