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
8ced8dc8
Commit
8ced8dc8
authored
Jun 25, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug top改为非必传
parent
d89ec3c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
FireStationInfoController.java
.../module/ccs/biz/controller/FireStationInfoController.java
+1
-1
FireStationInfoServiceImpl.java
...dule/ccs/biz/service/impl/FireStationInfoServiceImpl.java
+6
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireStationInfoController.java
View file @
8ced8dc8
...
@@ -63,7 +63,7 @@ public class FireStationInfoController extends BaseController {
...
@@ -63,7 +63,7 @@ public class FireStationInfoController extends BaseController {
@GetMapping
(
value
=
"/getStationSafetyListByCode"
)
@GetMapping
(
value
=
"/getStationSafetyListByCode"
)
public
ResponseModel
<
List
<
FireStationInfoDto
>>
stationSafetyList
(
public
ResponseModel
<
List
<
FireStationInfoDto
>>
stationSafetyList
(
@ApiParam
(
value
=
"换流站编码"
)
@RequestParam
(
required
=
false
)
String
stationCode
,
@ApiParam
(
value
=
"换流站编码"
)
@RequestParam
(
required
=
false
)
String
stationCode
,
@ApiParam
(
value
=
"数量"
)
@RequestParam
(
required
=
tru
e
)
Integer
top
)
{
@ApiParam
(
value
=
"数量"
)
@RequestParam
(
required
=
fals
e
)
Integer
top
)
{
return
ResponseHelper
.
buildResponse
(
fireStationInfoServiceImpl
.
queryStationAlarmListByCode
(
stationCode
,
top
));
return
ResponseHelper
.
buildResponse
(
fireStationInfoServiceImpl
.
queryStationAlarmListByCode
(
stationCode
,
top
));
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java
View file @
8ced8dc8
...
@@ -63,7 +63,12 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
...
@@ -63,7 +63,12 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
item
.
setConfirmFalseNum
(
collect
.
get
(
item
.
getCode
()).
getConfirmFalseNum
());
item
.
setConfirmFalseNum
(
collect
.
get
(
item
.
getCode
()).
getConfirmFalseNum
());
}
}
});
});
List
<
FireStationInfoDto
>
finalVoList
=
fireStationInfoList
.
stream
().
skip
(
0
).
limit
(
top
).
sorted
(
Comparator
.
comparing
(
FireStationInfoDto:
:
getAlarmNum
).
reversed
()).
collect
(
Collectors
.
toList
());
List
<
FireStationInfoDto
>
finalVoList
=
new
ArrayList
<>();
if
(
null
==
top
)
{
finalVoList
=
fireStationInfoList
.
stream
().
skip
(
0
).
sorted
(
Comparator
.
comparing
(
FireStationInfoDto:
:
getAlarmNum
).
reversed
()).
collect
(
Collectors
.
toList
());
}
else
{
finalVoList
=
fireStationInfoList
.
stream
().
skip
(
0
).
limit
(
top
).
sorted
(
Comparator
.
comparing
(
FireStationInfoDto:
:
getAlarmNum
).
reversed
()).
collect
(
Collectors
.
toList
());
}
return
finalVoList
;
return
finalVoList
;
}
}
...
...
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