Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit dd9ffdbf by 李小龙
Options

告警记录接口

parent 71ebbc64
Inline Side-by-side
Showing with 118 additions and 49 deletions
db/inti.sql
......@@ -417,23 +417,24 @@ CREATE TABLE `alarm_config` (
CREATE TABLE `plat_alarm_record` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`alarm_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '关联告警配置',
`alarm_date` datetime DEFAULT NULL COMMENT '告警时间',
`type` char ( 1 ) DEFAULT NULL COMMENT '状态 0 待处理 1 已处理',
`status` char ( 1 ) DEFAULT NULL COMMENT '状态 0 待处理 1 已处理',
`notice_status` char ( 1 ) DEFAULT NULL COMMENT '通知家属状态 0 未通知 1 已通知',
`content` varchar(128) NOT NULL COMMENT '告警内容',
`deal_user` VARCHAR ( 64 ) DEFAULT NULL COMMENT '处理人',
`deal_date` datetime DEFAULT NULL COMMENT '处理时间',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` char ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '告警记录';
`id` varchar(64) NOT NULL COMMENT 'id',
`alarm_id` varchar(64) DEFAULT NULL COMMENT '关联告警配置',
`alarm_date` datetime DEFAULT NULL COMMENT '告警时间',
`alarm_type` varchar(4) DEFAULT NULL COMMENT '告警类型 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常',
`status` char(1) DEFAULT NULL COMMENT '状态 0 待处理 1 已处理',
`notice_status` char(1) DEFAULT NULL COMMENT '通知家属状态 0 未通知 1 已通知',
`content` varchar(128) NOT NULL COMMENT '告警内容',
`deal_user` varchar(64) DEFAULT NULL COMMENT '处理人',
`deal_date` datetime DEFAULT NULL COMMENT '处理时间',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id ',
`org_id` varchar(64) DEFAULT NULL COMMENT '所属组织id',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='告警记录';
CREATE TABLE `plafform_setting` (
......
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmRecordQueryDTO.java
......@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Date;
/**
* <p>
......@@ -25,9 +26,31 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
@ApiModelProperty(value = "所属组织机构id")
private String orgId;
@ApiModelProperty(value = "创建时间")
@ApiModelProperty(value = "告警时间-起")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDate;
private LocalDateTime createDateFrom;
@ApiModelProperty(value = "告警时间-止")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDateTo;
@ApiModelProperty(value = "状态 0 待处理 1 已处理")
private String status;
@ApiModelProperty(value = "处理人")
private String dealUser;
@ApiModelProperty(value = "处理时间-起")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealDateFrom;
@ApiModelProperty(value = "处理时间-止")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealDateTo;
@ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
private String alarmType;
}
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
......@@ -2,8 +2,10 @@ package com.makeit.entity.platform.alarm;
import com.baomidou.mybatisplus.annotation.TableName;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
/**
......@@ -19,6 +21,9 @@ public class PlatAlarmRecord extends BaseBusEntity {
*/
private String alarmId;
@ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
private String alarmType;
/**
* 告警时间
*/
......@@ -40,14 +45,16 @@ public class PlatAlarmRecord extends BaseBusEntity {
private String content;
/**
* 处理人
* 处理人 存名字
*/
private String dealUser;
/**
* 处理时间
*/
private Date dealDate;
private LocalDateTime dealDate;
private String orgId;
}
......
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
......@@ -3,15 +3,26 @@ package com.makeit.service.platform.alarm.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.common.entity.BaseEntity;
import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.entity.platform.alarm.PlatAlarmRecord;
import com.makeit.enums.CommonEnum;
import com.makeit.mapper.platform.alarm.PlatAlarmRecordMapper;
import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.PageUtil;
import com.makeit.utils.user.common.CommonUserUtil;
import com.makeit.utils.user.common.CommonUserVO;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* @author lixl
......@@ -24,25 +35,49 @@ implements PlatAlarmRecordService{
@Override
public PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
PlatAlarmRecordQueryDTO data = dto.getData();
PlatAlarmRecordQueryDTO param = dto.getData();
Page<PlatAlarmRecord> mpPage = PageUtil.toMpPage(dto);
LambdaQueryWrapper<PlatAlarmRecord> queryWrapper = new LambdaQueryWrapper<>();
//queryWrapper.eq()
return null;
LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(param);
Page<PlatAlarmRecord> page = page(mpPage, lambdaQueryWrapper);
List<PlatAlarmRecord> records = page.getRecords();
List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class);
return PageUtil.toPageVO(dtos,page);
}
private LambdaQueryWrapper<PlatAlarmRecord> getLambdaQueryWrapper(PlatAlarmRecordQueryDTO param) {
return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
.le(Objects.nonNull(param.getCreateDateTo()),BaseEntity::getCreateDate, param.getCreateDateTo())
.eq(StringUtils.isNotBlank(param.getAlarmType()),PlatAlarmRecord::getAlarmType, param.getAlarmType())
.eq(StringUtils.isNotBlank(param.getStatus()),PlatAlarmRecord::getStatus, param.getStatus())
.eq(StringUtils.isNotBlank(param.getDealUser()),PlatAlarmRecord::getDealUser, param.getDealUser())
.ge(Objects.nonNull(param.getDealDateFrom()),PlatAlarmRecord::getDealDate, param.getDealDateFrom())
.le(Objects.nonNull(param.getDealDateTo()),PlatAlarmRecord::getDealDate, param.getDealDateTo())
.eq(StringUtils.isNotBlank(param.getOrgId()),PlatAlarmRecord::getOrgId, param.getOrgId())
.orderByDesc(BaseEntity::getCreateDate)
;
}
@Override
public PlatAlarmRecordVO view(String recordId) {
return null;
PlatAlarmRecord platAlarmRecord = getById(recordId);
PlatAlarmRecordVO vo = BeanDtoVoUtils.convert(platAlarmRecord, PlatAlarmRecordVO.class);
return vo;
}
@Override
@Transactional
public void deal(String recordId) {
CommonUserVO user = CommonUserUtil.getUser();
PlatAlarmRecord platAlarmRecord = getById(recordId);
platAlarmRecord.setStatus(CommonEnum.YES.getValue());
platAlarmRecord.setDealDate(LocalDateTime.now());
platAlarmRecord.setDealUser(user.getName());
updateById(platAlarmRecord);
}
@Override
@Transactional
public void notice(String recordId) {
//todo
}
}
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
package com.makeit.vo.platform.alarm;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.dto.BaseTenantDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Date;
/**
* <p>
* 告警配置
* 告警记录
* </p>
*
* @author eugene young
......@@ -16,37 +20,37 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="PlatAlarmConfig对象", description="告警配置")
@ApiModel(value="PlatAlarmRecord对象", description="告警记录")
public class PlatAlarmRecordVO extends BaseTenantDTO {
@ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
private String alarmType;
@ApiModelProperty(value = "状态 数据字典 1 启用 0 禁用")
private String status;
@ApiModelProperty(value = "告警时间")
private Date alarmDate;
@ApiModelProperty(value = "状态 0 待处理 1 已处理")
private String status;
@ApiModelProperty(value = "通知家属状态 0 未通知 1 已通知")
private String noticeStatus;
@ApiModelProperty(value = "内容")
@ApiModelProperty(value = "告警内容")
private String content;
@ApiModelProperty(value = "内容(审核中)")
private String contentAudit;
@ApiModelProperty(value = "通知渠道 数据字典 1、短信 2、邮件 3、语音短信 可多选")
private String notifyChannel;
@ApiModelProperty(value = "通知对象 数据字典 1 全部 2 选择人员")
private String notifyWay;
@ApiModelProperty(value = "处理人")
private String dealUser;
@ApiModelProperty(value = "通知人员")
private String notifyUser;
@ApiModelProperty(value = "处理时间")
private Date dealDate;
@ApiModelProperty(value = "通知人员名称")
private String notifyUserName;
@ApiModelProperty(value = "所属组织id")
private String orgId;
@ApiModelProperty(value = "说明")
private String description;
@ApiModelProperty(value = "告警时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDate;
}
server-web/src/main/resources/application.yml
......@@ -134,8 +134,6 @@ tenant:
prefix:
- sys_
- plat_
# - wflow_model
# - wflow_record
ignore:
- sys_file
- sys_dictionary
......@@ -145,6 +143,7 @@ tenant:
- plat_tenant
- plat_tenant_menu
- plat_user
- plat_menu
rsa:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment