Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
f91c5df2
Commit
f91c5df2
authored
Mar 09, 2021
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:修改三维屏指标状态推送类型bug
parent
6ff26b6d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
HandlerMqttMessageImpl.java
...mos/fas/business/service/impl/HandlerMqttMessageImpl.java
+5
-5
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java
View file @
f91c5df2
...
@@ -157,8 +157,8 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
...
@@ -157,8 +157,8 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
deviceData
.
setId
(
String
.
valueOf
(
equipmentSpecific
.
getId
()));
deviceData
.
setId
(
String
.
valueOf
(
equipmentSpecific
.
getId
()));
deviceData
.
setCode
(
equipmentSpecific
.
getCode
());
deviceData
.
setCode
(
equipmentSpecific
.
getCode
());
//设备告警处理逻辑
//设备告警处理逻辑
if
(
EquipmentRiskTypeEnum
.
HZGJ
.
getCode
().
equals
(
equipmentSpecificIndex
.
getType
()
))
{
if
(
EquipmentRiskTypeEnum
.
HZGJ
.
getCode
().
equals
(
specificIndexType
))
{
log
.
info
(
"(报警)Message type is: "
+
equipmentSpecificIndex
.
getType
()
);
log
.
info
(
"(报警)Message type is: "
+
specificIndexType
);
/**
/**
* 推送告警数据
* 推送告警数据
* 影响区域:消防安全=>火灾告警
* 影响区域:消防安全=>火灾告警
...
@@ -168,9 +168,9 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
...
@@ -168,9 +168,9 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
// 报警触发调用规则服务
// 报警触发调用规则服务
//注释自动触发预案
//注释自动触发预案
//executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke,topicEntity.getRecordId());
//executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke,topicEntity.getRecordId());
}
else
if
(
EquipmentRiskTypeEnum
.
GZ
.
getCode
().
equals
(
equipmentSpecificIndex
.
getType
()
))
{
}
else
if
(
EquipmentRiskTypeEnum
.
GZ
.
getCode
().
equals
(
specificIndexType
))
{
// 设备故障处理逻辑
// 设备故障处理逻辑
log
.
info
(
"(故障)Message type is: "
+
equipmentSpecificIndex
.
getType
()
);
log
.
info
(
"(故障)Message type is: "
+
specificIndexType
);
final
String
stateTrue
=
"true"
;
final
String
stateTrue
=
"true"
;
final
String
stateFalse
=
"false"
;
final
String
stateFalse
=
"false"
;
String
state
=
equipmentSpecificIndex
.
getValue
();
String
state
=
equipmentSpecificIndex
.
getValue
();
...
@@ -200,7 +200,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
...
@@ -200,7 +200,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
}
else
{
}
else
{
// 监测数据逻辑
// 监测数据逻辑
log
.
info
(
"(监测)Message type is: "
+
equipmentSpecificIndex
.
getType
()
);
log
.
info
(
"(监测)Message type is: "
+
specificIndexType
);
Map
<
String
,
Object
>
content
=
new
HashMap
<>();
Map
<
String
,
Object
>
content
=
new
HashMap
<>();
content
.
put
(
"id"
,
equipmentSpecific
.
getId
());
content
.
put
(
"id"
,
equipmentSpecific
.
getId
());
content
.
put
(
"label"
,
equipmentSpecific
.
getName
()+
" "
+
equipmentSpecificIndex
.
getEquipmentIndexName
());
content
.
put
(
"label"
,
equipmentSpecific
.
getName
()+
" "
+
equipmentSpecificIndex
.
getEquipmentIndexName
());
...
...
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