Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 91ad7d2b by 朱淼
Options

更新代码

parent ac22fc92
Inline Side-by-side
Showing with 6 additions and 1 deletions
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
...@@ -77,7 +77,6 @@ public class PlatAlarmRecord extends BaseBusEntity { ...@@ -77,7 +77,6 @@ public class PlatAlarmRecord extends BaseBusEntity {
//异常说明 //异常说明
private String remark; private String remark;
@TableField(exist = false)
private String elderName; private String elderName;
//异常值 //异常值
...@@ -89,6 +88,7 @@ public class PlatAlarmRecord extends BaseBusEntity { ...@@ -89,6 +88,7 @@ public class PlatAlarmRecord extends BaseBusEntity {
private Long valueTime; private Long valueTime;
} }
server-service/src/main/java/com/makeit/task/DemoDeviceTask.java
...@@ -63,6 +63,7 @@ public class DemoDeviceTask { ...@@ -63,6 +63,7 @@ public class DemoDeviceTask {
if(dto.getAttribute()!=null && "personState".equals(dto.getAttribute().getAttributeCode())){ if(dto.getAttribute()!=null && "personState".equals(dto.getAttribute().getAttributeCode())){
if("1".equals(dto.getValue())){ if("1".equals(dto.getValue())){
PlatAlarmRecord alarmRecord = new PlatAlarmRecord(); PlatAlarmRecord alarmRecord = new PlatAlarmRecord();
alarmRecord.setElderName(name);
alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue()); alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue());
alarmRecord.setContent(name+"在房间内跌倒，请及时处理"); alarmRecord.setContent(name+"在房间内跌倒，请及时处理");
alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue()); alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue());
...@@ -83,6 +84,7 @@ public class DemoDeviceTask { ...@@ -83,6 +84,7 @@ public class DemoDeviceTask {
if(dto.getAttribute()!=null && "personState".equals(dto.getAttribute().getAttributeCode())){ if(dto.getAttribute()!=null && "personState".equals(dto.getAttribute().getAttributeCode())){
if("1".equals(dto.getValue()) && !record.getValueTime().equals(dto.getValueTime())){ if("1".equals(dto.getValue()) && !record.getValueTime().equals(dto.getValueTime())){
PlatAlarmRecord alarmRecord = new PlatAlarmRecord(); PlatAlarmRecord alarmRecord = new PlatAlarmRecord();
alarmRecord.setElderName(name);
alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue()); alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue());
alarmRecord.setContent(name+"在房间内跌倒，请及时处理"); alarmRecord.setContent(name+"在房间内跌倒，请及时处理");
alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue()); alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue());
......
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
...@@ -47,6 +47,9 @@ public class PlatAlarmRecordVO extends BaseTenantDTO { ...@@ -47,6 +47,9 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
@ApiModelProperty(value = "处理人") @ApiModelProperty(value = "处理人")
private String dealUser; private String dealUser;
@ApiModelProperty(value = "老人姓名")
private String elderName;
@ApiModelProperty(value = "处理时间") @ApiModelProperty(value = "处理时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dealDate; private LocalDateTime dealDate;
......
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