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
c4436854
Commit
c4436854
authored
Mar 18, 2024
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
当告警id为空时增加判断
parent
ff9038aa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
TdHygfJpInverterWarnMapper.xml
.../resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
+6
-6
TdHygfJpInverterWarnController.java
...e/hygf/biz/controller/TdHygfJpInverterWarnController.java
+3
-0
TdHygfJpInverterWarnServiceImpl.java
...ygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java
+3
-0
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @
c4436854
...
@@ -33,12 +33,12 @@
...
@@ -33,12 +33,12 @@
#{item}
#{item}
</foreach>
</foreach>
</if>
</if>
<if
test=
"param.listHandlerStatus!=null"
>
<!-- <if test="param.listHandlerStatus!=null">--
>
AND handler_status IN
<!-- AND handler_status IN-->
<foreach
collection=
"param.listHandlerStatus"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
<!-- <foreach collection="param.listHandlerStatus" item="item" index="index" open="(" separator="," close=")">--
>
#{item}
<!-- #{item}-->
</foreach
>
<!-- </foreach>--
>
</if
>
<!-- </if>--
>
</where>
</where>
order by start_time DESC
order by start_time DESC
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java
View file @
c4436854
...
@@ -292,6 +292,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
...
@@ -292,6 +292,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
result
.
setTotal
(
tdHygfJpInverterWarnServiceImpl
.
selectWarnListTotal
(
state
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
handlerStatus
));
result
.
setTotal
(
tdHygfJpInverterWarnServiceImpl
.
selectWarnListTotal
(
state
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
handlerStatus
));
List
<
Long
>
waringIds
=
maps
.
stream
().
map
(
tdHygfJpInverterWarnDto
->
tdHygfJpInverterWarnDto
.
getCreatedTime
()).
collect
(
Collectors
.
toList
());
List
<
Long
>
waringIds
=
maps
.
stream
().
map
(
tdHygfJpInverterWarnDto
->
tdHygfJpInverterWarnDto
.
getCreatedTime
()).
collect
(
Collectors
.
toList
());
if
(
waringIds
.
size
()>
0
){
waringIds
=
Arrays
.
asList
(
0L
);
}
List
<
HYGFMaintenanceTickets
>
hygfMaintenanceTicketsList
=
hygfMaintenanceTicketsMapper
.
selectList
(
new
QueryWrapper
<
HYGFMaintenanceTickets
>().
in
(
"warning_id"
,
waringIds
));
List
<
HYGFMaintenanceTickets
>
hygfMaintenanceTicketsList
=
hygfMaintenanceTicketsMapper
.
selectList
(
new
QueryWrapper
<
HYGFMaintenanceTickets
>().
in
(
"warning_id"
,
waringIds
));
maps
.
forEach
(
tdHygfJpInverterWarnDto
->
{
maps
.
forEach
(
tdHygfJpInverterWarnDto
->
{
Set
<
String
>
status
=
hygfMaintenanceTicketsList
.
stream
().
filter
(
hygfmaintenanceTickets
->
tdHygfJpInverterWarnDto
.
getCreatedTime
().
equals
(
hygfmaintenanceTickets
.
getWarningId
())).
map
(
HYGFMaintenanceTickets:
:
getHandlerStatus
).
collect
(
Collectors
.
toSet
());
Set
<
String
>
status
=
hygfMaintenanceTicketsList
.
stream
().
filter
(
hygfmaintenanceTickets
->
tdHygfJpInverterWarnDto
.
getCreatedTime
().
equals
(
hygfmaintenanceTickets
.
getWarningId
())).
map
(
HYGFMaintenanceTickets:
:
getHandlerStatus
).
collect
(
Collectors
.
toSet
());
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java
View file @
c4436854
...
@@ -90,6 +90,9 @@ public class TdHygfJpInverterWarnServiceImpl
...
@@ -90,6 +90,9 @@ public class TdHygfJpInverterWarnServiceImpl
}
}
}
}
List
<
Long
>
waringIds
=
list
.
stream
().
map
(
tdHygfJpInverterWarnDto1
->
tdHygfJpInverterWarnDto1
.
getCreatedTime
()).
collect
(
Collectors
.
toList
());
List
<
Long
>
waringIds
=
list
.
stream
().
map
(
tdHygfJpInverterWarnDto1
->
tdHygfJpInverterWarnDto1
.
getCreatedTime
()).
collect
(
Collectors
.
toList
());
if
(
waringIds
.
size
()>
0
){
waringIds
=
Arrays
.
asList
(
0L
);
}
List
<
HYGFMaintenanceTickets
>
hygfMaintenanceTicketsList
=
hygfMaintenanceTicketsMapper
.
selectList
(
new
QueryWrapper
<
HYGFMaintenanceTickets
>().
in
(
"warning_id"
,
waringIds
));
List
<
HYGFMaintenanceTickets
>
hygfMaintenanceTicketsList
=
hygfMaintenanceTicketsMapper
.
selectList
(
new
QueryWrapper
<
HYGFMaintenanceTickets
>().
in
(
"warning_id"
,
waringIds
));
Set
<
String
>
status
=
hygfMaintenanceTicketsList
.
stream
().
filter
(
hygfmaintenanceTickets
->
tdHygfJpInverterWarnDto
.
getCreatedTime
().
equals
(
hygfmaintenanceTickets
.
getWarningId
())).
map
(
HYGFMaintenanceTickets:
:
getHandlerStatus
).
collect
(
Collectors
.
toSet
());
Set
<
String
>
status
=
hygfMaintenanceTicketsList
.
stream
().
filter
(
hygfmaintenanceTickets
->
tdHygfJpInverterWarnDto
.
getCreatedTime
().
equals
(
hygfmaintenanceTickets
.
getWarningId
())).
map
(
HYGFMaintenanceTickets:
:
getHandlerStatus
).
collect
(
Collectors
.
toSet
());
if
(
status
.
contains
(
"未处理"
)){
if
(
status
.
contains
(
"未处理"
)){
...
...
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