商管-设备列表-点位区域信息反显

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -1948,6 +1948,26 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     }
                 });
             }
+            List<Long> placeIds = records.stream().filter(s -> s.getPlaceId() != null).map(DeviceInfoDto.Vo2::getPlaceId).distinct().collect(Collectors.toList());
+
+            List<MercPlaceDto.Vo> merPlaceList = R.feignCheckData(mercPlaceService.list(new MercPlaceDto.ListDto().setIds(placeIds)));
+            if (Emptys.check(merPlaceList)) {
+                Map<Long, MercPlaceDto.Vo> placeMap = merPlaceList.stream().collect(Collectors.toMap(MercPlaceDto.Vo::getId, p -> p));
+
+                for (DeviceInfoDto.Vo2 record : records) {
+                    Long placeId = record.getPlaceId();
+                    if (placeId == null) {
+                        continue;
+                    }
+                    // 点位 区域 反显
+                    MercPlaceDto.Vo placeVo = placeMap.get(placeId);
+                    if (placeVo != null) {
+                        record.setDistrictName(placeVo.getRegionName());
+//                        record.setPlaceName(placeVo.getPlaceName());
+                    }
+                }
+                pageBean.setRecords(records);
+            }
         }
         return pageBean;
     }