feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public interface GridRegionMapper {
     long countByExample(GridRegionExample example);
@@ -98,4 +100,6 @@ public interface GridRegionMapper {
     GridRegion selectByWgName(@Param("wgName") String wgName);
 
     List<GridRegion> getAllLevelThree(@Param("wgCodeLikes")List<String> wgCodeLikes, @Param("wgType")String wgType, @Param("name") String name);
+
+    List<GridRegion> selectByCodes(@Param("codes") Set<String> codes);
 }

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

@@ -28,11 +28,16 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @Service
 public class HouseResourceServiceImpl implements HouseResourceService {
 
+    private static final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
+
     private final HouseResourceMapper houseResourceMapper;
 
     private final BusinessEntityInfoMapper businessEntityInfoMapper;
@@ -411,7 +416,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
         businessEntityStatisticsDetail.setXsCount(list.stream().map(HouseResourcePage::getIncome).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         businessEntityStatisticsDetail.setSsCount(list.stream().map(HouseResourcePage::getTaxCount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-        businessEntityStatisticsDetail.setGsCount(list.stream().filter(x -> x.getGs().equals(Boolean.TRUE)).count());
+        businessEntityStatisticsDetail.setGsCount(list.stream().filter(x -> Objects.nonNull(x.getGs())).filter(x -> x.getGs().equals(Boolean.TRUE)).count());
 
         List<String> houseResourceIds = list.stream().map(HouseResourcePage::getId).collect(Collectors.toList());
         List<HouseResourceBusinessEntityInfoMapping> houseResourceMappings = houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceIds(houseResourceIds);
@@ -547,45 +552,72 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list, boolean houseNumberSortFlag) {
-        list.parallelStream().forEach(x -> {
-            GridRegionExample twoExample = new GridRegionExample();
-            twoExample.createCriteria().andWgTypeEqualTo(String.valueOf(x.getType())).andWgCodeEqualTo(x.getTwo());
-            List<GridRegion> two = gridRegionMapper.selectByExample(twoExample);
-            if (!CollectionUtils.isEmpty(two)) {
-                x.setWgName2(two.get(0).getWgName());
-            }
-            GridRegionExample threeExample = new GridRegionExample();
-            threeExample.createCriteria().andWgTypeEqualTo(String.valueOf(x.getType())).andWgCodeEqualTo(x.getThree());
-            List<GridRegion> three = gridRegionMapper.selectByExample(threeExample);
-            if (!CollectionUtils.isEmpty(three)) {
-                x.setWgName3(three.get(0).getWgName());
-            }
-            if (!StringUtils.hasText(x.getWgName4())) {
-                GridRegionExample fourExample = new GridRegionExample();
-                fourExample.createCriteria().andWgTypeEqualTo(String.valueOf(x.getType())).andWgCodeEqualTo(x.getFour());
-                List<GridRegion> four = gridRegionMapper.selectByExample(fourExample);
-                if (!CollectionUtils.isEmpty(four)) {
-                    x.setWgName4(four.get(0).getWgName());
-                }
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+
+        CompletableFuture<Set<String>> twoCodesFuture = CompletableFuture.supplyAsync(() -> list.stream().map(HouseResourcePage::getTwo).collect(Collectors.toSet()), executor);
+        CompletableFuture<Set<String>> threeCodesFuture = CompletableFuture.supplyAsync(() -> list.stream().map(HouseResourcePage::getThree).collect(Collectors.toSet()), executor);
+        CompletableFuture<Set<String>> fourCodesFuture = CompletableFuture.supplyAsync(() -> list.stream().map(HouseResourcePage::getFour).collect(Collectors.toSet()), executor);
+        CompletableFuture<List<String>> idsFuture = CompletableFuture.supplyAsync(() -> list.stream().map(HouseResourcePage::getId).collect(Collectors.toList()), executor);
+
+        Set<String> twoCodes = twoCodesFuture.join();
+        Set<String> threeCodes = threeCodesFuture.join();
+        Set<String> fourCodes = fourCodesFuture.join();
+        List<String> ids = idsFuture.join();
+
+
+        CompletableFuture<Map<String, GridRegion>> twoMapFuture = CompletableFuture.supplyAsync(() -> gridRegionMapper.selectByCodes(twoCodes).stream().collect(Collectors.toMap(GridRegion::getWgCode, gridRegion -> gridRegion, (e, r) -> e)), executor);
+        CompletableFuture<Map<String, GridRegion>> threeMapFuture = CompletableFuture.supplyAsync(() -> gridRegionMapper.selectByCodes(threeCodes).stream().collect(Collectors.toMap(GridRegion::getWgCode, gridRegion -> gridRegion, (e, r) -> e)), executor);
+        CompletableFuture<Map<String, GridRegion>> fourMapFuture = CompletableFuture.supplyAsync(() -> gridRegionMapper.selectByCodes(fourCodes).stream().collect(Collectors.toMap(GridRegion::getWgCode, gridRegion -> gridRegion, (e, r) -> e)), executor);
+        CompletableFuture<Map<String, List<HouseResourceBusinessEntityInfoMapping>>> mappingMapFuture = CompletableFuture.supplyAsync(() -> houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceIds(ids).stream().collect(Collectors.groupingBy(HouseResourceBusinessEntityInfoMapping::getHouseResourceId)), executor);
+
+        Map<String, GridRegion> twoMap = twoMapFuture.join();
+        Map<String, GridRegion> threeMap = threeMapFuture.join();
+        Map<String, GridRegion> fourMap = fourMapFuture.join();
+        Map<String, List<HouseResourceBusinessEntityInfoMapping>> mappingMap = mappingMapFuture.join();
+
+        List<String> entityInfoIds = mappingMap.values().stream()
+                .flatMap(List::stream)
+                .map(HouseResourceBusinessEntityInfoMapping::getBusinessEntityInfoId)
+                .collect(Collectors.toList());
+
+        Map<String, List<BusinessEntityInfo>> entityInfoMap = businessEntityInfoMapper.selectByIdList(entityInfoIds)
+                .stream().collect(Collectors.groupingBy(BusinessEntityInfo::getId));
+
+        List<HouseResourcePage> result = list.parallelStream().map(x -> {
+            HouseResourcePage page = new HouseResourcePage();
+            BeanUtils.copyProperties(x, page);
+
+            GridRegion two = twoMap.get(page.getTwo());
+            if (two != null) page.setWgName2(two.getWgName());
+            GridRegion three = threeMap.get(page.getThree());
+            if (three != null) page.setWgName3(three.getWgName());
+            if (!StringUtils.hasText(page.getWgName4())) {
+                GridRegion four = fourMap.get(page.getFour());
+                if (four != null) page.setWgName4(four.getWgName());
             }
-            x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute()));
-            x.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(x.getHouseResourceType()));
-            x.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(x.getOrientation()));
-            x.setDecorationConditionText(HouseEnums.DecorationConditionEnum.getDescByCode(x.getDecorationCondition()));
-            x.setRentalUnitText(HouseEnums.RentalUnitEnum.getDescByCode(x.getRentalUnit()));
-            x.setHireStatusText(HouseEnums.hireStatusTextEnum.getDescByCode(x.getHireStatus()));
-            List<HouseResourceBusinessEntityInfoMapping> houseResourceBusinessEntityInfoMappings = houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceId(x.getId());
-            if (!CollectionUtils.isEmpty(houseResourceBusinessEntityInfoMappings)) {
-                List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectByIdList(houseResourceBusinessEntityInfoMappings.stream().map(HouseResourceBusinessEntityInfoMapping::getBusinessEntityInfoId).collect(Collectors.toList()));
-                if (!CollectionUtils.isEmpty(businessEntityInfos)) {
-                    x.setBusinessEntityInfoNames(businessEntityInfos.stream().map(BusinessEntityInfo::getName).collect(Collectors.toList()));
+            page.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(page.getHouseResourceAttribute()));
+            page.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(page.getHouseResourceType()));
+            page.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(page.getOrientation()));
+            page.setDecorationConditionText(HouseEnums.DecorationConditionEnum.getDescByCode(page.getDecorationCondition()));
+            page.setRentalUnitText(HouseEnums.RentalUnitEnum.getDescByCode(page.getRentalUnit()));
+            page.setHireStatusText(HouseEnums.hireStatusTextEnum.getDescByCode(page.getHireStatus()));
+            List<HouseResourceBusinessEntityInfoMapping> mappings = mappingMap.get(page.getId());
+            if (!CollectionUtils.isEmpty(mappings)) {
+                List<String> entityIds = mappings.stream().map(HouseResourceBusinessEntityInfoMapping::getBusinessEntityInfoId).collect(Collectors.toList());
+                List<BusinessEntityInfo> infos = entityIds.stream().map(entityInfoMap::get).filter(Objects::nonNull).flatMap(List::stream).collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(infos)) {
+                    page.setBusinessEntityInfoNames(infos.stream().map(BusinessEntityInfo::getName).collect(Collectors.toList()));
                 }
             }
-        });
+            return page;
+        }).collect(Collectors.toList());
+
         if (houseNumberSortFlag) {
-            return list.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
+            return result.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
         } else {
-            return list;
+            return result;
         }
     }
 

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -818,5 +818,13 @@
     and level = 3
     order by position asc
   </select>
-
+  <select id="selectByCodes" resultType="com.ruoyi.system.domain.grid.GridRegion">
+    SELECT *
+    FROM grid_region
+    WHERE is_valid = '1'
+    AND wg_code IN
+    <foreach collection="codes" item="code" open="(" separator="," close=")">
+      #{code}
+    </foreach>
+  </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -296,7 +296,8 @@
         t4.industry_classification,
         ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice,
         t4.name,
-        t5.year
+        t5.year,
+        t4.gs
         FROM
         house_resource t1
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four