From 4b7487d99180dc9e58c7585f6fc2566cc4f10341 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 六月 2025 11:10:13 +0800
Subject: [PATCH] 修正计划 展示T+N
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 1caa5cc..f63f9e1 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
@@ -396,18 +396,18 @@
}
}
} else if ("2".equals(lineType)) {
- // 展示T+N
- if(!CollectionUtils.isEmpty(chartData.getDataView().getPreDataN())) {
- for (int i = 0; i < chartData.getDataView().getPreDataN().size(); i++) {
- Object[] dataItem = chartData.getDataView().getPreDataN().get(i);
- preData.add(dataItem);
- }
- }
- } else {
// 展示当前值
if(!CollectionUtils.isEmpty(chartData.getDataView().getCurData())) {
for (int i = 0; i < chartData.getDataView().getCurData().size(); i++) {
Object[] dataItem = chartData.getDataView().getCurData().get(i);
+ preData.add(dataItem);
+ }
+ }
+ } else {
+ // 展示T+N
+ if(!CollectionUtils.isEmpty(chartData.getDataView().getPreDataN())) {
+ for (int i = 0; i < chartData.getDataView().getPreDataN().size(); i++) {
+ Object[] dataItem = chartData.getDataView().getPreDataN().get(i);
preData.add(dataItem);
}
}
@@ -429,11 +429,11 @@
return result;
}
- private String getEndTime(List<Object[]> preDataN, int startIndex) {
+ private String getEndTime(List<Object[]> preData, int startIndex) {
String endTime = "";
double lastValue = 1;
- for (int i = startIndex; i < preDataN.size(); i++) {
- Object[] dataItem = preDataN.get(i);
+ for (int i = startIndex; i < preData.size(); i++) {
+ Object[] dataItem = preData.get(i);
double cv = new BigDecimal(dataItem[1].toString()).doubleValue();
if (cv == 0 && cv != lastValue) {
return (String) dataItem[0];
--
Gitblit v1.9.3