fix: 平台端小程序机构统计设备列表

server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderCenterWechatServiceImpl.java

@@ -231,12 +231,37 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
         }
         }
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime start = now.minusSeconds(10);
         LocalDateTime start = now.minusSeconds(10);
+
+        List<PlatRoomBedDevice> platRoomDevices = platRoomBedDeviceService.list(new QueryWrapper<PlatRoomBedDevice>().lambda()
+                .in(PlatRoomBedDevice::getRoomId, roomIds)
+                .isNull(PlatRoomBedDevice::getBedId));
+        List<PlatRoomBedDevice> platBedDevices = platRoomBedDeviceService.list(new QueryWrapper<PlatRoomBedDevice>().lambda()
+                .in(PlatRoomBedDevice::getRoomId, roomIds)
+                .isNotNull(PlatRoomBedDevice::getBedId));
+        Map<String, List<PlatRoomBedDevice>> roomDeviceMap = StreamUtil.groupBy(platRoomDevices, PlatRoomBedDevice::getRoomId);
+        Map<String, PlatRoomBedDevice> bedDeviceMap = StreamUtil.toMap(platBedDevices, PlatRoomBedDevice::getBedId);
+
+        List<PlatDevice> platDeviceList = platDeviceService.list();
+        Map<String, PlatDevice> deviceMap = StreamUtil.toMap(platDeviceList, BaseEntity::getId);
+
         for (WorkStationInstitutionRoomVO vo : roomVOList) {
         for (WorkStationInstitutionRoomVO vo : roomVOList) {
             vo.setPathName(vo.getPathName() + "-" + vo.getRoomName());
             vo.setPathName(vo.getPathName() + "-" + vo.getRoomName());
             if (bedMap.get(vo.getRoomId()) != null) {
             if (bedMap.get(vo.getRoomId()) != null) {
                 List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(vo.getRoomId());
                 List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(vo.getRoomId());
                 //获取告警类型及老人状态
                 //获取告警类型及老人状态
                 for(WorkStationInstitutionBedVO r : roomBedVos) {
                 for(WorkStationInstitutionBedVO r : roomBedVos) {
+                    List<PlatDevice> deviceList = Lists.newArrayList();
+                    List<PlatRoomBedDevice> platRoomBedDevices = roomDeviceMap.get(r.getRoomId());
+                    if (CollectionUtils.isNotEmpty(platRoomBedDevices)) {
+                        List<String> tempDeviceIdList = StreamUtil.map(platRoomBedDevices, PlatRoomBedDevice::getDeviceId);
+                        for (String s : tempDeviceIdList) {
+                            PlatDevice platDevice = deviceMap.get(s);
+                            if (platDevice != null) {
+                                deviceList.add(platDevice);
+                            }
+                        }
+                    }
+
                     if (StringUtil.isNotEmpty(r.getElderId())) {
                     if (StringUtil.isNotEmpty(r.getElderId())) {
                         if (elderAlarmTypeMap.containsKey(r.getElderId())) {
                         if (elderAlarmTypeMap.containsKey(r.getElderId())) {
                             r.setAlarmTypeMap(elderAlarmTypeMap.get(r.getElderId()));
                             r.setAlarmTypeMap(elderAlarmTypeMap.get(r.getElderId()));
@@ -247,7 +272,15 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
 
 
                         PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
                         PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
                         r.setElderStatus(realTimeNowVO.getStatus());
                         r.setElderStatus(realTimeNowVO.getStatus());
+                        PlatRoomBedDevice platRoomBedDevice = bedDeviceMap.get(r.getBedId());
+                        if (platRoomBedDevice != null) {
+                            PlatDevice platDevice = deviceMap.get(platRoomBedDevice.getDeviceId());
+                            if (platDevice != null) {
+                                deviceList.add(platDevice);
+                            }
+                        }
                     }
                     }
+                    r.setDeviceList(deviceList);
                 }
                 }
                 vo.setList(roomBedVos);
                 vo.setList(roomBedVos);
             }
             }