From 4f9901f28b7a312834ed37aad536db3e418bd6cc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:42 +0800
Subject: [PATCH] 光伏对接三方调整api
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
index caa54aa..7f7dcc9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
@@ -133,13 +133,17 @@
List<LocalDate> dates = new ArrayList<>();
List<Double> values = new ArrayList<>();
LocalDate today = LocalDate.now();
+ ArrayList<Map<String, Object>> monthEnergy = KsolarUtils.getMonthEnergy(today.minusDays(7).toString().substring(0, 7), today.minusDays(1).toString().substring(0, 7));
// 生成每天数据
for (int i = 7; i >= 1; i--) {//升序
LocalDate day = today.minusDays(i);
- //统计
- dates.add(day);
- Double value = KsolarUtils.getTodayEnergy(day.toString()); // 100-250
- values.add(value);
+
+ Map<String, Object> stringObjectMap = monthEnergy.stream().filter(e -> e.get("time").toString().contains(day.toString())).findFirst().orElse(null);
+ if(stringObjectMap!=null){
+ values.add(Double.valueOf(stringObjectMap.get("value").toString()));
+ }else {
+ values.add(0.0);
+ }
}
vo.setDates(dates);
vo.setValues(values);
--
Gitblit v1.7.1