From ca250d6bd5c2487734459a669a44f06dcdaa95f1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 六月 2026 18:44:31 +0800
Subject: [PATCH] 调整
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java | 4 ++--
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/KsolarUtils.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
index a52c01e..e7e2acb 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
@@ -45,7 +45,7 @@
EmissionReductionVO vo = new EmissionReductionVO();
//获取总电量 计算累计充电二氧化碳减排量
BigDecimal charge=top.getCarCharge();
- BigDecimal multiplier = new BigDecimal("0.1404");
+ BigDecimal multiplier = new BigDecimal("1.564");
//计算累计充电二氧化碳减排量
if (charge.compareTo(BigDecimal.ZERO) != 0) {
// 定义乘数和除数
@@ -53,7 +53,7 @@
// 计算：charge × 0.1404 ÷ 1000
charge = charge
.multiply(multiplier) // 乘以 0.1404
- .divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN); // 除以 1000，保留6位小数，四舍五入
+ .divide(new BigDecimal("10000"),2, RoundingMode.HALF_DOWN); // 除以 1000，保留6位小数，四舍五入
}
// vo.setCharge(charge);
vo.setCharge(new BigDecimal(32.61));
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/KsolarUtils.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/KsolarUtils.java
index 515cc60..da69c2d 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/KsolarUtils.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/KsolarUtils.java
@@ -131,7 +131,7 @@
Double yearAllEnergy2 = getYearAllEnergy(stationIds.get(2));
Double yearAllEnergy3 = getYearAllEnergy(stationIds.get(3));
double v = yearAllEnergy + yearAllEnergy1 + yearAllEnergy2 + yearAllEnergy3;
- BigDecimal divide = new BigDecimal(v).multiply(new BigDecimal("0.1404")).divide(new BigDecimal("1000"), 2, RoundingMode.DOWN);
+ BigDecimal divide = new BigDecimal(v).multiply(new BigDecimal("1.564")).divide(new BigDecimal("10000"), 2, RoundingMode.DOWN);
return divide;
}
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 81d6d89..a7a43e5 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
@@ -39,7 +39,7 @@
EmissionReductionVO vo = new EmissionReductionVO();
//获取总电量 计算累计充电二氧化碳减排量
BigDecimal charge = top.getCarCharge();
- BigDecimal multiplier = new BigDecimal("0.1404");
+ BigDecimal multiplier = new BigDecimal("1.564");
//计算累计充电二氧化碳减排量
if (charge.compareTo(BigDecimal.ZERO) != 0) {
// 定义乘数和除数
@@ -47,7 +47,7 @@
// 计算：charge × 0.1404 ÷ 1000
charge = charge
.multiply(multiplier) // 乘以 0.1404
- .divide(new BigDecimal("1000"), 2, RoundingMode.HALF_DOWN); // 除以 1000，保留6位小数，四舍五入
+ .divide(new BigDecimal("10000"), 2, RoundingMode.HALF_DOWN); // 除以 1000，保留6位小数，四舍五入
}
vo.setCharge(charge);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
index 6c4c08b..6402ec1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
@@ -140,7 +140,7 @@
Double yearAllEnergy2 = getYearAllEnergy(stationIds.get(2));
Double yearAllEnergy3 = getYearAllEnergy(stationIds.get(3));
double v = yearAllEnergy + yearAllEnergy1 + yearAllEnergy2 + yearAllEnergy3;
- BigDecimal divide = new BigDecimal(v).multiply(new BigDecimal("0.1404")).divide(new BigDecimal("1000"), 2, RoundingMode.DOWN);
+ BigDecimal divide = new BigDecimal(v).multiply(new BigDecimal("1.564")).divide(new BigDecimal("10000"), 2, RoundingMode.DOWN);
return divide;
}
--
Gitblit v1.7.1