feat: 房源

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

@@ -304,6 +304,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 houseResourceProfileGraph.setId(gridRegion.getWgCode());
                 houseResourceProfileGraph.setWgName(gridRegion.getWgName());
                 houseResourceProfileGraph.setPosition(gridRegion.getPosition());
+                if (Objects.nonNull(gridRegion.getJzArea())) {
+                    houseResourceProfileGraph.setJzArea(new BigDecimal(gridRegion.getJzArea()));
+                }
                 List<HouseResource> collect = houseResources.stream().filter(x -> x.getFour().equals(gridRegion.getWgCode())).collect(Collectors.toList());
                 if (CollectionUtils.isEmpty(collect)) {
                     houseResourceProfileGraph.setHouseResources(Collections.emptyList());
@@ -327,6 +330,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                     }
                 }
             }
+            result.forEach(x -> x.setJyArea(x.getHouseResources().stream().map(HouseResourcePage::getHouseArea).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)));
             return result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getPosition, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
         }
         return Collections.emptyList();