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/service/impl/TScreenContentServiceImpl.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 09360e3..caa54aa 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
@@ -15,6 +15,7 @@
import com.ruoyi.other.mapper.TSystemConfigurationMapper;
import com.ruoyi.other.service.TScreenContentService;
import com.ruoyi.other.service.TSystemConfigurationService;
+import com.ruoyi.other.util.KsolarUtils;
import com.ruoyi.other.vo.EmissionReductionVO;
import com.ruoyi.other.vo.PhotovoltaicPowerGenerationVO;
import com.ruoyi.other.vo.ScreenStorageConfigVO;
@@ -51,16 +52,11 @@
@Override
public EmissionReductionVO emissionReduction(List<Integer> siteIds) {
+ ScreenTopVO top = top(Arrays.asList(25, 26));
//需调用接口 计算光伏减排
EmissionReductionVO vo = new EmissionReductionVO();
//获取总电量 计算累计充电二氧化碳减排量
- BigDecimal charge=new BigDecimal("0.00");
- if (siteIds!=null && !siteIds.isEmpty()){
- R<BigDecimal> r = chargingOrderClient.getSumDegreeBySiteIds(siteIds);
- if (r.getCode()==200){
- charge=r.getData();
- }
- }
+ BigDecimal charge=top.getCarCharge();
//计算累计充电二氧化碳减排量
if (charge.compareTo(BigDecimal.ZERO) != 0) {
// 定义乘数和除数
@@ -69,7 +65,7 @@
// 计算：charge × 0.1404 ÷ 1000
charge = charge
.multiply(multiplier) // 乘以 0.1404
- .divide(divisor, 2, RoundingMode.HALF_UP); // 除以 1000，保留6位小数，四舍五入
+ .divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN); // 除以 1000，保留6位小数，四舍五入
}
vo.setCharge(charge);
@@ -81,7 +77,7 @@
LocalDate today = LocalDate.now();
// 判断是否等于今天
if (configVO.getLastUpdated().equals(today)) {
- vo.setEnergyStorage(configVO.getStorageDisCharge());
+ vo.setEnergyStorage(configVO.getStorageDisCharge().multiply(new BigDecimal("0.1404")).divide(new BigDecimal("1000"),2,RoundingMode.DOWN));
}else {
//判断离今天还有几天
int count = (int) ChronoUnit.DAYS.between(configVO.getLastUpdated(), today) +1;//包括今天
@@ -99,44 +95,50 @@
sysConfig.setContent(json);
systemConfigurationMapper.updateById(sysConfig);
- vo.setEnergyStorage(storageDisCharge);
+ vo.setEnergyStorage(storageDisCharge.multiply(new BigDecimal("0.1404")).divide(new BigDecimal("1000"),2,RoundingMode.DOWN));
}
+ //获取累计发电
+ vo.setPhotovoltaic(KsolarUtils.getYearAllEnergy());
+
//总数：
BigDecimal total = vo.getPhotovoltaic().add(vo.getEnergyStorage()).add(vo.getCharge());
vo.setTotal(total);
+
+
+
+
+
+
//计算比率
- vo.setPhotovoltaicRate(calculateRatio(vo.getPhotovoltaic(),vo.getTotal()));
- vo.setEnergyStorageRate(calculateRatio(vo.getEnergyStorage(),vo.getTotal()));
- vo.setChargeRate(calculateRatio(vo.getCharge(),vo.getTotal()));
+ vo.setPhotovoltaicRate(calculateRatio(vo.getPhotovoltaic(),vo.getTotal()).multiply(new BigDecimal("100")));
+ vo.setEnergyStorageRate(calculateRatio(vo.getEnergyStorage(),vo.getTotal()).multiply(new BigDecimal("100")));
+ vo.setChargeRate(calculateRatio(vo.getCharge(),vo.getTotal()).multiply(new BigDecimal("100")));
return vo;
}
+
//百分比计算
public static BigDecimal calculateRatio(BigDecimal part, BigDecimal total) {
if (total.compareTo(BigDecimal.ZERO) == 0) {
throw new ArithmeticException("分母不能为零");
}
-
- return part.divide(total, 2, RoundingMode.HALF_UP);
+ return part.divide(total, 4, RoundingMode.HALF_UP);
}
@Override
public PhotovoltaicPowerGenerationVO photovoltaicPowerGeneration(List<Integer> siteIds) {
- //需调用接口
-
- //假数据
PhotovoltaicPowerGenerationVO vo = new PhotovoltaicPowerGenerationVO();
List<LocalDate> dates = new ArrayList<>();
- List<Integer> values = new ArrayList<>();
+ List<Double> values = new ArrayList<>();
LocalDate today = LocalDate.now();
// 生成每天数据
for (int i = 7; i >= 1; i--) {//升序
LocalDate day = today.minusDays(i);
//统计
dates.add(day);
- int value = new Random().nextInt(151) + 100; // 100-250
+ Double value = KsolarUtils.getTodayEnergy(day.toString()); // 100-250
values.add(value);
}
vo.setDates(dates);
@@ -153,7 +155,7 @@
BigDecimal greenElectricity=new BigDecimal("0.00");
if (siteIds!=null && !siteIds.isEmpty()){
//获取充电量
- R<BigDecimal> r = chargingOrderClient.getSumDegreeBySiteIds(siteIds);
+ R<BigDecimal> r = chargingOrderClient.getSumDegreeBySiteIds(Arrays.asList(25,26));
if (r.getCode()==200){
charge=r.getData();
}
@@ -180,8 +182,11 @@
BigDecimal dailyRate = new BigDecimal("100");
BigDecimal totalCharge = dailyRate.multiply(BigDecimal.valueOf(days));
vo.setStorageCharge(totalCharge);
- //获取储能放电量
+ vo.setPhotovoltaic(new BigDecimal(KsolarUtils.getAllEnergy(LocalDate.now().toString())));
+ vo.setGreenElectricity(vo.getPhotovoltaic().multiply(new BigDecimal("0.94")).setScale(2, RoundingMode.HALF_UP));
+
+ //获取储能放电量
// 判断是否等于今天
if (configVO.getLastUpdated().equals(today)) {
vo.setStorageDisCharge(configVO.getStorageDisCharge());
@@ -204,7 +209,9 @@
systemConfigurationMapper.updateById(sysConfig);
vo.setStorageDisCharge(storageDisCharge);
- return vo;
+
+
+ return vo;
}
@Override
--
Gitblit v1.7.1