From d7d4ae6cfb28adf7ef92f44332ff492f0cc7069c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期五, 07 八月 2026 15:44:41 +0800
Subject: [PATCH] feat: 完善大屏与光储监控接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
index f4d2050..c2608cd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
@@ -36,11 +36,11 @@
return R.ok(chargingOrderService.getLargeScreenSummary(normalizeSiteIds(siteIds)));
}
- @ApiOperation(tags = {"大屏-收入趋势"}, value = "当年按月充电收入")
+ @ApiOperation(tags = {"大屏-收入趋势"}, value = "最近七日充电收入")
@GetMapping("/incomeTrend")
public R<List<SixChargingDto>> incomeTrend(@RequestParam("siteIds") List<Integer> siteIds) {
return R.ok(chargingOrderService.getLargeScreenIncomeTrend(
- normalizeSiteIds(siteIds), LocalDate.now().withDayOfYear(1)));
+ normalizeSiteIds(siteIds), LocalDate.now().minusDays(6)));
}
@ApiOperation(tags = {"大屏-停车场充电功率曲线图"},value = "停车场充电功率曲线图")
@@ -48,14 +48,14 @@
public R<List<LargeChargingPowerVo>> getChargingPower(
@RequestParam(value = "siteIds", required = false) List<Integer> siteIds){
LocalDate today = LocalDate.now();
- LocalDateTime startTime = today.minusDays(7).atStartOfDay();
- LocalDateTime endTime = today.atStartOfDay();
+ LocalDateTime startTime = today.minusDays(6).atStartOfDay();
+ LocalDateTime endTime = today.plusDays(1).atStartOfDay();
List<LargeChargingPowerVo> powerData = chargingOrderService.getLargeScreenChargingPower(
siteIds == null ? null : normalizeSiteIds(siteIds), startTime, endTime);
Map<String, LargeChargingPowerVo> powerByDate = powerData.stream()
.collect(Collectors.toMap(LargeChargingPowerVo::getTime, Function.identity(), (left, right) -> left));
ArrayList<LargeChargingPowerVo> largeChargingPowerVos = new ArrayList<>();
- for (int count = 7; count > 0; count--) {
+ for (int count = 6; count >= 0; count--) {
String time = today.minusDays(count).toString();
LargeChargingPowerVo largeChargingPowerVo = powerByDate.getOrDefault(time, new LargeChargingPowerVo());
largeChargingPowerVo.setTime(time);
--
Gitblit v1.7.1