Merge branch 'dev' of git.xmmakeit.com:huangjiay/iot-platform-server into dev

server-module/src/main/java/com/makeit/module/controller/wechat/space/PlatSpaceWechatController.java

@@ -75,4 +75,11 @@ public class PlatSpaceWechatController {
         return ApiResponseUtils.success(data);
         return ApiResponseUtils.success(data);
     }
     }
 
 
+    @ApiOperation("树-上级空间")
+    @PostMapping("parentListTree")
+    public ApiResponseEntity<List<PlatSpaceVO>> parentListTree(@RequestBody PlatSpaceQueryDTO dto) {
+        List<PlatSpaceVO> data = spaceService.parentListTree(dto);
+        return ApiResponseUtils.success(data);
+    }
+
 }
 }

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

@@ -41,6 +41,12 @@ public class WorkStationHomeBedVO {
     @ApiModelProperty(value = "长者id")
     @ApiModelProperty(value = "长者id")
     private String elderId;
     private String elderId;
 
 
+    @ApiModelProperty(value = "头像文件id")
+    private String avatar;
+
+    @ApiModelProperty(value = "头像文件路径")
+    private String avatarPath;
+
     @ApiModelProperty(value = "长者姓名")
     @ApiModelProperty(value = "长者姓名")
     private String elderName;
     private String elderName;
 
 

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

@@ -66,12 +66,13 @@
     </select>
     </select>
 
 
     <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
     <select id="selectByCondition" 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
+        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
         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
         <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 != ''">
@@ -122,12 +123,13 @@
     </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
+        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
         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
         <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 != ''">