From 1c2dd640beec3a2e2458fbe272768ad0416d6211 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 六月 2025 14:52:27 +0800
Subject: [PATCH] 修改大屏数据问题
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 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 7f7dcc9..569de12 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
@@ -137,7 +137,7 @@
// 生成每天数据
for (int i = 7; i >= 1; i--) {//升序
LocalDate day = today.minusDays(i);
-
+ dates.add(day);
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()));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
index ab1137f..eb3cf11 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
@@ -99,10 +99,7 @@
}
}
- public static void main(String[] args) throws Exception {
- ArrayList<Map<String, Object>> monthEnergy = getMonthEnergy("2025-05", "2025-06");
- System.out.println(monthEnergy);
- }
+
/**
* 光伏累计
@@ -229,7 +226,10 @@
}
return value;
}
-
+ public static void main(String[] args) throws Exception {
+ String electricity = getElectricity();
+ System.out.println(electricity);
+ }
--
Gitblit v1.7.1