From 6ecf7171775a04bbcb52c9943bcafce699c837a7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 11:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
index 6a3f91c..ba04879 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TScreenContentController.java
@@ -15,6 +15,7 @@
import com.ruoyi.other.service.TScreenContentService;
import com.ruoyi.other.service.TSystemConfigurationService;
import com.ruoyi.other.util.EnergyRefreshService;
+import com.ruoyi.other.util.KsolarUtils;
import com.ruoyi.other.vo.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -63,25 +64,9 @@
@GetMapping(value = "/photovoltaicAndConsumption")
public AjaxResult<PhotovoltaicAndConsumptionVO> photovoltaicAndConsumption() {
//需调用接口 获取光伏发电量
- List<Integer> siteIds= Arrays.asList(25,26);
PhotovoltaicAndConsumptionVO vo = new PhotovoltaicAndConsumptionVO();
- List<TScreenContent> list = screenContentService.list(new LambdaQueryWrapper<TScreenContent>().in(TScreenContent::getSiteId, siteIds));
- if(list==null|| list.isEmpty()){
- return AjaxResult.success(vo);
- }
- vo.setGreenElectricityToday(list.get(0).getGreenElectricityToday());
- list.remove(0);
- list.forEach(x->{
- vo.setGreenElectricityToday(vo.getGreenElectricityToday().add(x.getGreenElectricityToday()));
- });
-
- TSystemConfiguration sysConfig = systemConfigurationService.getOne(new LambdaQueryWrapper<TSystemConfiguration>()
- .eq(TSystemConfiguration::getType,4));
- BigDecimal refreshValueOne = new BigDecimal(sysConfig.getContent());
- vo.setTodayGenerateElectricity(refreshValueOne);
- vo.setGreenElectricityToday(refreshValueOne.multiply(new BigDecimal("0.94")).setScale(2, RoundingMode.HALF_UP));
-
-
+ vo.setTodayGenerateElectricity(new BigDecimal(KsolarUtils.getTodayEnergy(LocalDateTime.now().toString())));
+ vo.setGreenElectricityToday(vo.getTodayGenerateElectricity().multiply(new BigDecimal("0.94")).setScale(2, RoundingMode.HALF_UP));
return AjaxResult.success(vo);
}
@@ -111,7 +96,10 @@
public AjaxResult<EnergyStorageDischargeVO> energyStorageDischarge() {
//需调用接口 获取光伏发电量
EnergyStorageDischargeVO vo = new EnergyStorageDischargeVO();
- vo.setTodayDischarge(energyRefreshService.getCurrentValue());
+ //今日放能 10:00-11:59 每1分钟随机增值0.5-1，放满90停止；用第一次放能值为基数（85）开始累加，17:00-21:59 每1分钟随机增值0.5-1，放满90停止。
+ vo.setTodayDischarge(energyRefreshService.getTodayDischarge());
+ //今日储能 00:00-次日7:59 每1分钟随机增长0.5-1，储满115停止，12:00-16:59 每1分钟随机增长0.5-1，增加到115减第一次放能剩余值（如放能值为85，则放能剩余值为90-85）结束；
+ vo.setTodayStorage(energyRefreshService.getTodayStorage());
return AjaxResult.success(vo);
}
--
Gitblit v1.7.1