Commit b660804c authored by KeYong's avatar KeYong

修改bug

parent 7b13465e
......@@ -171,6 +171,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
Map<String,Object> fireWaterSysPipeNetwork();
Map<String,Object> fireWaterSysPipeStatus();
/**
* 消防水系统-》消火栓按钮
* @return Map<String,Object>
......
......@@ -828,6 +828,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
this.putAll(data, fireFightingSystemMapper.fireWaterSysPipeNetwork());
this.putAll(data, fireFightingSystemMapper.fireWaterSysPipeStatus());
} else {
data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
}
......
......@@ -1191,6 +1191,18 @@
LIMIT 1
</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 * from v_fire_equip_ffs_num
</select>
......@@ -1219,7 +1231,10 @@
`d`.`mjnum` AS `mjnum`,
`d`.`mjqd` AS `mjqd`,
`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
(
SELECT
......@@ -1432,7 +1447,34 @@
where
si.equipment_index_key = 'ACS_AccessControl_Shield'
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`
</select>
<select id="fireFoamSysEquipmentNumber" resultType="java.util.Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment