pref: 消防建筑建筑左侧公司建筑树查询接口性能优化

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -64,6 +64,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 
@@ -541,12 +542,14 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     private List<BuildingTreeVo> getBuildingTreeVos(Boolean isContainRootNode, String bizOrgCode) {
-        FormGroup formGroup = iFormGroupService.getByUniqueKey(GroupCodeEnum.ALL_BUILDING.getGroupCode());
-        List<Map<String, Object>> allList = iFormInstanceService.getSpecialChildrenList(null, bizOrgCode);
-        List<BuildingTreeVo> allListVo = buildBuildingData(formGroup, allList, isContainRootNode);
-        Map<Long, String> absolutePositionMap = getBuildingAbsolutePosition(allListVo);
-        allListVo.forEach(s -> s.setAbsolutePosition(absolutePositionMap.get(s.getId())));
-        return allListVo;
+        CompletableFuture<FormGroup> formGroupFuture = CompletableFuture.supplyAsync(() -> iFormGroupService.getByUniqueKey(GroupCodeEnum.ALL_BUILDING.getGroupCode()));
+        CompletableFuture<List<Map<String, Object>> > allListFuture = CompletableFuture.supplyAsync(() -> iFormInstanceService.getSpecialChildrenList(null, bizOrgCode));
+        return CompletableFuture.allOf(formGroupFuture, allListFuture).thenApply(v -> {
+            List<BuildingTreeVo> allListVo = buildBuildingData(formGroupFuture.join(), allListFuture.join(), isContainRootNode);
+            Map<Long, String> absolutePositionMap = getBuildingAbsolutePosition(allListVo);
+            allListVo.forEach(s -> s.setAbsolutePosition(absolutePositionMap.get(s.getId())));
+            return allListVo;
+        }).join();
     }
 
 
@@ -1309,10 +1312,16 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Override
     public Map<Long, String> getBuildingAbsolutePosition() {
-        FormGroup formGroup = iFormGroupService.getByUniqueKey(GroupCodeEnum.ALL_BUILDING.getGroupCode());
-        List<Map<String, Object>> allList = iFormInstanceService.getSpecialChildrenList(null, null);
-        List<BuildingTreeVo> allListVo = buildBuildingData(formGroup, allList, true);
-        return getBuildingAbsolutePosition(allListVo);
+        CompletableFuture<FormGroup> formGroupCompletableFuture = CompletableFuture.supplyAsync(() ->
+                iFormGroupService.getByUniqueKey(GroupCodeEnum.ALL_BUILDING.getGroupCode())
+        );
+        CompletableFuture<List<Map<String, Object>>> allListCompletableFuture = CompletableFuture.supplyAsync(() ->
+                iFormInstanceService.getSpecialChildrenList(null, null)
+        );
+        return formGroupCompletableFuture.thenCombine(allListCompletableFuture, (formGroup, allList) -> {
+            List<BuildingTreeVo> allListVo = buildBuildingData(formGroup, allList, true);
+            return getBuildingAbsolutePosition(allListVo);
+        }).join();
     }
 
     @Override
@@ -1418,23 +1427,25 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //1.组装数据
         List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(authKey, type,"building");
         //2.list to tree
-        List<BuildingTreeVo> buildingTreeVos = companyBuildingList.stream().filter(a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))).collect(Collectors.toList());
+        List<BuildingTreeVo> buildingTreeVos = companyBuildingList.parallelStream()
+                .filter(
+                        a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))
+                ).peek(
+                        b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))
+                ).collect(Collectors.toList());
         // 任务 7481
-        if(buildingTreeVos.size() == 1 && buildingTreeVos.get(0).getChildren().size() > 0) {
-            List<BuildingTreeVo> buildingTreeVosNew = buildingTreeVos.get(0).getChildren().stream().sorted(new Comparator<BuildingTreeVo>() {
-                @Override
-                public int compare(BuildingTreeVo o1, BuildingTreeVo o2) {
-                    if(o1.getGroupType().equals(o2.getGroupType())) {
-                        return 0;
-                    }
-                    if(o1.getGroupType().equals("building")  ) {
-                        return -1;
-                    }
-                    if(o2.getGroupType().equals("building") ) {
-                        return 1;
-                    }
+        if(buildingTreeVos.size() == 1 && !CollectionUtils.isEmpty(buildingTreeVos.get(0).getChildren())) {
+            List<BuildingTreeVo> buildingTreeVosNew = buildingTreeVos.get(0).getChildren().stream().sorted((o1, o2) -> {
+                if(o1.getGroupType().equals(o2.getGroupType())) {
                     return 0;
                 }
+                if(o1.getGroupType().equals("building")  ) {
+                    return -1;
+                }
+                if(o2.getGroupType().equals("building") ) {
+                    return 1;
+                }
+                return 0;
             }).collect(Collectors.toList());
             buildingTreeVos.get(0).setChildren(buildingTreeVosNew);
         }
@@ -1676,7 +1687,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     private List<BuildingTreeVo> getCompanyBuildingChildrenTree(String parentId, List<BuildingTreeVo> all) {
-        return all.stream().filter(a -> parentId.equals(a.getParentId())).peek(a -> {
+        return all.parallelStream().filter(a -> parentId.equals(a.getParentId())).peek(a -> {
             a.setChildren(getCompanyBuildingChildrenTree(a.getId().toString(), all));
         }).collect(Collectors.toList());
     }