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
dcdec0b0
Commit
dcdec0b0
authored
Aug 21, 2024
by
张森
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
健康指数部分bug修改
parent
d82b1899
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
MqttReceiveServiceImpl.java
...join/equipmanage/service/impl/MqttReceiveServiceImpl.java
+4
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @
dcdec0b0
...
...
@@ -1360,7 +1360,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
if
(
iotDataVO
.
getKey
().
equalsIgnoreCase
(
CAFS_FoamTank_FoamTankLevel
)
||
iotDataVO
.
getKey
().
equalsIgnoreCase
(
CAFS_WaterTank_WaterTankLevel
))
{
map
=
fireFightingSystemMapper
.
getFoamTankLevel
(
equipmentSpecificIndex
.
getEquipmentSpecificId
());
indexKey
=
iotDataVO
.
getKey
().
equalsIgnoreCase
(
CAFS_FoamTank_FoamTankLevel
)
?
"CAFS_FOAM_TANK"
:
"
WATER_TANK_LEVEL
"
;
indexKey
=
iotDataVO
.
getKey
().
equalsIgnoreCase
(
CAFS_FoamTank_FoamTankLevel
)
?
"CAFS_FOAM_TANK"
:
"
CAFS_WaterTank_WaterTankLevel
"
;
}
else
{
map
=
fireFightingSystemMapper
.
getPipeNetwork
(
equipmentSpecificIndex
.
getEquipmentSpecificId
());
indexKey
=
"PIPE_PRESSURE"
;
...
...
@@ -1487,7 +1487,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
TableContentVo
tableContentVo2
=
new
TableContentVo
(
"报警时间"
,
"text"
,
DateUtil
.
now
(),
"3"
);
TableContentVo
tableContentVo3
=
new
TableContentVo
(
"报警对象"
,
"text"
,
map
.
getOrDefault
(
"name"
,
""
).
toString
(),
"4"
);
List
<
TableContentVo
>
tableContentVos
=
Arrays
.
asList
(
tableContentVo
,
tableContentVo1
,
tableContentVo2
,
tableContentVo3
);
equipmentSpecificIndex
.
setEquipmentSpecificName
(
map
.
get
(
"name"
).
toString
());
equipmentSpecificIndex
.
setEquipmentSpecificCode
(
map
.
get
(
"id"
).
toString
());
//预警业务 消防水池和消防水箱
handleWarning
(
minValue
,
maxValue
,
...
...
@@ -1495,7 +1496,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
equipmentSpecificIndex
,
map
.
get
(
"id"
).
toString
(),
"fireIot/data/analysis"
,
"
WATER_POOL
_LEVEL"
,
"
pool"
.
equals
(
map
.
get
(
"resourceType"
).
toString
())
?
"WATER_POOL_LEVEL"
:
"WATER_TANK
_LEVEL"
,
extra
,
"waterLevelOver"
,
tableContentVos
);
...
...
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