Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
91ad7d2b
authored
Oct 08, 2023
by
朱淼
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
更新代码
parent
ac22fc92
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
server-service/src/main/java/com/makeit/task/DemoDeviceTask.java
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java
View file @
91ad7d2b
...
...
@@ -77,7 +77,6 @@ public class PlatAlarmRecord extends BaseBusEntity {
//异常说明
private
String
remark
;
@TableField
(
exist
=
false
)
private
String
elderName
;
//异常值
...
...
@@ -89,6 +88,7 @@ public class PlatAlarmRecord extends BaseBusEntity {
private
Long
valueTime
;
}
server-service/src/main/java/com/makeit/task/DemoDeviceTask.java
View file @
91ad7d2b
...
...
@@ -63,6 +63,7 @@ public class DemoDeviceTask {
if
(
dto
.
getAttribute
()!=
null
&&
"personState"
.
equals
(
dto
.
getAttribute
().
getAttributeCode
())){
if
(
"1"
.
equals
(
dto
.
getValue
())){
PlatAlarmRecord
alarmRecord
=
new
PlatAlarmRecord
();
alarmRecord
.
setElderName
(
name
);
alarmRecord
.
setAlarmType
(
PlatAlarmConfigEnum
.
AlarmTypeEnum
.
FALL
.
getValue
());
alarmRecord
.
setContent
(
name
+
"在房间内跌倒,请及时处理"
);
alarmRecord
.
setStatus
(
PlatAlarmRecordEnum
.
AlarmRecordStatusEnum
.
UNHANDLED
.
getValue
());
...
...
@@ -83,6 +84,7 @@ public class DemoDeviceTask {
if
(
dto
.
getAttribute
()!=
null
&&
"personState"
.
equals
(
dto
.
getAttribute
().
getAttributeCode
())){
if
(
"1"
.
equals
(
dto
.
getValue
())
&&
!
record
.
getValueTime
().
equals
(
dto
.
getValueTime
())){
PlatAlarmRecord
alarmRecord
=
new
PlatAlarmRecord
();
alarmRecord
.
setElderName
(
name
);
alarmRecord
.
setAlarmType
(
PlatAlarmConfigEnum
.
AlarmTypeEnum
.
FALL
.
getValue
());
alarmRecord
.
setContent
(
name
+
"在房间内跌倒,请及时处理"
);
alarmRecord
.
setStatus
(
PlatAlarmRecordEnum
.
AlarmRecordStatusEnum
.
UNHANDLED
.
getValue
());
...
...
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
View file @
91ad7d2b
...
...
@@ -47,6 +47,9 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"处理人"
)
private
String
dealUser
;
@ApiModelProperty
(
value
=
"老人姓名"
)
private
String
elderName
;
@ApiModelProperty
(
value
=
"处理时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
dealDate
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment