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
fa0cc964
Commit
fa0cc964
authored
Dec 18, 2023
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(消防系统): 消防系统>系统部件>查看设备:已经消除了所有告警后,实时信号应该清空
【web端】3720站端:消防系统>系统部件>查看设备:已经消除了所有告警后,实时信号应该清空 Closes
http://113.142.68.105:5080/zentao/bug-view-15784.html
parent
55b15727
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
EquipmentDetailServiceImpl.java
.../equipmanage/service/impl/EquipmentDetailServiceImpl.java
+12
-2
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 @
fa0cc964
...
@@ -88,6 +88,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
...
@@ -88,6 +88,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Autowired
@Autowired
private
IEquipmentIndexService
equipmentIndexService
;
private
IEquipmentIndexService
equipmentIndexService
;
@Autowired
private
IEquipmentSpecificAlarmLogService
equipmentSpecificAlarmLogService
;
@Lazy
@Lazy
@Autowired
@Autowired
...
@@ -400,8 +402,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
...
@@ -400,8 +402,16 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
}
}
}
}
// 实时信号
// 实时信号
String
signal
=
equipmentSpecificService
.
getEquipRealtimeSignal
(
id
);
int
count
=
equipmentSpecificAlarmLogService
.
count
(
equipmentDetail
.
setSignal
(
Objects
.
nonNull
(
signal
)
?
signal
:
"-"
);
Wrappers
.<
EquipmentSpecificAlarmLog
>
lambdaQuery
()
.
eq
(
EquipmentSpecificAlarmLog:
:
getEquipmentSpecificId
,
id
)
.
isNull
(
EquipmentSpecificAlarmLog:
:
getCleanTime
)
);
equipmentDetail
.
setSignal
(
"-"
);
if
(
count
>
0
)
{
String
signal
=
equipmentSpecificService
.
getEquipRealtimeSignal
(
id
);
equipmentDetail
.
setSignal
(
Objects
.
nonNull
(
signal
)
?
signal
:
"-"
);
}
// 二维码
// 二维码
String
equipStatus
=
equipmentSpecific
.
getEquipStatus
();
String
equipStatus
=
equipmentSpecific
.
getEquipStatus
();
int
type
=
Objects
.
equals
(
equipStatus
,
"0"
)
?
3
:
1
;
int
type
=
Objects
.
equals
(
equipStatus
,
"0"
)
?
3
:
1
;
...
...
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