diff --git a/dntd-model-buildheating/src/main/java/com/dky/calculate/Scheme.java b/dntd-model-buildheating/src/main/java/com/dky/calculate/Scheme.java index b14d7e4..e9ccd4a 100644 --- a/dntd-model-buildheating/src/main/java/com/dky/calculate/Scheme.java +++ b/dntd-model-buildheating/src/main/java/com/dky/calculate/Scheme.java @@ -52,7 +52,9 @@ public class Scheme { Double remainArea = buildArea; // 遍历设备,根据建筑面积进行匹配设备数量 List matchedDeviceList = new ArrayList<>(); - for (SysDeviceHeatScene deviceHeatScene : sysDeviceHeatSceneList) { + + for (int i = 0; i < sysDeviceHeatSceneList.size(); i++) { + SysDeviceHeatScene deviceHeatScene = sysDeviceHeatSceneList.get(i); double v = remainArea / deviceHeatScene.getDevReferenceArea(); int count = (int) (v); if (v < 1) { @@ -63,8 +65,14 @@ public class Scheme { if (remainArea <= 0) { // 当总供暖面积已经满足需求时,跳出循环,不再选择其他设备 break; + } else { + if (i == sysDeviceHeatSceneList.size() - 1 && remainArea > 0) { + MatchedDevice device = matchedDeviceList.get(matchedDeviceList.size() - 1); + device.setCount(device.getCount() + 1); + } } } + return matchedDeviceList; } } diff --git a/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java b/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java index 259847e..57fea2f 100644 --- a/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java +++ b/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java @@ -16,7 +16,9 @@ public class MaterialKilnScheme { Double remainArea = workArea; // 遍历设备,根据工作容积进行匹配设备数量 List matchedDeviceList = new ArrayList<>(); - for (SysDeviceHeatScene deviceHeatScene : sysDeviceHeatSceneList) { + + for (int i = 0; i < sysDeviceHeatSceneList.size(); i++) { + SysDeviceHeatScene deviceHeatScene = sysDeviceHeatSceneList.get(i); double v = remainArea / deviceHeatScene.getDevWorkArea(); int count = (int) (v); if (v < 1) { @@ -27,6 +29,11 @@ public class MaterialKilnScheme { if (remainArea <= 0) { // 当总供暖面积已经满足需求时,跳出循环,不再选择其他设备 break; + } else { + if (i == sysDeviceHeatSceneList.size() - 1 && remainArea > 0) { + MatchedDevice device = matchedDeviceList.get(matchedDeviceList.size() - 1); + device.setCount(device.getCount() + 1); + } } } return matchedDeviceList;