From 378669e94558e6d4d7383604f84dabd9d2242e7c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 06 六月 2025 09:54:12 +0800
Subject: [PATCH] 调整参数
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 3dd359e..a3065d8 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
@@ -101,9 +101,9 @@
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;
}
@@ -119,7 +119,7 @@
throw new ArithmeticException("分母不能为零");
}
- return part.divide(total, 2, RoundingMode.HALF_UP);
+ return part.divide(total, 4, RoundingMode.HALF_UP);
}
@Override
@@ -231,7 +231,10 @@
vo.setStorageDisCharge(storageDisCharge);
- vo.setPhotovoltaic(new BigDecimal("9950"));
+ TSystemConfiguration sysConfig1 = systemConfigurationMapper.selectOne(new LambdaQueryWrapper<TSystemConfiguration>()
+ .eq(TSystemConfiguration::getType,4));
+ vo.setPhotovoltaic(new BigDecimal(sysConfig1.getContent()));
+ vo.setGreenElectricity(vo.getPhotovoltaic().multiply(new BigDecimal("0.94")).setScale(2, RoundingMode.HALF_UP));
return vo;
}
--
Gitblit v1.7.1