Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 71ebbc64 by 杨伟程
Options

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

parents 273ffda5 163623b4
Inline Side-by-side
Showing with 181 additions and 2 deletions
db/inti.sql
...@@ -420,6 +420,7 @@ CREATE TABLE `plat_alarm_record` ( ...@@ -420,6 +420,7 @@ CREATE TABLE `plat_alarm_record` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id', `id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`alarm_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '关联告警配置', `alarm_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '关联告警配置',
`alarm_date` datetime 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 已处理', `status` char ( 1 ) DEFAULT NULL COMMENT '状态 0 待处理 1 已处理',
`notice_status` char ( 1 ) DEFAULT NULL COMMENT '通知家属状态 0 未通知 1 已通知', `notice_status` char ( 1 ) DEFAULT NULL COMMENT '通知家属状态 0 未通知 1 已通知',
`content` varchar(128) NOT NULL COMMENT '告警内容', `content` varchar(128) NOT NULL COMMENT '告警内容',
......
server-common/src/main/java/com/makeit/enums/Const.java
...@@ -11,8 +11,8 @@ public class Const { ...@@ -11,8 +11,8 @@ public class Const {
public static final String MDC_USER_ID = "userId"; public static final String MDC_USER_ID = "userId";
//上面三个MDC用 //上面三个MDC用
//前端要求横杠格式，否则有大小写问题
public static final String TENANT_ID = "tenantId"; public static final String TENANT_ID = "tenant-id";
public static final String TENANT_ID_DB = "tenant_id"; public static final String TENANT_ID_DB = "tenant_id";
public static final String CHN = "中国"; public static final String CHN = "中国";
......
server-module/src/main/java/com/makeit/module/controller/alarm/PlatAlarmRecordController.java 0 → 100644
package com.makeit.module.controller.alarm;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
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;
@Api(tags = "告警记录")
@RestController
@RequestMapping("/plat/alarm-record")
public class PlatAlarmRecordController {
@Autowired
private PlatAlarmRecordService platAlarmRecordService;
@ApiOperation("列表")
@PostMapping("page")
public ApiResponseEntity<PageVO<PlatAlarmRecordVO>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
return ApiResponseUtils.success(platAlarmRecordService.page(dto));
}
@ApiOperation("查看")
@PostMapping("view")
public ApiResponseEntity<PlatAlarmRecordVO> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(platAlarmRecordService.view(dto.getId()));
}
@ApiOperation("处理")
@PostMapping("deal")
public ApiResponseEntity<Void> deal(@RequestBody BaseIdDTO dto) {
platAlarmRecordService.deal(dto.getId());
return ApiResponseUtils.success();
}
@ApiOperation("通知家属")
@PostMapping("notice")
public ApiResponseEntity<Void> notice(@RequestBody BaseIdDTO dto) {
platAlarmRecordService.notice(dto.getId());
return ApiResponseUtils.success();
}
}
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmRecordQueryDTO.java 0 → 100644
package com.makeit.dto.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;
/**
* <p>
* 告警记录
* </p>
*
* @author eugene young
* @since 2023-09-04
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="PlatAlarmRecord对象", description="告警记录")
public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
@ApiModelProperty(value = "所属组织机构id")
private String orgId;
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDate;
}
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
package com.makeit.service.platform.alarm; package com.makeit.service.platform.alarm;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
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.entity.platform.alarm.PlatAlarmRecord;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
/** /**
* @author lixl * @author lixl
...@@ -10,4 +14,11 @@ import com.makeit.entity.platform.alarm.PlatAlarmRecord; ...@@ -10,4 +14,11 @@ import com.makeit.entity.platform.alarm.PlatAlarmRecord;
*/ */
public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> { public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
PlatAlarmRecordVO view(String recordId);
void deal(String recordId);
void notice(String recordId);
} }
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
package com.makeit.service.platform.alarm.impl; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.entity.platform.alarm.PlatAlarmRecord;
import com.makeit.mapper.platform.alarm.PlatAlarmRecordMapper; import com.makeit.mapper.platform.alarm.PlatAlarmRecordMapper;
import com.makeit.service.platform.alarm.PlatAlarmRecordService; import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.utils.data.convert.PageUtil;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,4 +22,27 @@ import org.springframework.stereotype.Service; ...@@ -15,4 +22,27 @@ import org.springframework.stereotype.Service;
public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMapper, PlatAlarmRecord> public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMapper, PlatAlarmRecord>
implements PlatAlarmRecordService{ implements PlatAlarmRecordService{
@Override
public PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
PlatAlarmRecordQueryDTO data = dto.getData();
Page<PlatAlarmRecord> mpPage = PageUtil.toMpPage(dto);
LambdaQueryWrapper<PlatAlarmRecord> queryWrapper = new LambdaQueryWrapper<>();
//queryWrapper.eq()
return null;
}
@Override
public PlatAlarmRecordVO view(String recordId) {
return null;
}
@Override
public void deal(String recordId) {
}
@Override
public void notice(String recordId) {
}
} }
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java 0 → 100644
package com.makeit.vo.platform.alarm;
import com.makeit.common.dto.BaseTenantDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 告警配置
* </p>
*
* @author eugene young
* @since 2023-09-04
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="PlatAlarmConfig对象", 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 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 notifyUser;
@ApiModelProperty(value = "通知人员名称")
private String notifyUserName;
@ApiModelProperty(value = "说明")
private String description;
}
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