feat: 房源

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

@@ -276,6 +276,11 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         collect.forEach((k, v) -> {
             HouseResourceProfileGraph houseResourceProfileGraph = new HouseResourceProfileGraph();
             houseResourceProfileGraph.setId(k);
+            if (!CollectionUtils.isEmpty(v)) {
+                if (Objects.nonNull(v.get(0).getHouseArea())) {
+                    houseResourceProfileGraph.setAreaTotal(v.get(0).getHouseArea());
+                }
+            }
             GridRegion gridRegion = gridRegionMapper.getWgLevel(k);
             if (Objects.nonNull(gridRegion)) {
                 houseResourceProfileGraph.setWgName(gridRegion.getWgName());
@@ -289,7 +294,6 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             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() || 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);
         });
@@ -332,7 +336,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             result.forEach(x -> {
                 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));
-                x.setKzCount(x.getHouseResources().stream().filter(y -> y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.SBC.getCode()).map(HouseResourcePage::getHouseArea).count());
+                x.setKzCount(x.getHouseResources().stream().filter(y -> y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.SBC.getCode()).count());
             });
             return result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getPosition, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
         }