feat: 房源

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

@@ -286,7 +286,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                     houseResourceProfileGraph.setPosition(gridRegion.getPosition());
                 }
             }
-            houseResourceProfileGraph.setJyArea(v.stream().map(HouseResourcePage::getHouseArea).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+            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.setAreaTotal(v.stream().map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));