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
68ca9d01
authored
Feb 02, 2024
by
汪志阳
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:通知家属消息处理
parent
9552ced2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/resources/mappers/PlatElderChildrenInfoMapper.xml
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
68ca9d01
...
@@ -320,10 +320,16 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -320,10 +320,16 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
List
<
PlatElderChildrenInfo
>
allChildInfoList
=
new
ArrayList
<>();
List
<
PlatElderChildrenInfo
>
allChildInfoList
=
new
ArrayList
<>();
//通知每个长者的子女
//通知每个长者的子女
List
<
PlatElderChildrenInfo
>
childrenInfoList
=
platElderChildrenInfoMapper
.
list
(
alarmConfig
.
getTenantId
(),
elderIds
);
LambdaQueryWrapper
<
PlatElderChildrenInfo
>
childrenInfoLambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
childrenInfoLambdaQueryWrapper
.
eq
(
BaseBusEntity:
:
getTenantId
,
alarmConfig
.
getTenantId
());
childrenInfoLambdaQueryWrapper
.
and
(
qw
->
qw
.
apply
(
"find_in_set('"
+
elderIds
+
"',elder_id)"
));
List
<
PlatElderChildrenInfo
>
childrenInfoList
=
platElderChildrenInfoService
.
list
(
childrenInfoLambdaQueryWrapper
);
if
(
CollectionUtils
.
isEmpty
(
childrenInfoList
))
{
if
(
CollectionUtils
.
isEmpty
(
childrenInfoList
))
{
throw
new
BusinessException
(
"子女端账号未绑定长者,长者id:"
+
elderIds
);
throw
new
BusinessException
(
"子女端账号未绑定长者,长者id:"
+
elderIds
);
}
}
if
(
true
){
return
;
}
allChildInfoList
.
addAll
(
childrenInfoList
);
allChildInfoList
.
addAll
(
childrenInfoList
);
Set
<
String
>
phoneSet
=
childrenInfoList
.
stream
().
map
(
PlatElderChildrenInfo:
:
getPhone
).
collect
(
Collectors
.
toSet
());
Set
<
String
>
phoneSet
=
childrenInfoList
.
stream
().
map
(
PlatElderChildrenInfo:
:
getPhone
).
collect
(
Collectors
.
toSet
());
//告警配置和租户告警 字典一致
//告警配置和租户告警 字典一致
...
...
server-service/src/main/resources/mappers/PlatElderChildrenInfoMapper.xml
View file @
68ca9d01
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
from plat_elder_children_info
from plat_elder_children_info
where tenant_id = #{tenantId}
where tenant_id = #{tenantId}
and find_in_set(#{elderIds},elder_id)
and find_in_set(#{elderIds},elder_id)
and del_flag = '0'
</select>
</select>
</mapper>
</mapper>
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