diff --git a/dntd-common/pom.xml b/dntd-common/pom.xml index fb4b148..a2857de 100644 --- a/dntd-common/pom.xml +++ b/dntd-common/pom.xml @@ -6,10 +6,11 @@ com.dky dntd-model-tools - 1.0-SNAPSHOT + 1.1-SNAPSHOT dntd-common + 1.1-SNAPSHOT 8 diff --git a/dntd-model-buildheating/pom.xml b/dntd-model-buildheating/pom.xml index 536bb29..79fcc8d 100644 --- a/dntd-model-buildheating/pom.xml +++ b/dntd-model-buildheating/pom.xml @@ -6,10 +6,11 @@ com.dky dntd-model-tools - 1.0-SNAPSHOT + 1.1-SNAPSHOT dntd-model-buildheating + 1.1-SNAPSHOT 8 diff --git a/dntd-model-buildheating/src/main/java/com/dky/calculate/SchemeRating.java b/dntd-model-buildheating/src/main/java/com/dky/calculate/SchemeRating.java index c4786bd..978676f 100644 --- a/dntd-model-buildheating/src/main/java/com/dky/calculate/SchemeRating.java +++ b/dntd-model-buildheating/src/main/java/com/dky/calculate/SchemeRating.java @@ -30,6 +30,7 @@ public class SchemeRating { cost = cost + ((device.getCount() * device.getDeviceHeatScene().getDevPrice()) + (device.getCount()) * device.getDeviceHeatScene().getDevSubstituteLaborCost() * device.getDeviceHeatScene().getDevServiceLife()); } + double v1 = (maxEff.get(devSubType) - eff) / maxEff.get(devSubType); // 热效率占比计算 double v = (cost - minPrice.get(devSubType)) / minPrice.get(devSubType); // 成本占比计算 System.out.println("当前方案成本: " + cost + ",当前方案热效率: " + eff + ",技术选型: " + devSubType + ",最小成本Map: " + minPrice + ",最大热效率Map: " + maxEff); diff --git a/dntd-model-heatboiler/pom.xml b/dntd-model-heatboiler/pom.xml index ca11ff3..8ac61dd 100644 --- a/dntd-model-heatboiler/pom.xml +++ b/dntd-model-heatboiler/pom.xml @@ -6,10 +6,11 @@ com.dky dntd-model-tools - 1.0-SNAPSHOT + 1.1-SNAPSHOT dntd-model-heatboiler + 1.1-SNAPSHOT 8 diff --git a/dntd-modelI/pom.xml b/dntd-modelI/pom.xml index 343c6e1..c41a522 100644 --- a/dntd-modelI/pom.xml +++ b/dntd-modelI/pom.xml @@ -6,10 +6,11 @@ com.dky dntd-model-tools - 1.0-SNAPSHOT + 1.1-SNAPSHOT dntd-modelI + 1.1-SNAPSHOT 8 diff --git a/dntd-tool/pom.xml b/dntd-tool/pom.xml index d98c4eb..3212419 100644 --- a/dntd-tool/pom.xml +++ b/dntd-tool/pom.xml @@ -6,11 +6,11 @@ com.dky dntd-model-tools - 1.0-SNAPSHOT + 1.1-SNAPSHOT dntd-tool - 1.0-SNAPSHOT + 1.1-SNAPSHOT 8 diff --git a/pom.xml b/pom.xml index b73797e..26f40fe 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.dky dntd-model-tools - 1.0-SNAPSHOT + 1.1-SNAPSHOT pom dntd-tool