From 77b88bd856c598eaa49121eac7848f9f0935eb4a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 六月 2025 16:45:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java | 12 +++++++-----
1 files changed, 7 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 a3065d8..1c016e9 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
@@ -205,6 +205,12 @@
BigDecimal dailyRate = new BigDecimal("100");
BigDecimal totalCharge = dailyRate.multiply(BigDecimal.valueOf(days));
vo.setStorageCharge(totalCharge);
+
+ TSystemConfiguration sysConfig1 = systemConfigurationMapper.selectOne(new LambdaQueryWrapper<TSystemConfiguration>()
+ .eq(TSystemConfiguration::getType,5));
+ vo.setPhotovoltaic(new BigDecimal(sysConfig1.getContent()));
+ vo.setGreenElectricity(vo.getPhotovoltaic().multiply(new BigDecimal("0.94")).setScale(2, RoundingMode.HALF_UP));
+
//获取储能放电量
// 判断是否等于今天
@@ -231,11 +237,7 @@
vo.setStorageDisCharge(storageDisCharge);
- 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;
+ return vo;
}
@Override
--
Gitblit v1.7.1