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

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;
     }
 

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()));