工作台老人状态

server-service/src/main/java/com/makeit/enums/platform/workstation/WorkStationStatusEnum.java

+package com.makeit.enums.platform.workstation;
+
+import com.makeit.enums.BaseEnum;
+import com.makeit.utils.sys.SysDictUtil;
+
+public class WorkStationStatusEnum {
+    public enum NowStatus implements BaseEnum {
+        OUT("work.station.now.status.out"),
+        TURNED("work.station.now.status.turned"),
+        REST("work.station.now.status.rest"),
+        SLEEP("work.station.now.status.sleep");
+
+        private String code;
+
+        NowStatus(String code) {
+            this.code = code;
+        }
+
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+}

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

@@ -53,6 +53,9 @@ public class WorkStationHomeBedVO {
     @ApiModelProperty(value = "设备id")
     @ApiModelProperty(value = "设备id")
     private String deviceId;
     private String deviceId;
 
 
+    @ApiModelProperty(value = "原始设备id")
+    private String oriDeviceId;
+
     @ApiModelProperty(value = "长者状态")
     @ApiModelProperty(value = "长者状态")
     private String elderStatus;
     private String elderStatus;
 
 

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

@@ -38,6 +38,9 @@ public class WorkStationInstitutionBedVO {
     @ApiModelProperty(value = "设备id")
     @ApiModelProperty(value = "设备id")
     private String deviceId;
     private String deviceId;
 
 
+    @ApiModelProperty(value = "设备id")
+    private String oriDeviceId;
+
     @ApiModelProperty(value = "长者状态")
     @ApiModelProperty(value = "长者状态")
     private String elderStatus;
     private String elderStatus;
 
 

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

@@ -50,10 +50,11 @@
     </select>
     </select>
 
 
     <select id="selectByRoomIds" resultType="com.makeit.vo.platform.workstation.WorkStationInstitutionBedVO">
     <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, pe.name as elderName, prbd.device_id as deviceId,pb.status
+        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id as roomId , pe.id as elderId, pe.name as elderName, prbd.device_id as deviceId,pb.status,pd.ori_device_id as oriDeviceId
         FROM plat_bed pb
         FROM plat_bed pb
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id and pe.del_flag = 0
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id and pe.del_flag = 0
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
+        LEFT JOIN plat_device pd ON prbd.device_id = pd.id and pd.del_flag = 0
         <where>
         <where>
             pb.del_flag = 0
             pb.del_flag = 0
             <if test="roomIds != null and roomIds.size() > 0 ">
             <if test="roomIds != null and roomIds.size() > 0 ">
@@ -123,13 +124,14 @@
     </select>
     </select>
 
 
     <select id="selectByConditionPage" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
     <select id="selectByConditionPage" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
-        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pe.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status,pe.avatar,sf.url as avatarPath
+        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pe.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status,pe.avatar,sf.url as avatarPath,pd.ori_device_id as oriDeviceId
         FROM plat_bed pb
         FROM plat_bed pb
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
         LEFT JOIN sys_file sf ON sf.id = pe.avatar
         LEFT JOIN sys_file sf ON sf.id = pe.avatar
+        LEFT JOIN plat_device pd ON pd.id = prbd.device_id and pd..del_flag = 0
         <where>
         <where>
             pb.del_flag = 0 and pb.status = 0
             pb.del_flag = 0 and pb.status = 0
             <if test="dto.elderName != null and dto.elderName != ''">
             <if test="dto.elderName != null and dto.elderName != ''">