告警中心新增离床异常配置

d6e49099 · 汪志阳 · 624c867b · d6e49099 · d6e49099 · d6e49099
Commit d6e49099 authored Dec 05, 2023 by 汪志阳
Showing with 68 additions and 23 deletions
db/上线后sql/update.sql
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigDTOVO.java
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigOffBedDTOVO.java
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmConfig.java
server-service/src/main/java/com/makeit/enums/platform/alarm/PlatAlarmConfigEnum.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java
--- a/db/上线后sql/update.sql
+++ b/db/上线后sql/update.sql
 ALTER TABLE `plat_device_other`
@@ -54,4 +54,10 @@ CREATE TABLE `plat_device_log` (
                                   `update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新人',
                                   `tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id',
                                   PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 ROW_FORMAT = COMPACT COMMENT = '设备日志';
\ No newline at end of file
+## 告警中心新增离床异常 初始化
+ALTER TABLE `plat_alarm_config` modify column alarm_type char(1) comment '告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常 5 离床异常';
+INSERT INTO `plat_alarm_config`(`id`, `alarm_type`, `status`, `org_id`, `city_org_id`, `district_org_id`, `street_org_id`, `org_path`, `rule_config`, `content`, `notify_channel`, `notify_relation`, `notify_way`, `notify_user`, `description`, `create_by`, `create_date`, `update_by`, `update_date`, `del_flag`, `tenant_id`, `content_audit`)
+VALUES ('16996678722776842252', '5', '1', '1701542574740770817', NULL, NULL, NULL, NULL, '{\"offBedStart\":\"0:00\",\"startTimeType\":\"1\",\"offBedEnd\":\"10:00\",\"endTimeType\":\"2\",\"duration\":\"5\"}', '[#长者姓名]离床时间过长,请及时处理！', '', '1', '1', NULL, NULL, 'platAdmin02', NOW(), 'platAdmin02', NOW(), '0', '0', NULL);
--- a/server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigDTOVO.java
+++ b/server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigDTOVO.java
@@ -25,7 +25,7 @@ public class PlatAlarmConfigDTOVO extends BaseTenantDTO {
    @NotBlank(message = "告警类型不能为空")
    @DictEnum(em = PlatAlarmConfigEnum.AlarmTypeEnum.class, message = "告警类型可选值为{m}")
-    @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
+    @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常，5 离床异常")
    private String alarmType;
    @ApiModelProperty(value = "所属组织机构id")
@@ -55,6 +55,9 @@ public class PlatAlarmConfigDTOVO extends BaseTenantDTO {
    @ApiModelProperty(value = "行为异常")
    private PlatAlarmConfigBehaviorDTOVO behavior;
+    @ApiModelProperty(value = "离床异常")
+    private PlatAlarmConfigOffBedDTOVO offBed;
    @ApiModelProperty(value = "内容")
    private String content;

--- a/server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigOffBedDTOVO.java
+++ b/server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigOffBedDTOVO.java
+package com.makeit.dto.platform.alarm;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+/**
+ * <p>
+ * 离床异常告警配置
+ * </p>
+ *
+ * @author wangzy
+ * @since 2023-12-05
+ */
+@Data
+@EqualsAndHashCode
+@ApiModel(value = "PlatAlarmConfig对象", description = "离床异常告警配置")
+public class PlatAlarmConfigOffBedDTOVO {
+    @ApiModelProperty("离床开始时间")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm",timezone="GMT+8")
+    private LocalDateTime offBedStart;
+    @ApiModelProperty("离床时间类型 :1-当日，2-次日")
+    private String startTimeType;
+    @ApiModelProperty("离床结束时间")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm",timezone="GMT+8")
+    private LocalDateTime offBedEnd;
+    @ApiModelProperty("离床时间类型 :1-当日，2-次日")
+    private String endTimeType;
+    @ApiModelProperty("离床持续时间")
+    private Integer duration;
+}
--- a/server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmConfig.java
+++ b/server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmConfig.java
@@ -23,7 +23,7 @@ public class PlatAlarmConfig extends BaseBusEntity {
    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
+    @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常 5离床异常")
    private String alarmType;
    @ApiModelProperty(value = "状态 数据字典 1 启用 0 禁用")

--- a/server-service/src/main/java/com/makeit/enums/platform/alarm/PlatAlarmConfigEnum.java
+++ b/server-service/src/main/java/com/makeit/enums/platform/alarm/PlatAlarmConfigEnum.java
@@ -9,7 +9,8 @@ public class PlatAlarmConfigEnum {
        FALL("alarm.alarmType.fall"),
        BREATHE("alarm.alarmType.breathe"),
        HEART("alarm.alarmType.heart"),
-        BEHAVIOR("alarm.alarmType.behavior");
+        BEHAVIOR("alarm.alarmType.behavior"),
+        OFF_BED("alarm.alarmType.offBed");
        private String code;

--- a/server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java
 package com.makeit.service.platform.space.impl;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
@@ -10,7 +8,9 @@ import com.makeit.common.dto.StatusDTO;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
-import com.makeit.dto.platform.space.*;
+import com.makeit.dto.platform.space.PlatBedEditDTO;
+import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
+import com.makeit.dto.platform.space.PlatBedQueryDTO;
 import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.space.PlatBed;
@@ -33,12 +33,13 @@ import com.makeit.vo.platform.workstation.WorkStationHomeBedVO;
 import com.makeit.vo.platform.workstation.WorkStationInstitutionBedVO;
 import jodd.util.StringUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;
 /**
@@ -162,12 +163,11 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
    @Override
    public Page<PlatBedPanoramaVO> selectBySpaceIdAndStatus(PageReqDTO<PlatBedPanoramaDTO> pageReqDTO, PlatBedPanoramaDTO dto) {
-        List<String> typeOrgIdList = Lists.newArrayList();
        List<String> choiceOrgIdList = Lists.newArrayList();
-        if (StringUtils.isNotEmpty(dto.getOrgType())) {
+        PlatOrg platOrg = new PlatOrg();
-            List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getOrgType()));
+        platOrg.setType(dto.getOrgType());
-            typeOrgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
+        List<PlatOrg> platOrgList = platOrgService.belongToScopeList(platOrg);
-        }
+        List<String> typeOrgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
        if (StringUtil.isNotEmpty(dto.getOrgId())) {
            choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
        }
@@ -194,13 +194,6 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
            }
        }
-        // 数据权限
-        if (StrUtil.isBlank(dto.getOrgId()) && StrUtil.isBlank(dto.getType())) {
-            //查询用户权限组织id
-            List<PlatOrg> orgs = platOrgService.belongToScopeList(new PlatOrg());
-            orgIdList = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
-        }
        return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
    }