feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -286,11 +286,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                     houseResourceProfileGraph.setPosition(gridRegion.getPosition());
                 }
             }
-            if (Objects.nonNull(houseResourceProfileGraph.getJzArea()) && Objects.nonNull(houseResourceProfileGraph.getKzArea())) {
-                houseResourceProfileGraph.setJyArea(houseResourceProfileGraph.getJzArea().subtract(houseResourceProfileGraph.getKzArea()));
-            }
             houseResourceProfileGraph.setKzCount(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).count());
-            houseResourceProfileGraph.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
+            houseResourceProfileGraph.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode() || x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.SBC.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
+            houseResourceProfileGraph.setJyArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.ZY.getCode() || x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.GK.getCode() || x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.ZYZY.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
             houseResourceProfileGraph.setAreaTotal(v.stream().map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
             houseResourceProfileGraph.setHouseResources(v.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
             resourceProfileGraphList.add(houseResourceProfileGraph);
@@ -322,7 +320,6 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                         result = result.stream().filter(x -> StringUtils.hasText(x.getWgName())).filter(x -> x.getWgName().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
                     }
                 } else {
-
                     if (StringUtils.hasText(query.getFourOrHouseNumber())) {
                         collect = collect.stream().filter(x -> StringUtils.hasText(x.getHouseNumber())).filter(x -> x.getHouseNumber().contains(query.getFourOrHouseNumber()) || x.getFour().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
                     }
@@ -333,9 +330,8 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 }
             }
             result.forEach(x -> {
-                if (Objects.nonNull(x.getJzArea()) && Objects.nonNull(x.getKzArea())) {
-                    x.setJyArea(x.getJzArea().subtract(x.getKzArea()));
-                }
+                x.setJyArea(x.getHouseResources().stream().filter(y -> y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.ZY.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.ZYZY.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.GK.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
+                x.setKzArea(x.getHouseResources().stream().filter(y -> y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.SBC.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
             });
             return result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getPosition, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
         }