Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
437fc800
Commit
437fc800
authored
Nov 24, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:直流中心bug修改
parent
b60297c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+1
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
437fc800
...
@@ -2115,13 +2115,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
...
@@ -2115,13 +2115,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
List
<
Long
>
idList
=
records
.
stream
().
map
(
FireFightingSystemDto:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
Long
>
idList
=
records
.
stream
().
map
(
FireFightingSystemDto:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
FireFightingSystemDto
>
list
=
equipmentSpecificSerivce
.
fireSysIotEquipAlarmCount
(
new
Date
(),
bizOrgCode
);
List
<
FireFightingSystemDto
>
list
=
equipmentSpecificSerivce
.
fireSysIotEquipAlarmCount
(
new
Date
(),
bizOrgCode
);
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
//使用stream流把list1和list2根据属性userId合并一个list集合
//使用stream流把list1和list2根据属性userId合并一个list集合
,并根据状态倒序、系统排序升序
List
<
FireFightingSystemDto
>
collect
=
records
.
stream
().
peek
(
m
->
list
.
stream
().
filter
(
m2
->
Objects
.
equals
(
m
.
getId
(),
m2
.
getId
())).
forEach
(
m2
->
{
List
<
FireFightingSystemDto
>
collect
=
records
.
stream
().
peek
(
m
->
list
.
stream
().
filter
(
m2
->
Objects
.
equals
(
m
.
getId
(),
m2
.
getId
())).
forEach
(
m2
->
{
m
.
setAlarmEquipTotal
(
m2
.
getAlarmEquipTotal
());
m
.
setAlarmEquipTotal
(
m2
.
getAlarmEquipTotal
());
m
.
setStatus
(
m2
.
getStatus
());
m
.
setStatus
(
m2
.
getStatus
());
})).
sorted
(
Comparator
.
comparing
(
FireFightingSystemDto:
:
getStatus
,
Comparator
.
reverseOrder
())
})).
sorted
(
Comparator
.
comparing
(
FireFightingSystemDto:
:
getStatus
,
Comparator
.
reverseOrder
())
.
thenComparing
(
FireFightingSystemDto:
:
getSort
)).
collect
(
Collectors
.
toList
());
.
thenComparing
(
FireFightingSystemDto:
:
getSort
)).
collect
(
Collectors
.
toList
());
// 根据状态倒序排序
pages
.
setRecords
(
collect
);
pages
.
setRecords
(
collect
);
}
}
}
}
...
...
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