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
6ba86919
authored
Feb 27, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 平台端小程序告警详情返回设备类型
parent
239dc580
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
6ba86919
...
@@ -256,6 +256,12 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -256,6 +256,12 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
if
(
StringUtils
.
isNotBlank
(
vo
.
getAlarmId
()))
{
if
(
StringUtils
.
isNotBlank
(
vo
.
getAlarmId
()))
{
JoinUtil
.
join
(
Arrays
.
asList
(
vo
),
platAlarmConfigService
,
PlatAlarmRecordVO:
:
getAlarmId
,
BaseEntity:
:
getId
,
(
t
,
m
)
->
t
.
setNotifyRelation
(
m
.
getNotifyRelation
()));
JoinUtil
.
join
(
Arrays
.
asList
(
vo
),
platAlarmConfigService
,
PlatAlarmRecordVO:
:
getAlarmId
,
BaseEntity:
:
getId
,
(
t
,
m
)
->
t
.
setNotifyRelation
(
m
.
getNotifyRelation
()));
}
}
if
(
StringUtils
.
isNotBlank
(
vo
.
getDeviceId
()))
{
PlatDevice
platDevice
=
platDeviceService
.
getById
(
vo
.
getDeviceId
());
if
(
platDevice
!=
null
)
{
vo
.
setDeviceCategory
(
platDevice
.
getCategory
());
}
}
return
vo
;
return
vo
;
}
}
...
...
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
View file @
6ba86919
...
@@ -76,4 +76,6 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
...
@@ -76,4 +76,6 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
private
Boolean
isUnWechatRead
;
private
Boolean
isUnWechatRead
;
@ApiModelProperty
(
value
=
"是否存在未处理"
)
@ApiModelProperty
(
value
=
"是否存在未处理"
)
private
Boolean
statusFlag
;
private
Boolean
statusFlag
;
@ApiModelProperty
(
value
=
"设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达"
)
private
String
deviceCategory
;
}
}
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