feat: 房源

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

@@ -305,7 +305,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         List<GridRegion> fourList = gridRegionMapper.selectByExample(gridRegionExample);
         if (!CollectionUtils.isEmpty(fourList)) {
             List<HouseResourceProfileGraph> result = new ArrayList<>();
-            List<HouseResource> houseResources = houseResourceMapper.selectAll();
+            List<HouseResourcePage> houseResources = houseResourceMapper.selectList(query);
             for (GridRegion gridRegion : fourList) {
                 HouseResourceProfileGraph houseResourceProfileGraph = new HouseResourceProfileGraph();
                 houseResourceProfileGraph.setId(gridRegion.getWgCode());
@@ -314,7 +314,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 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());
+                List<HouseResourcePage> collect = houseResources.stream().filter(x -> x.getFour().equals(gridRegion.getWgCode())).collect(Collectors.toList());
                 if (CollectionUtils.isEmpty(collect)) {
                     houseResourceProfileGraph.setHouseResources(Collections.emptyList());
                     result.add(houseResourceProfileGraph);
@@ -322,17 +322,12 @@ 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 {
-                    List<HouseResourcePage> pageList = new ArrayList<>();
-                    for (HouseResource houseResource : collect) {
-                        HouseResourcePage houseResourcePage = new HouseResourcePage();
-                        BeanUtils.copyProperties(houseResource, houseResourcePage);
-                        pageList.add(houseResourcePage);
-                    }
+
                     if (StringUtils.hasText(query.getFourOrHouseNumber())) {
-                        pageList = pageList.stream().filter(x -> StringUtils.hasText(x.getHouseNumber())).filter(x -> x.getHouseNumber().contains(query.getFourOrHouseNumber()) || x.getFour().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
+                        collect = collect.stream().filter(x -> StringUtils.hasText(x.getHouseNumber())).filter(x -> x.getHouseNumber().contains(query.getFourOrHouseNumber()) || x.getFour().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
                     }
-                    if (!CollectionUtils.isEmpty(pageList)) {
-                        houseResourceProfileGraph.setHouseResources(handleHouseList(pageList, true));
+                    if (!CollectionUtils.isEmpty(collect)) {
+                        houseResourceProfileGraph.setHouseResources(handleHouseList(collect, true));
                         result.add(houseResourceProfileGraph);
                     }
                 }