代码调整

server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java

@@ -172,12 +172,10 @@ public class WorkStationServiceImpl implements WorkStationService {
             e.setPathName(StreamUtil.join(l, Objects::nonNull, PlatSpace::getName, "-"));
         });
 
-        for (WorkStationInstitutionRoomVO roomVo : roomVOList) {
-            WorkStationInstitutionRoomVO vo = new WorkStationInstitutionRoomVO();
-            vo.setRoomId(roomVo.getRoomId());
+        for (WorkStationInstitutionRoomVO vo : roomVOList) {
             vo.setPathName(vo.getPathName() + "-" + vo.getRoomName());
-            if (bedMap.get(roomVo.getRoomId()) != null) {
-                List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(roomVo.getRoomId());
+            if (bedMap.get(vo.getRoomId()) != null) {
+                List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(vo.getRoomId());
                 //获取告警类型及老人状态
                 roomBedVos.forEach(r -> {
                     if (StringUtil.isNotEmpty(r.getElderId()) ) {

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

@@ -156,12 +156,10 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
         //长者对应的报警类型
         Map<String, Map<String,List<String>>> elderAlarmTypeMap = workStationService.mapElderAlarmType(alarmRecords);
 
-        for (WorkStationInstitutionRoomVO roomVo : roomVOList) {
-            WorkStationInstitutionRoomVO vo = new WorkStationInstitutionRoomVO();
-            vo.setRoomId(roomVo.getRoomId());
+        for (WorkStationInstitutionRoomVO vo : roomVOList) {
             vo.setPathName(vo.getPathName() + "-" + vo.getRoomName());
-            if (bedMap.get(roomVo.getRoomId()) != null) {
-                List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(roomVo.getRoomId());
+            if (bedMap.get(vo.getRoomId()) != null) {
+                List<WorkStationInstitutionBedVO> roomBedVos = bedMap.get(vo.getRoomId());
                 //获取告警类型及老人状态
                 roomBedVos.forEach(r -> {
                     if (StringUtil.isNotEmpty(r.getElderId()) ) {

server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationInstitutionBedVO.java

@@ -27,7 +27,7 @@ public class WorkStationInstitutionBedVO {
     private String roomId;
 
     @ApiModelProperty(value = "状态")
-    private String stauts;
+    private String status;
 
     @ApiModelProperty(value = "长者id")
     private String elderId;

server-service/src/main/resources/mappers/PlatBedMapper.xml

@@ -50,12 +50,12 @@
     </select>
 
     <select id="selectByRoomIds" resultType="com.makeit.vo.platform.workstation.WorkStationInstitutionBedVO">
-        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id as roomId , pe.id as elderId, pb.name as elderName, prbd.device_id as deviceId
+        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id as roomId , pe.id as elderId, pb.name as elderName, prbd.device_id as deviceId,pb.status
         FROM plat_bed pb
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id
         <where>
-            pb.del_flag = 0 and pe.del_flag = 0 and prbd.del_flag = 0
+            pb.del_flag = 0
             <if test="roomIds != null and roomIds.size() > 0 ">
                 AND pb.room_id IN
                 <foreach collection="roomIds" item="item" separator="," open="(" close=")" index="">