feat: 设备呼叫筛选长者设备列表

562c6208 · huangjy · 84edb026 · 562c6208 · 562c6208 · 562c6208
Commit 562c6208 authored Dec 01, 2023 by huangjy
Showing with 95 additions and 23 deletions
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java
server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationInstitutionBedVO.java
server-web/src/main/resources/logback-spring.xml
--- a/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
@@ -219,7 +219,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
            return PageVO.emptyPage();
        }
        List<PlatRoomBedDevice> platRoomBedDevices = platRoomBedDeviceService.list(new QueryWrapper<PlatRoomBedDevice>().lambda()
-                .eq(PlatRoomBedDevice::getRoomId, platElder.getRoomId()));
+                .eq(PlatRoomBedDevice::getRoomId, platElder.getRoomId())
+                .isNull(PlatRoomBedDevice::getBedId));
+        if (StringUtils.isNotEmpty(platElder.getBedId())) {
+            PlatRoomBedDevice bedDeviceServiceOne = platRoomBedDeviceService.getOne(new QueryWrapper<PlatRoomBedDevice>().lambda()
+                    .eq(PlatRoomBedDevice::getBedId, platElder.getBedId()));
+            if (bedDeviceServiceOne != null) {
+                platRoomBedDevices.add(bedDeviceServiceOne);
+            }
+        }
        if (CollectionUtils.isEmpty(platRoomBedDevices)) {
            return PageVO.emptyPage();
        }

--- a/server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
@@ -2,6 +2,7 @@ package com.makeit.service.platform.workstation.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
@@ -14,6 +15,7 @@ import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.space.PlatBed;
+import com.makeit.entity.platform.space.PlatRoomBedDevice;
 import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.entity.saas.analysis.SaasModelManage;
 import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
@@ -29,10 +31,12 @@ import com.makeit.module.iot.service.IotProductDeviceService;
 import com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.auth.PlatOrgService;
+import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.elder.PlatElderDayReportDayService;
 import com.makeit.service.platform.elder.PlatElderRealTimeService;
 import com.makeit.service.platform.elder.PlatElderService;
 import com.makeit.service.platform.space.PlatBedService;
+import com.makeit.service.platform.space.PlatRoomBedDeviceService;
 import com.makeit.service.platform.space.PlatRoomService;
 import com.makeit.service.platform.space.PlatSpaceService;
 import com.makeit.service.platform.workstation.WorkStationService;
@@ -91,7 +95,9 @@ public class WorkStationServiceImpl implements WorkStationService {
    @Autowired
    private IotProductDeviceService iotProductDeviceService;
    @Autowired
-    private ShengwangService shengwangService;
+    private PlatRoomBedDeviceService platRoomBedDeviceService;
+    @Autowired
+    private PlatDeviceService platDeviceService;
    @Override
    public WorkStationInstitutionStatisticsVO institutionStatistics(WorkStationQueryDTO dto) {
@@ -260,25 +266,57 @@ public class WorkStationServiceImpl implements WorkStationService {
        }
        LocalDateTime now = LocalDateTime.now();
        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) {
            vo.setPathName(vo.getPathName() + "-" + vo.getRoomName());
+            List<PlatDevice> deviceList = Lists.newArrayList();
            if (bedMap.get(vo.getRoomId()) != null) {
                List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(vo.getRoomId());
                //获取告警类型及老人状态
                for(WorkStationInstitutionBedVO r : roomBedVos){
+                    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(elderAlarmTypeMap.containsKey(r.getElderId())){
                            r.setAlarmTypeMap(elderAlarmTypeMap.get(r.getElderId()));
                        }
                        PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO();
                        platElderIdDTO.setElderId(r.getElderId());
                        PlatElderRealTimeHeartRespiratoryVO heartRespiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO);
                        r.setElderStatus(heartRespiratoryVO.getStatus());
-                        if (StringUtil.isNotEmpty(heartRespiratoryVO.getDeviceId())) {
-                            PlatAlarmCallDeviceVO platAlarmCallDeviceVO = shengwangService.callingDeviceAuthIgnoreRtc(heartRespiratoryVO.getDeviceId());
+                        PlatRoomBedDevice platRoomBedDevice = bedDeviceMap.get(r.getBedId());
-                            r.setPlatAlarmCallDeviceVO(platAlarmCallDeviceVO);
+                        if (platRoomBedDevice != null) {
+                            PlatDevice platDevice = deviceMap.get(platRoomBedDevice.getDeviceId());
+                            if (platDevice != null) {
+                                deviceList.add(platDevice);
+                            }
                        }
                    }
+                    r.setDeviceList(deviceList);
                }
                vo.setList(roomBedVos);
@@ -536,6 +574,8 @@ public class WorkStationServiceImpl implements WorkStationService {
                new Page<>(page.getPage(),page.getLimit()), page.getData());
        List<WorkStationHomeBedVO> list = pages.getRecords();
+        List<String> roomIds = list.stream().map(WorkStationHomeBedVO::getRoomId).collect(Collectors.toList());
        JoinUtil.joinSplit(list, platSpaceService, WorkStationHomeBedVO::getSpacePath, PlatSpace::getId, (e, l) -> {
            e.setPathName(StreamUtil.join(l, Objects::nonNull, PlatSpace::getName, "-"));
        });
@@ -544,8 +584,33 @@ public class WorkStationServiceImpl implements WorkStationService {
            e.setAvatarPath(f.getFullUrl());
        });
+        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<String> deviceIdList = StreamUtil.map(platRoomDevices, PlatRoomBedDevice::getDeviceId);
+        List<PlatDevice> platDeviceList = platDeviceService.list();
+        Map<String, PlatDevice> deviceMap = StreamUtil.toMap(platDeviceList, BaseEntity::getId);
        for(WorkStationHomeBedVO vo : list){
            vo.setPathName(vo.getPathName() + "-" + vo.getRoomName());
+            List<PlatDevice> deviceList = Lists.newArrayList();
+            List<PlatRoomBedDevice> platRoomBedDevices = roomDeviceMap.get(vo.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(vo.getElderId()) ) {
                if(elderAlarmTypeMap.containsKey(vo.getElderId())){
                    vo.setAlarmTypeMap(elderAlarmTypeMap.get(vo.getElderId()));
@@ -554,14 +619,21 @@ public class WorkStationServiceImpl implements WorkStationService {
                PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO();
                platElderIdDTO.setElderId(vo.getElderId());
                PlatElderRealTimeHeartRespiratoryVO respiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO);
-                if (StringUtil.isNotEmpty(respiratoryVO.getDeviceId())) {
-                    PlatAlarmCallDeviceVO platAlarmCallDeviceVO = shengwangService.callingDeviceAuthIgnoreRtc(respiratoryVO.getDeviceId());
-                    vo.setPlatAlarmCallDeviceVO(platAlarmCallDeviceVO);
-                }
                vo.setElderStatus(respiratoryVO.getStatus());
                vo.setHeartRate(respiratoryVO.getHeartRate());
                vo.setRespiratoryRate(respiratoryVO.getRespiratoryRate());
+                PlatRoomBedDevice platRoomBedDevice = bedDeviceMap.get(vo.getBedId());
+                if (platRoomBedDevice != null) {
+                    PlatDevice platDevice = deviceMap.get(platRoomBedDevice.getDeviceId());
+                    if (platDevice != null) {
+                        deviceList.add(platDevice);
+                    }
+                }
+                vo.setDeviceList(deviceList);
            }
        }
        return PageUtil.toPageVO(pages);

--- a/server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java
+++ b/server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java
 package com.makeit.vo.platform.workstation;
+import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -65,8 +66,8 @@ public class WorkStationHomeBedVO {
    @ApiModelProperty("呼吸率")
    private Integer respiratoryRate;
-    @ApiModelProperty("设备呼叫信息")
+    @ApiModelProperty("设备列表")
-    private PlatAlarmCallDeviceVO platAlarmCallDeviceVO;
+    private List<PlatDevice> deviceList;
    @ApiModelProperty(value = "告警类型")
    private Map<String,String> alarmTypeMap;

--- a/server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationInstitutionBedVO.java
+++ b/server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationInstitutionBedVO.java
 package com.makeit.vo.platform.workstation;
+import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,8 +45,8 @@ public class WorkStationInstitutionBedVO {
    @ApiModelProperty(value = "长者状态")
    private String elderStatus;
-    @ApiModelProperty("设备呼叫信息")
+    @ApiModelProperty("设备列表")
-    private PlatAlarmCallDeviceVO platAlarmCallDeviceVO;
+    private List<PlatDevice> deviceList;
    @ApiModelProperty(value = "告警类型")
    private Map<String,String> alarmTypeMap;
 }
--- a/server-web/src/main/resources/logback-spring.xml
+++ b/server-web/src/main/resources/logback-spring.xml
@@ -7,11 +7,6 @@
    <property name="pattern"
              value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{appName}] [%X{profile}] [%X{traceId:-},%X{spanId:-}] [%X{requestId}] [%X{userId}] [%thread] %-5level %logger{50} - %msg%n"/>
-    <springProfile name="dev">
-        <property name="logback.logdir" value="/home/group1_lzy/iot-server/logs"/>
-        <property name="logback.appname" value="app"/>
-    </springProfile>
    <springProfile name="prod">
        <property name="logback.logdir" value="/home/group1_lzy/iot-server/logs"/>
        <property name="logback.appname" value="app"/>
@@ -132,11 +127,6 @@
            <appender-ref ref="FILEERRORLOG"/>
            <appender-ref ref="FILEWARNLOG"/>
        </logger>
-        <logger name="com.makeit" level="ERROR" additivity="false">
-            <appender-ref ref="FILEINFOLOG"/>
-            <appender-ref ref="FILEERRORLOG"/>
-            <appender-ref ref="FILEWARNLOG"/>
-        </logger>
    </springProfile>
    <springProfile name="test">