feat: 房源

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

@@ -253,10 +253,14 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 HouseResourceProfileGraph houseResourceProfileGraph = new HouseResourceProfileGraph();
                 houseResourceProfileGraph.setId(gridRegion.getWgCode());
                 houseResourceProfileGraph.setWgName(gridRegion.getWgName());
+                houseResourceProfileGraph.setPosition(gridRegion.getPosition());
                 List<HouseResource> collect = houseResources.stream().filter(x -> x.getFour().equals(gridRegion.getWgCode())).collect(Collectors.toList());
                 if (CollectionUtils.isEmpty(collect)) {
                     houseResourceProfileGraph.setHouseResources(Collections.emptyList());
                     result.add(houseResourceProfileGraph);
+                    if (StringUtils.hasText(query.getFourOrHouseNumber())) {
+                        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) {
@@ -265,16 +269,15 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                         pageList.add(houseResourcePage);
                     }
                     if (StringUtils.hasText(query.getFourOrHouseNumber())) {
-                        pageList = pageList.stream().filter(x -> StringUtils.hasText(x.getHouseNumber())).filter(x -> x.getHouseNumber().equals(query.getFourOrHouseNumber()) || x.getFour().equals(query.getFourOrHouseNumber())).collect(Collectors.toList());
+                        pageList = pageList.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));
                         result.add(houseResourceProfileGraph);
-                        result = result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());
                     }
                 }
             }
-            return result;
+            return result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getPosition, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
         }
         return Collections.emptyList();
     }