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

server-common/src/main/java/com/makeit/enums/BaseEnum.java

@@ -99,7 +99,7 @@ public interface BaseEnum {
     static BaseEnum getByValue(Class<? extends BaseEnum> emClazz, String value) {
         BaseEnum[] em = emClazz.getEnumConstants();
         for (BaseEnum e : em) {
-            if (e.getValue().equals(value)) {
+            if (StringUtils.equals(e.getValue(),value)) {
                 return e;
             }
         }

server-common/src/main/java/com/makeit/utils/msg/SendTypeEnum.java

@@ -9,9 +9,10 @@ import lombok.Getter;
 @Getter
 public enum SendTypeEnum implements BaseEnum {
     //1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单 6-子女端小程序
-    SMS("alarm.sendType.sms"),
-    MAIL("alarm.sendType.mail"),
-    VOICE_SMS("alarm.sendType.voiceSms"),
+    SMS("alarm.notifyChannel.sms"),
+    MAIL("alarm.notifyChannel.mail"),
+    VOICE_SMS("alarm.notifyChannel.voiceMessage"),
+    //todo 加字典
     YUNLING("alarm.sendType.yunling"),
     JINGQI("alarm.sendType.jingqi"),
     CHILD_WECHAT("alarm.sendType.childWechat")

server-common/src/main/java/com/makeit/utils/msg/dto/MsgSendDTO.java

@@ -5,11 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collection;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Data
 @Builder
@@ -30,8 +27,6 @@ public class MsgSendDTO {
      */
     private String[] param;
 
-    private String sendContent;
-
     public void setParam(String... param) {
         this.param = param;
     }

server-module/src/main/java/com/makeit/module/controller/dataScreen/DataScreenController.java

@@ -3,7 +3,9 @@ package com.makeit.module.controller.dataScreen;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
+import com.makeit.module.system.entity.ChinaArea;
 import com.makeit.service.platform.dataScreen.DataScreenService;
+import com.makeit.utils.area.ChinaAreaVO;
 import com.makeit.vo.platform.dataScreen.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -64,4 +66,11 @@ public class DataScreenController {
     public ApiResponseEntity<List<PlatMapStatisticsVO>> mapStatistics(@RequestBody PlatDataScreenQueryDTO dto) {
         return ApiResponseUtils.success(dataScreenService.mapStatistics(dto));
     }
+
+    @ApiOperation("地图区域")
+    @PostMapping("mapList")
+    public ApiResponseEntity<List<ChinaAreaVO>> mapList(@RequestBody PlatDataScreenQueryDTO dto) {
+        return ApiResponseUtils.success(dataScreenService.mapList(dto));
+    }
+
 }

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

+package com.makeit.module.controller.space;
+
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.elder.PlatElderIdDTO;
+import com.makeit.service.platform.elder.PlatElderRealTimeService;
+import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeBodyVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeNowVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Api(tags = "房间详情")
+@RestController
+@RequestMapping("/plat/room/dynamic/detail")
+public class PlatRoomDynamicDetailController {
+
+    @Autowired
+    private PlatElderRealTimeService platElderRealTimeService;
+
+    @ApiOperation("现在状态")
+    @PostMapping("nowStatus")
+    public ApiResponseEntity<PlatElderRealTimeNowVO> nowStatus(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderRealTimeService.nowStatus(platElderIdDTO));
+    }
+
+    @ApiOperation("心率呼吸率")
+    @PostMapping("heartRespiratory")
+    public ApiResponseEntity<PlatElderRealTimeHeartRespiratoryVO> heartRespiratory(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderRealTimeService.heartRespiratory(platElderIdDTO));
+    }
+
+    @ApiOperation("体动")
+    @PostMapping("body")
+    public ApiResponseEntity<PlatElderRealTimeBodyVO> body(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderRealTimeService.body(platElderIdDTO));
+    }
+
+    @ApiOperation("坐标")
+    @PostMapping("coordinate")
+    public ApiResponseEntity<List<PlatElderCoordinateVO>> coordinate(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderRealTimeService.coordinate(platElderIdDTO));
+    }
+
+}

server-module/src/main/java/com/makeit/module/controller/workstation/WorkStationController.java

@@ -4,6 +4,7 @@ import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
 import com.makeit.service.platform.workstation.WorkStationService;
+import com.makeit.vo.platform.workstation.WorkStationHomeStatisticsVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionRoomVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionStatisticsVO;
 import io.swagger.annotations.Api;
@@ -35,4 +36,10 @@ public class WorkStationController {
     public ApiResponseEntity<List<WorkStationInstitutionRoomVO>> institutionList(@RequestBody WorkStationQueryDTO dto) {
         return ApiResponseUtils.success(workStationService.institutionList(dto));
     }
+
+    @ApiOperation("居家-统计")
+    @PostMapping("homeStatistics")
+    public ApiResponseEntity<WorkStationHomeStatisticsVO> homeStatistics(@RequestBody WorkStationQueryDTO dto) {
+        return ApiResponseUtils.success(workStationService.homeStatistics(dto));
+    }
 }

server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmCheckDTO.java

@@ -25,4 +25,6 @@ public class PlatAlarmCheckDTO {
 
     private JSONObject properties;
 
+    //PlatAlarmRecord.remark
+    private String remark;
 }

server-service/src/main/java/com/makeit/dto/platform/dataScreen/PlatDataScreenQueryDTO.java

@@ -28,5 +28,7 @@ public class PlatDataScreenQueryDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
+    @ApiModelProperty("类型 1-居家 2-机构")
+    private String type;
 
 }

server-service/src/main/java/com/makeit/dto/platform/workstation/WorkStationQueryDTO.java

@@ -38,4 +38,7 @@ public class WorkStationQueryDTO {
     @ApiModelProperty("告警类型")
     private String alarmType;
 
+    @ApiModelProperty("老人ids")
+    private List<String> elderIds;
+
 }

server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java

@@ -54,7 +54,7 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
      */
     void noticeDeviceAlarm(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 
-    PlatAlarmRecord createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO);
+    PlatAlarmRecord convertToPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO);
 
     void getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);
 }

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java

@@ -7,16 +7,20 @@ import com.makeit.dto.platform.alarm.PlatAlarmConfigBehaviorDTOVO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.entity.platform.elder.PlatElder;
+import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -77,8 +81,18 @@ public class BehaviorAlarm implements IAlarm{
     @Async
     public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
-        platAlarmCheckDTO.getParam().add("房间名");
-        PlatAlarmRecord platAlarmRecord =platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
-        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+        List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
+        if(CollectionUtils.isEmpty(platElderList)){
+            return;
+        }
+        PlatRoom platRoom = platAlarmCheckDTO.getPlatRoom();
+        for (PlatElder platElder : platElderList) {
+            List<String> param = new ArrayList<>();
+            param.add(platElder.getName());
+            param.add(platRoom.getName());
+            platAlarmCheckDTO.setParam(param);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+        }
     }
 }

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java

@@ -7,17 +7,22 @@ import com.makeit.dto.platform.alarm.PlatAlarmConfigRespiratoryDTOVO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.entity.platform.elder.PlatElder;
+import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Component
 public class BreathAlarm implements IAlarm{
@@ -67,6 +72,12 @@ public class BreathAlarm implements IAlarm{
         long count = endLong - startLong;
         if (br > end || br < start) {
             if (count >= duration) {
+                if(br>end){
+                    platAlarmCheckDTO.setRemark("呼吸过速");
+                }
+                if(br < start){
+                    platAlarmCheckDTO.setRemark("呼吸过缓");
+                }
                 notice(platAlarmCheckDTO);
                 RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,endLong/1000);
             }
@@ -76,12 +87,27 @@ public class BreathAlarm implements IAlarm{
         return;
     }
 
+    /**
+     * [#长者姓名][#呼吸状态],请及时处理！
+     * @param platAlarmCheckDTO
+     */
     @Override
     @Async
     public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
-        platAlarmCheckDTO.getParam().add("呼吸状态111");
-        PlatAlarmRecord platAlarmRecord = platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
-        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+        platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+        List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
+        if(CollectionUtils.isEmpty(platElderList)){
+            return;
+        }
+        PlatRoom platRoom = platAlarmCheckDTO.getPlatRoom();
+        for (PlatElder platElder : platElderList) {
+            List<String> param = new ArrayList<>();
+            param.add(platElder.getName());
+            param.add(platAlarmCheckDTO.getRemark());
+            platAlarmCheckDTO.setParam(param);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+        }
     }
 }

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java

@@ -54,7 +54,7 @@ public class FallAlarm implements IAlarm{
             param.add(platElder.getName());
             param.add(platRoom.getName());
             platAlarmCheckDTO.setParam(param);
-            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
             platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
         }
     }

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java

@@ -7,17 +7,22 @@ import com.makeit.dto.platform.alarm.PlatAlarmConfigHeartDTOVO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.entity.platform.elder.PlatElder;
+import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Component
 public class HeartAlarm implements IAlarm {
@@ -58,6 +63,12 @@ public class HeartAlarm implements IAlarm {
         long count = endLong - startLong;
         if (hr > end || hr < start) {
             if (count >= duration) {
+                if(hr>end){
+                    platAlarmCheckDTO.setRemark("心率过速");
+                }
+                if(hr < start){
+                    platAlarmCheckDTO.setRemark("心率过缓");
+                }
                 notice(platAlarmCheckDTO);
                 RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,endLong/1000);
             }
@@ -70,8 +81,19 @@ public class HeartAlarm implements IAlarm {
     @Async
     public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
-        platAlarmCheckDTO.getParam().add("呼吸状态111");
-        PlatAlarmRecord platAlarmRecord =platAlarmRecordService. createPlatAlarmRecord(platAlarmCheckDTO);
-        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+        platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+        List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
+        if(CollectionUtils.isEmpty(platElderList)){
+            return;
+        }
+        PlatRoom platRoom = platAlarmCheckDTO.getPlatRoom();
+        for (PlatElder platElder : platElderList) {
+            List<String> param = new ArrayList<>();
+            param.add(platElder.getName());
+            param.add(platAlarmCheckDTO.getRemark());
+            platAlarmCheckDTO.setParam(param);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+        }
     }
 }

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -271,6 +271,12 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         Set<String> phoneSet = platUserList.stream().map(PlatUser::getMobile).collect(Collectors.toSet());
         //发送消息
         noticeByChannel(alarmConfig, alarmRecord, phoneSet, notifyChannelList);
+
+        String userIdJoin = platUserList.stream().map(PlatUser::getId).collect(Collectors.joining(","));
+        alarmRecord.setNotifyUser(userIdJoin);
+
+        saveOrUpdate(alarmRecord);
+
     }
 
     /**
@@ -299,21 +305,21 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
     }
 
     @Override
-    public PlatAlarmRecord createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public PlatAlarmRecord convertToPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
 
         PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         List<String> param = platAlarmCheckDTO.getParam();
         List<PlatElder> elderList = platAlarmCheckDTO.getPlatElderList();
-        String elderNameJoin = elderList.stream().map(PlatElder::getName).collect(Collectors.joining(" "));
 
         PlatAlarmRecord platAlarmRecord = new PlatAlarmRecord();
         platAlarmRecord.setAlarmId(config.getId());
         platAlarmRecord.setAlarmType(config.getAlarmType());
         platAlarmRecord.setAlarmDate(new Date());
-        platAlarmRecord.setStatus("0");
-        //todo
-        platAlarmRecord.setContent(replaceParam(elderNameJoin, param));
+        platAlarmRecord.setStatus(CommonEnum.NO.getValue());
+        platAlarmRecord.setNoticeStatus(CommonEnum.NO.getValue());
+        //模板信息 替换参数
+        platAlarmRecord.setContent(replaceParam(config.getContent(), param));
         platAlarmRecord.setOrgId(platDevice.getOrgId());
         platAlarmRecord.setNotifyUser(config.getNotifyUser());
         platAlarmRecord.setDeviceId(platDevice.getId());

server-service/src/main/java/com/makeit/service/platform/auth/PlatOrgService.java

@@ -96,4 +96,6 @@ public interface PlatOrgService extends IService<PlatOrg> {
     void saveOrg(PlatOrg platOrg);
 
     List<PlatOrg> createOrgTree(List<PlatOrg> orgList);
+
+    List<PlatOrg> belongToScopeList(PlatOrg param);
 }

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -457,6 +457,27 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         return orgList.stream().filter(vo->StringUtils.isBlank(vo.getParentNodeId())).collect(Collectors.toList());
     }
 
+    @Override
+    public List<PlatOrg> belongToScopeList(PlatOrg param) {
+        PlatUserVO userVO = PlatUserUtil.getUserVO();
+        String isTenant = userVO.getIsTenant();
+        //如果是租户账号 则有所有权限
+        if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
+            List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
+                    .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
+            );
+            return orgList;
+        }
+
+        //平台账号
+        Set<String> orgIdList = getOrgIdListByUserId(userVO.getId());
+        List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>().in(BaseEntity::getId, orgIdList).eq(PlatOrg::getStatus, CommonEnum.YES.getValue()));
+        if (CollectionUtils.isEmpty(orgList)) {
+            return new ArrayList<>();
+        }
+        return orgList;
+    }
+
     /**
      * 寻找最近的父节点
      * @param orgMap 有权限的组织

server-service/src/main/java/com/makeit/service/platform/dataScreen/DataScreenService.java

 package com.makeit.service.platform.dataScreen;
 
 import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
+import com.makeit.utils.area.ChinaAreaVO;
 import com.makeit.vo.platform.dataScreen.*;
 
 import java.util.List;
@@ -23,4 +24,6 @@ public interface DataScreenService {
     PlatBaseInfoStatisticsVO baseInfoStatistics(PlatDataScreenQueryDTO dto);
 
     List<PlatMapStatisticsVO> mapStatistics(PlatDataScreenQueryDTO dto);
+
+    List<ChinaAreaVO> mapList(PlatDataScreenQueryDTO dto);
 }

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

@@ -2,6 +2,7 @@ package com.makeit.service.platform.workstation;
 
 
 import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
+import com.makeit.vo.platform.workstation.WorkStationHomeStatisticsVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionRoomVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionStatisticsVO;
 
@@ -18,4 +19,6 @@ public interface WorkStationService {
     WorkStationInstitutionStatisticsVO institutionStatistics(WorkStationQueryDTO dto);
 
     List<WorkStationInstitutionRoomVO> institutionList(WorkStationQueryDTO dto);
+
+    WorkStationHomeStatisticsVO homeStatistics(WorkStationQueryDTO dto);
 }

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

@@ -11,6 +11,7 @@ import com.makeit.entity.platform.space.PlatBed;
 import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmRecordEnum;
+import com.makeit.enums.platform.auth.PlatOrgEnum;
 import com.makeit.enums.platform.space.PlatBedStatusEnum;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.auth.PlatOrgService;
@@ -21,6 +22,7 @@ import com.makeit.service.platform.space.PlatSpaceService;
 import com.makeit.service.platform.workstation.WorkStationService;
 import com.makeit.utils.user.plat.PlatUserUtil;
 import com.makeit.utils.user.plat.PlatUserVO;
+import com.makeit.vo.platform.workstation.WorkStationHomeStatisticsVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionRoomVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionStatisticsVO;
 import jodd.util.StringUtil;
@@ -60,10 +62,15 @@ public class WorkStationServiceImpl implements WorkStationService {
         WorkStationInstitutionStatisticsVO vo = new WorkStationInstitutionStatisticsVO();
         if(dto.getOrgIds().isEmpty()){
             //获取该账号的权限组织
-            List<String> orgIds = belongToScope();
-            if(orgIds.isEmpty()){
+            PlatOrg param = new PlatOrg();
+            param.setType(PlatOrgEnum.OrgTypeEnum.INSTITUTION.getValue());
+            List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
+            if(orgs.isEmpty()){
                 return vo;
             }
+
+            List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
+
             dto.setOrgIds(orgIds);
         }
         //待处理告警
@@ -76,6 +83,16 @@ public class WorkStationServiceImpl implements WorkStationService {
                 .isNotNull(PlatElder::getBedId)
                 .in(PlatElder::getOrgId, dto.getOrgIds()));
 
+        //今日入住
+        long checkInNumber = platElderService.count(new QueryWrapper<PlatElder>().lambda()
+                .between(PlatElder::getCheckInTime, dto.getStartTime(), dto.getEndTime())
+                .in(PlatElder::getOrgId, dto.getOrgIds()));
+
+        //今日退住
+        long checkOutNumber = platElderService.count(new QueryWrapper<PlatElder>().lambda()
+                .between(PlatElder::getCheckOutTime, dto.getStartTime(), dto.getEndTime())
+                .in(PlatElder::getOrgId, dto.getOrgIds()));
+
         //空闲床位
         List<PlatSpace> spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
                 .in(PlatSpace::getOrgId, dto.getOrgIds()));
@@ -90,39 +107,25 @@ public class WorkStationServiceImpl implements WorkStationService {
         }
         vo.setUnHandledNumber(unHandledNumber);
         vo.setElderNumber(elderNumber);
+        vo.setCheckInNumber(checkInNumber);
+        vo.setCheckOutNumber(checkOutNumber);
 
         return vo;
     }
 
-    private List<String> belongToScope() {
-        PlatUserVO userVO = PlatUserUtil.getUserVO();
-        String isTenant = userVO.getIsTenant();
-        //如果是租户账号 则有所有权限
-        if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
-            List<PlatOrg> orgList = platOrgService.list(new LambdaQueryWrapper<PlatOrg>()
-                    .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
-            );
-            return orgList.stream().map(PlatOrg::getParentId).collect(Collectors.toList());
-        }
-
-        //平台账号
-        Set<String> orgIdList = platOrgService.getOrgIdListByUserId(userVO.getId());
-        List<PlatOrg> orgList = platOrgService.list(new LambdaQueryWrapper<PlatOrg>().in(BaseEntity::getId, orgIdList).eq(PlatOrg::getStatus, CommonEnum.YES.getValue()));
-        if (CollectionUtils.isEmpty(orgList)) {
-            return new ArrayList<>();
-        }
-        return orgList.stream().map(PlatOrg::getParentId).collect(Collectors.toList());
-    }
-
     @Override
     public List<WorkStationInstitutionRoomVO> institutionList(WorkStationQueryDTO dto) {
         List<PlatSpace> spaces = new ArrayList<>();
         if(dto.getSpaceIds().isEmpty()){
             //获取该账号的权限组织
-            List<String> orgIds = belongToScope();
-            if(orgIds.isEmpty()){
+            PlatOrg param = new PlatOrg();
+            param.setType(PlatOrgEnum.OrgTypeEnum.INSTITUTION.getValue());
+            List<PlatOrg> orgs = platOrgService.belongToScopeList(param);
+            if(orgs.isEmpty()){
                 return new ArrayList<>();
             }
+            List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
+
             spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
                     .in(PlatSpace::getOrgId, dto.getOrgIds()));
             if(spaces.isEmpty()){
@@ -152,6 +155,18 @@ public class WorkStationServiceImpl implements WorkStationService {
             elderIdList.addAll(Arrays.asList(e.split(",")));
         });
         List<WorkStationInstitutionRoomVO> roomVOList = platRoomService.workStationList(dto);
+        if(roomVOList.isEmpty()){
+            return new ArrayList<>();
+        }
+        List<String> roomIds = roomVOList.stream().map(WorkStationInstitutionRoomVO::getRoomId).collect(Collectors.toList());
+        //获取床号及长者
+
+        return null;
+    }
+
+    @Override
+    public WorkStationHomeStatisticsVO homeStatistics(WorkStationQueryDTO dto) {
+
         return null;
     }
 }

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

+package com.makeit.vo.platform.workstation;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/13
+ */
+@Data
+@ApiModel("WorkStationHomeStatisticsVO对象")
+public class WorkStationHomeStatisticsVO {
+
+    @ApiModelProperty(value = "待处理告警")
+    private Long unHandledNumber;
+    @ApiModelProperty(value = "今日告警数")
+    private Long alarmNumber;
+    @ApiModelProperty(value = "今日已处理告警数")
+    private Long handledNumber;
+    @ApiModelProperty(value = "长者数")
+    private Long elderNumber;
+}

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

@@ -13,11 +13,11 @@ import java.util.List;
  * @version 2023/9/13
  */
 @Data
-@ApiModel("WorkStationRoomVO对象")
+@ApiModel("WorkStationInstitutionRoomVO对象")
 public class WorkStationInstitutionRoomVO {
 
     @ApiModelProperty(value = "房间路径id")
-    private String path;
+    private String spacePath;
 
     @ApiModelProperty(value = "房间id")
     private String roomId;

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

@@ -11,7 +11,7 @@ import lombok.Data;
  * @version 2023/9/13
  */
 @Data
-@ApiModel("WorkStationStatisticsVO对象")
+@ApiModel("WorkStationInstitutionStatisticsVO对象")
 public class WorkStationInstitutionStatisticsVO {
 
     @ApiModelProperty(value = "待处理告警")

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

@@ -14,7 +14,7 @@
                 AND FIND_IN_SET(#{dto.id},pm.space_path)
             </if>
             <if test="dto.status != null and dto.status != ''">
-                AND pb.statue = #{dto.status}
+                AND pb.status = #{dto.status}
             </if>
         </where>
     </select>
@@ -28,7 +28,7 @@
             pb.del_flag = 0
             AND pm.id = #{dto.id}
             <if test="dto.status != null and dto.status != ''">
-                AND pb.statue = #{dto.status}
+                AND pb.status = #{dto.status}
             </if>
         </where>
     </select>

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

@@ -12,7 +12,7 @@
     </select>
 
     <select id="workStationList" resultType="com.makeit.vo.platform.workstation.WorkStationInstitutionRoomVO">
-        SELECT pm.id,pm.name,pm.space_path FROM plat_room pm
+        SELECT pm.id as roomId,pm.name as roomName ,pm.space_path FROM plat_room pm
         LEFT JOIN plat_space ps ON pm.space_id = ps.id
         LEFT JOIN plat_bed pb ON pb.room_id = pm.id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id