Merge branch 'dev-lx' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -59,6 +59,11 @@ public class HouseResourceController {
         return AjaxResult.success(houseResourceService.profileGraphHouseResources(query));
     }
 
+    @GetMapping("/app/profileGraph")
+    public AjaxResult getAppProfileGraphHouseResources(HouseResourcePageQuery query) {
+        return AjaxResult.success(houseResourceService.appProfileGraphHouseResources(query));
+    }
+
     @GetMapping("/list")
     public AjaxResult getListHouseResources(HouseResourcePageQuery query) {
         return AjaxResult.success(houseResourceService.listHouseResources(query));

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

@@ -22,6 +22,8 @@ public interface HouseResourceService {
 
     List<HouseResourceProfileGraph> profileGraphHouseResources(HouseResourcePageQuery query);
 
+    List<HouseResourceProfileGraph> appProfileGraphHouseResources(HouseResourcePageQuery query);
+
     List<HouseResourcePage> listHouseResources(HouseResourcePageQuery query);
 
     BusinessEntityStatisticsDetail businessEntityStatistics(HouseResourcePageQuery query);

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

@@ -239,6 +239,38 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         return resourceProfileGraphList.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());
     }
 
+    @Override
+    public List<HouseResourceProfileGraph> appProfileGraphHouseResources(HouseResourcePageQuery query) {
+        GridRegionExample gridRegionExample = new GridRegionExample();
+        gridRegionExample.createCriteria().andWgParentIdEqualTo(query.getThree()).andLevelEqualTo("4");
+        List<GridRegion> fourList = gridRegionMapper.selectByExample(gridRegionExample);
+        if (!CollectionUtils.isEmpty(fourList)) {
+            List<HouseResourceProfileGraph> result = new ArrayList<>();
+            List<HouseResource> houseResources = houseResourceMapper.selectAll();
+            for (GridRegion gridRegion : fourList) {
+                HouseResourceProfileGraph houseResourceProfileGraph = new HouseResourceProfileGraph();
+                houseResourceProfileGraph.setId(gridRegion.getWgCode());
+                houseResourceProfileGraph.setWgName(gridRegion.getWgName());
+                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);
+                } else {
+                    List<HouseResourcePage> pageList = new ArrayList<>();
+                    for (HouseResource houseResource : collect) {
+                        HouseResourcePage houseResourcePage = new HouseResourcePage();
+                        BeanUtils.copyProperties(houseResource, houseResourcePage);
+                        pageList.add(houseResourcePage);
+                    }
+                    houseResourceProfileGraph.setHouseResources(handleHouseList(pageList));
+                    result.add(houseResourceProfileGraph);
+                }
+            }
+            return result;
+        }
+        return Collections.emptyList();
+    }
+
     @Override
     public List<HouseResourcePage> listHouseResources(HouseResourcePageQuery query) {
         List<HouseResourcePage> list = houseResourceMapper.selectList(query);