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
d592228b
Commit
d592228b
authored
Feb 29, 2024
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(消防装备): 装备-“实时信号”显示内容修改为:最新的、未消除的告警类型
parent
f5fca530
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
EquipmentDetailServiceImpl.java
.../equipmanage/service/impl/EquipmentDetailServiceImpl.java
+5
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @
d592228b
...
...
@@ -403,14 +403,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
}
}
// 实时信号
int
count
=
equipmentSpecificAlarmLogService
.
coun
t
(
List
<
EquipmentSpecificAlarmLog
>
alarmLogs
=
equipmentSpecificAlarmLogService
.
lis
t
(
Wrappers
.<
EquipmentSpecificAlarmLog
>
lambdaQuery
()
.
select
(
EquipmentSpecificAlarmLog:
:
getEquipmentSpecificIndexName
)
.
eq
(
EquipmentSpecificAlarmLog:
:
getEquipmentSpecificId
,
id
)
.
isNull
(
EquipmentSpecificAlarmLog:
:
getCleanTime
)
.
orderByDesc
(
EquipmentSpecificAlarmLog:
:
getCreateDate
)
);
equipmentDetail
.
setSignal
(
"-"
);
if
(
count
>
0
)
{
String
signal
=
equipmentSpecific
.
getRealtimeIot
IndexName
();
if
(
!
alarmLogs
.
isEmpty
()
)
{
String
signal
=
alarmLogs
.
get
(
0
).
getEquipmentSpecific
IndexName
();
equipmentDetail
.
setSignal
(
Objects
.
nonNull
(
signal
)
?
signal
:
"-"
);
}
// 二维码
...
...
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