dntd-model-buildheating/src/main/java/com/dky/calculate/Scheme.java

@@ -52,9 +52,7 @@ public class Scheme {
         Double remainArea = buildArea;
         // 遍历设备，根据建筑面积进行匹配设备数量
         List<MatchedDevice> matchedDeviceList = new ArrayList<>();
-
-        for (int i = 0; i < sysDeviceHeatSceneList.size(); i++) {
-            SysDeviceHeatScene deviceHeatScene = sysDeviceHeatSceneList.get(i);
+        for (SysDeviceHeatScene deviceHeatScene : sysDeviceHeatSceneList) {
             double v = remainArea / deviceHeatScene.getDevReferenceArea();
             int count = (int) (v);
             if (v < 1) {
@@ -65,14 +63,8 @@ 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;
     }
 }

dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java

@@ -16,9 +16,7 @@ public class MaterialKilnScheme {
         Double remainArea = workArea;
         // 遍历设备，根据工作容积进行匹配设备数量
         List<MatchedDevice> matchedDeviceList = new ArrayList<>();
-
-        for (int i = 0; i < sysDeviceHeatSceneList.size(); i++) {
-            SysDeviceHeatScene deviceHeatScene = sysDeviceHeatSceneList.get(i);
+        for (SysDeviceHeatScene deviceHeatScene : sysDeviceHeatSceneList) {
             double v = remainArea / deviceHeatScene.getDevWorkArea();
             int count = (int) (v);
             if (v < 1) {
@@ -29,11 +27,6 @@ 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;