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
b660804c
Commit
b660804c
authored
Jul 25, 2022
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
7b13465e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
2 deletions
+48
-2
FireFightingSystemMapper.java
.../yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
+3
-0
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+1
-0
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+44
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @
b660804c
...
@@ -171,6 +171,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
...
@@ -171,6 +171,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
Map
<
String
,
Object
>
fireWaterSysPipeNetwork
();
Map
<
String
,
Object
>
fireWaterSysPipeNetwork
();
Map
<
String
,
Object
>
fireWaterSysPipeStatus
();
/**
/**
* 消防水系统-》消火栓按钮
* 消防水系统-》消火栓按钮
* @return Map<String,Object>
* @return Map<String,Object>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
b660804c
...
@@ -828,6 +828,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
...
@@ -828,6 +828,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysWaterPump
());
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysWaterPump
());
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysHydrant
());
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysHydrant
());
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysPipeNetwork
());
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysPipeNetwork
());
this
.
putAll
(
data
,
fireFightingSystemMapper
.
fireWaterSysPipeStatus
());
}
else
{
}
else
{
data
=
fireFightingSystemMapper
.
otherSysIndexNumAndTotal
();
data
=
fireFightingSystemMapper
.
otherSysIndexNumAndTotal
();
}
}
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
b660804c
...
@@ -1191,6 +1191,18 @@
...
@@ -1191,6 +1191,18 @@
LIMIT 1
LIMIT 1
</select>
</select>
<select
id=
"fireWaterSysPipeStatus"
resultType=
"java.util.Map"
>
SELECT
esi.`value`,
esi.equipment_index_key
FROM
`wl_equipment_specific_index` esi
LEFT JOIN wl_equipment_specific es ON es.id = esi.equipment_specific_id
WHERE
-- 此处为水喷雾系统code,水系统实现消息实时刷新
es.`code` = "011023306003020000010509"
</select>
<select
id=
"fireFoamSysEquipmentIndexNumber"
resultType=
"java.util.Map"
>
<select
id=
"fireFoamSysEquipmentIndexNumber"
resultType=
"java.util.Map"
>
select * from v_fire_equip_ffs_num
select * from v_fire_equip_ffs_num
</select>
</select>
...
@@ -1219,7 +1231,10 @@
...
@@ -1219,7 +1231,10 @@
`d`.`mjnum` AS `mjnum`,
`d`.`mjnum` AS `mjnum`,
`d`.`mjqd` AS `mjqd`,
`d`.`mjqd` AS `mjqd`,
`d`.`mjgz` AS `mjgz`,
`d`.`mjgz` AS `mjgz`,
`d`.`mjpb` AS `mjpb`
`d`.`mjpb` AS `mjpb`,
`d`.fhzpb AS fhzpb,
`d`.fhzgz AS fhzgz,
`d`.fhzhj AS fhzhj
FROM
FROM
(
(
SELECT
SELECT
...
@@ -1432,7 +1447,34 @@
...
@@ -1432,7 +1447,34 @@
where
where
si.equipment_index_key = 'ACS_AccessControl_Shield'
si.equipment_index_key = 'ACS_AccessControl_Shield'
and si.`value` = 'true'
and si.`value` = 'true'
) AS `mjpb`
) AS `mjpb`,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'SCS_FireDamper_Shield'
AND s.`value` = 'true'
) AS fhzpb,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'SCS_FireDamper_Fault'
AND s.`value` = 'true'
) AS fhzgz,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'SCS_FireDamper_FireAlarm'
AND s.`value` = 'true'
) AS fhzhj
) `d`
) `d`
</select>
</select>
<select
id=
"fireFoamSysEquipmentNumber"
resultType=
"java.util.Map"
>
<select
id=
"fireFoamSysEquipmentNumber"
resultType=
"java.util.Map"
>
...
...
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