Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java

@@ -19,6 +19,7 @@ import com.epmet.dto.IcMoveInRecordDTO;
 import com.epmet.dto.form.IcMoveInAddEditFormDTO;
 import com.epmet.dto.form.IcMoveInListFormDTO;
 import com.epmet.dto.form.IcResiUserTransferFormDTO;
+import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcMoveInListResultDTO;
 import com.epmet.dto.result.SyncResiResDTO;
@@ -74,7 +75,11 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
 
         //查询封装房屋信息
         if (!CollectionUtils.isEmpty(list)) {
-            Map<String, String> map = new HashMap<>();
+            //查询网格名称(组织-网格)
+            List<String> gridIds = list.stream().map(IcMoveInListResultDTO::getGridId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            Result<List<AllGridsByUserIdResultDTO>> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
+            List<AllGridsByUserIdResultDTO> gridInfoList = gridInfoRes.success() && !org.apache.commons.collections4.CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>();
+            Map<String, String> gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName, (key1, key2) -> key2));
             //查询房屋信息
             Set<String> houseIds = list.stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet());
             Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId());
@@ -86,12 +91,9 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
 
             //封装数据
             for (IcMoveInListResultDTO v : list) {
-                if (!map.containsKey(v.getGridId())) {
-                    //获取网格缓存信息
-                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(v.getGridId());
-                    map.put(v.getGridId(), (null == gridInfo || StringUtils.isEmpty(gridInfo.getGridName()) ? "" : gridInfo.getGridName()));
+                if (gridInfoMap.containsKey(v.getGridId())) {
+                    v.setGridName(gridInfoMap.get(v.getGridId()));
                 }
-                v.setGridName(map.get(v.getGridId()));
                 if (houseInfoMap.containsKey(v.getHomeId())) {
                     v.setVillageName(houseInfoMap.get(v.getHomeId()).getNeighborHoodName());
                     v.setBuildName(houseInfoMap.get(v.getHomeId()).getBuildingName());