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
b12db346
authored
Nov 09, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:子女段告警列表问题修复
parent
1e1acd65
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
b12db346
...
...
@@ -123,10 +123,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
@Override
public
PageVO
<
PlatAlarmRecordVO
>
childrenPage
(
PageReqDTO
<
PlatAlarmRecordQueryDTO
>
dto
)
{
PlatElderChildrenInfo
platElderChildrenInfo
=
platElderChildrenInfoService
.
getById
(
WechatUserUtil
.
getUserId
());
List
<
PlatElderChildrenInfo
>
platElderChildrenInfoList
=
platElderChildrenInfoService
.
list
(
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
().
eq
(
PlatElderChildrenInfo:
:
getOpenid
,
platElderChildrenInfo
.
getOpenid
())
.
isNotNull
(
PlatElderChildrenInfo:
:
getElderId
));
log
.
info
(
"子女端账号:"
+
platElderChildrenInfo
.
toString
());
String
elderId
=
platElderChildrenInfo
.
getElderId
();
List
<
PlatElderChildrenInfo
>
platElderChildrenInfoList
=
getPlatElderChildrenInfosByOpenid
(
platElderChildrenInfo
.
getOpenid
());
log
.
info
(
"子女端账号:{}"
,
JSON
.
toJSONString
(
platElderChildrenInfo
));
if
(
CollectionUtils
.
isNotEmpty
(
platElderChildrenInfoList
)){
return
new
PageVO
<>();
}
...
...
@@ -537,9 +535,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
@Override
public
Integer
unreadCount
(
PlatAlarmRecordQueryDTO
dto
)
{
PlatElderChildrenInfo
platElderChildrenInfo
=
platElderChildrenInfoService
.
getById
(
WechatUserUtil
.
getUserId
());
List
<
PlatElderChildrenInfo
>
platElderChildrenInfoList
=
platElderChildrenInfoService
.
list
(
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
().
eq
(
PlatElderChildrenInfo:
:
getOpenid
,
platElderChildrenInfo
)
.
isNotNull
(
PlatElderChildrenInfo:
:
getElderId
));
log
.
info
(
"子女端账号:"
+
platElderChildrenInfo
.
toString
());
List
<
PlatElderChildrenInfo
>
platElderChildrenInfoList
=
getPlatElderChildrenInfosByOpenid
(
platElderChildrenInfo
.
getOpenid
());
log
.
info
(
"子女端账号:{}"
,
JSON
.
toJSONString
(
platElderChildrenInfo
));
if
(
CollectionUtils
.
isNotEmpty
(
platElderChildrenInfoList
)){
return
0
;
}
...
...
@@ -551,6 +548,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
return
Math
.
toIntExact
(
count
(
lambdaQueryWrapper
));
}
private
List
<
PlatElderChildrenInfo
>
getPlatElderChildrenInfosByOpenid
(
String
openid
)
{
return
platElderChildrenInfoService
.
list
(
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
().
eq
(
PlatElderChildrenInfo:
:
getOpenid
,
openid
)
.
isNotNull
(
PlatElderChildrenInfo:
:
getElderId
));
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
misinformation
(
String
id
)
{
...
...
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