2024-03-20 17:00:00 建材电窑炉模型接口开发

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());
 
         }
         //初次投资费用

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<HashMap<String, Object>> deviceList = new ArrayList<>();
         for (MatchedDevice matchedDevice : matchedDeviceList) {

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());
 
         }
         //初次投资费用