From 622266a4676a5f2a55e42c0e9665c3d7dce693d4 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Wed, 20 Mar 2024 16:57:46 +0800 Subject: [PATCH] =?UTF-8?q?2024-03-20=2017:00: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 --- dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java | 2 +- dntd-tool/src/main/java/com/dky/generate/HeatBoilerScene.java | 2 +- dntd-tool/src/main/java/com/dky/generate/MaterialKilnScene.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 370db62..71cff04 100644 --- a/dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java +++ b/dntd-tool/src/main/java/com/dky/generate/BuildHeatingScene.java @@ -177,7 +177,7 @@ public class BuildHeatingScene implements DntdModelI { electric = electric + (BuildHeatingModel.getElectric(matchedDevice.getCount(), matchedDevice.getDeviceHeatScene().getDevPower(), days)); - laborFee1 = laborFee1 + (matchedDevice.getCount() * matchedDevice.getDeviceHeatScene().getDevPrice() / matchedDevice.getDeviceHeatScene().getDevServiceLife()); + laborFee1 = laborFee1 + (matchedDevice.getCount() * matchedDevice.getDeviceHeatScene().getLaborCost() / matchedDevice.getDeviceHeatScene().getDevServiceLife()); } //初次投资费用 diff --git a/dntd-tool/src/main/java/com/dky/generate/HeatBoilerScene.java b/dntd-tool/src/main/java/com/dky/generate/HeatBoilerScene.java index abdd87f..d4757ed 100644 --- a/dntd-tool/src/main/java/com/dky/generate/HeatBoilerScene.java +++ b/dntd-tool/src/main/java/com/dky/generate/HeatBoilerScene.java @@ -113,7 +113,7 @@ public class HeatBoilerScene implements DntdModelI { Double startCost = 0.0; Double runCost = 0.0; Double allCost = 0.0; - Double calculateAnnualCarbon = 0.0; + Double calculateAnnualCarbon; Double electric = 0.0; List> deviceList = new ArrayList<>(); for (MatchedDevice matchedDevice : matchedDeviceList) { diff --git a/dntd-tool/src/main/java/com/dky/generate/MaterialKilnScene.java b/dntd-tool/src/main/java/com/dky/generate/MaterialKilnScene.java index 93991d7..a4c0d4a 100644 --- a/dntd-tool/src/main/java/com/dky/generate/MaterialKilnScene.java +++ b/dntd-tool/src/main/java/com/dky/generate/MaterialKilnScene.java @@ -96,7 +96,7 @@ public class MaterialKilnScene implements DntdModelI { electric = electric + (MaterialKilnModel.calculateSubstituteElectricity(matchedDevice.getDeviceHeatScene().getDevPower(), matchedDevice.getCount(), matchedDevice.getDeviceHeatScene().getDevAnnualOperationTime())); - laborFee1 = laborFee1 + (matchedDevice.getCount() * matchedDevice.getDeviceHeatScene().getDevPrice() / matchedDevice.getDeviceHeatScene().getDevServiceLife()); + laborFee1 = laborFee1 + (matchedDevice.getCount() * matchedDevice.getDeviceHeatScene().getLaborCost() / matchedDevice.getDeviceHeatScene().getDevServiceLife()); } //初次投资费用