From e1ff1e6bfd4032fbdea560843c50c3b4b415cc78 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Wed, 20 Mar 2024 16:29:22 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-20=2013:48:00=20=E5=BB=BA=E6=9D=90?=
 =?UTF-8?q?=E7=94=B5=E7=AA=91=E7=82=89=E6=A8=A1=E5=9E=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dky/calculate/BuildHeatingModel.java   | 5 +++--
 .../src/main/java/com/dky/generate/BuildHeatingScene.java    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dntd-model-buildheating/src/main/java/com/dky/calculate/BuildHeatingModel.java b/dntd-model-buildheating/src/main/java/com/dky/calculate/BuildHeatingModel.java
index 319d431..136c580 100644
--- a/dntd-model-buildheating/src/main/java/com/dky/calculate/BuildHeatingModel.java
+++ b/dntd-model-buildheating/src/main/java/com/dky/calculate/BuildHeatingModel.java
@@ -36,8 +36,9 @@ public class BuildHeatingModel {
     public static Double getRunCost(Integer deviceNum,
                              Double devicePower,
                              Integer days,
+                             Integer years,
                              Double laborCost){
-        return (deviceNum * devicePower * days * 24 * EnergyPriceType.Residential_Electric_Price.getPrice()) + (laborCost * deviceNum);
+        return (deviceNum * devicePower * days * 24 * EnergyPriceType.Residential_Electric_Price.getPrice()) + (laborCost * deviceNum / years);
     }
 
     /**
@@ -56,7 +57,7 @@ public class BuildHeatingModel {
                               Double devicePower,
                               Integer days,
                               Double laborCost){
-        double run = (deviceNum * devicePower * days * 24 * EnergyPriceType.Residential_Electric_Price.getPrice()) + (laborCost * deviceNum);
+        double run = (deviceNum * devicePower * days * 24 * EnergyPriceType.Residential_Electric_Price.getPrice()) + (laborCost * deviceNum / useYears);
         return ((deviceNum * devicePrice) / useYears) + run;
     }
 
diff --git a/dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java b/dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java
index a54fac6..370db62 100644
--- a/dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java
+++ b/dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java
@@ -171,7 +171,7 @@ public class BuildHeatingScene implements DntdModelI {
             deviceList.add(map);
             startCost = startCost + (matchedDevice.getCount() * matchedDevice.getDeviceHeatScene().getDevPrice());
 
-            runCost = runCost + (BuildHeatingModel.getRunCost(matchedDevice.getCount(), matchedDevice.getDeviceHeatScene().getDevPower(), days, matchedDevice.getDeviceHeatScene().getDevSubstituteLaborCost()));
+            runCost = runCost + (BuildHeatingModel.getRunCost(matchedDevice.getCount(), matchedDevice.getDeviceHeatScene().getDevPower(), days, matchedDevice.getDeviceHeatScene().getDevServiceLife(), matchedDevice.getDeviceHeatScene().getDevSubstituteLaborCost()));
 
             allCost = allCost + (BuildHeatingModel.getYearCost(matchedDevice.getCount(), matchedDevice.getDeviceHeatScene().getDevPrice(), matchedDevice.getDeviceHeatScene().getDevServiceLife(), matchedDevice.getDeviceHeatScene().getDevPower(), days, matchedDevice.getDeviceHeatScene().getDevSubstituteLaborCost()));