Skip to content

A
amos-boot-biz
Commit 0ec34b62 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

parents 28b15042 6f9a1f40
Show whitespace changes
Inline Side-by-side
Showing with 267 additions and 158 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ 0ec34b62
......@@ -1451,6 +1451,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
carProperties.forEach(carProperty->{
if (iotDataVO.getKey().equals(carProperty.getNameKey())) {
carProperty.setValue(iotDataVO.getValue().toString());
carProperty.setUpdateDate(new Date());
carPropertyVos.add(carPropertyToCarPropertyVo(carProperty));
carIndexsList.add(carProperty);
}
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 0ec34b62
......@@ -966,132 +966,293 @@
si.equipment_index_key = 'FAS_UltravioletLight_FireAlarm') as zwhynum
</select>
<select id="fireAlarmSysIndexNumber" resultType="java.util.Map">
select
(SELECT
SELECT
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_SmokeAlarm_Shield'
and s.`value` = 'true') as ywtcqpb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_SmokeAlarm_Shield'
AND s.`value` = 'true'
) AS ywtcqpb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_SmokeAlarm_Fault'
and s.`value` = 'true') as ywtcqgz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_SmokeAlarm_Fault'
AND s.`value` = 'true'
) AS ywtcqgz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_SmokeAlarm_FireAlarm'
and s.`value` = 'true') as ywtcqhj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_SmokeAlarm_FireAlarm'
AND s.`value` = 'true'
) AS ywtcqhj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_SoundLightAlarm_Shield'
and s.`value` = 'true') as sgbjqpb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_SoundLightAlarm_Shield'
AND s.`value` = 'true'
) AS sgbjqpb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_SoundLightAlarm_Fault'
and s.`value` = 'true') as sgbjqgz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_SoundLightAlarm_Fault'
AND s.`value` = 'true'
) AS sgbjqgz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_SoundLightAlarm_FireAlarm'
and s.`value` = 'true') as sgbjqhj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_SoundLightAlarm_FireAlarm'
AND s.`value` = 'true'
) AS sgbjqhj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_InfraredLight_Shield'
and s.`value` = 'true') as hwdspb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_InfraredLight_Shield'
AND s.`value` = 'true'
) AS hwdspb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_InfraredLight_Fault'
and s.`value` = 'true') as hwdsgz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_InfraredLight_Fault'
AND s.`value` = 'true'
) AS hwdsgz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_InfraredLight_FireAlarm'
and s.`value` = 'true') as hwdshj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_InfraredLight_FireAlarm'
AND s.`value` = 'true'
) AS hwdshj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_ManualAlarm_Shield'
and s.`value` = 'true') as sdbjapb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_ManualAlarm_Shield'
AND s.`value` = 'true'
) AS sdbjapb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_ManualAlarm_Fault'
and s.`value` = 'true') as sdbjagz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_ManualAlarm_Fault'
AND s.`value` = 'true'
) AS sdbjagz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_ManualAlarm_FireAlarm'
and s.`value` = 'true') as sdbjahj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_ManualAlarm_FireAlarm'
AND s.`value` = 'true'
) AS sdbjahj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_TemperatureCable_Shield'
and s.`value` = 'true') as gwdlpb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_TemperatureCable_Shield'
AND s.`value` = 'true'
) AS gwdlpb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_TemperatureCable_Fault'
and s.`value` = 'true') as gwdlgz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_TemperatureCable_Fault'
AND s.`value` = 'true'
) AS gwdlgz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_TemperatureCable_FireAlarm'
and s.`value` = 'true') as gwdlhj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_TemperatureCable_FireAlarm'
AND s.`value` = 'true'
) AS gwdlhj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_TemperatureFireDetector_Shield'
and s.`value` = 'true') as fbwgpb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_TemperatureFireDetector_Shield'
AND s.`value` = 'true'
) AS fbwgpb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_TemperatureFireDetector_Fault'
and s.`value` = 'true') as fbwggz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_TemperatureFireDetector_Fault'
AND s.`value` = 'true'
) AS fbwggz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_TemperatureFireDetector_FireAlarm'
and s.`value` = 'true') as fbwgqhj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_TemperatureFireDetector_FireAlarm'
AND s.`value` = 'true'
) AS fbwgqhj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_AirSampler_Shield'
and s.`value` = 'true') as kqcypb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_AirSampler_Shield'
AND s.`value` = 'true'
) AS kqcypb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_AirSampler_Fault'
and s.`value` = 'true') as kqcygz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_AirSampler_Fault'
AND s.`value` = 'true'
) AS kqcygz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_AirSampler_FireAlarm'
and s.`value` = 'true') as kqcyhj,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_AirSampler_FireAlarm'
AND s.`value` = 'true'
) AS kqcyhj,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_UltravioletLight_Shield'
and s.`value` = 'true') as zwhypb,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_UltravioletLight_Shield'
AND s.`value` = 'true'
) AS zwhypb,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_UltravioletLight_Fault'
and s.`value` = 'true') as zwhygz,
(SELECT
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_UltravioletLight_Fault'
AND s.`value` = 'true'
) AS zwhygz,
(
SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FAS_UltravioletLight_FireAlarm'
and s.`value` = 'true') as zwhyhj
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FAS_UltravioletLight_FireAlarm'
AND s.`value` = 'true'
) AS zwhyhj,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` si
WHERE
si.equipment_index_key = 'SCS_FireDamper_FireAlarm'
) AS fhznum,
(
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,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` si
WHERE
si.equipment_index_key = 'FES_FireBroadcast_Start'
) AS yjgbnum,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FES_FireBroadcast_Shield'
AND s.`value` = 'true'
) AS yjgbpb,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FES_FireBroadcast_Fault'
AND s.`value` = 'true'
) AS yjgbgz,
(
SELECT
count(1)
FROM
`wl_equipment_specific_index` s
WHERE
s.equipment_index_key = 'FES_FireBroadcast_Start'
AND s.`value` = 'true'
) AS yjgbqd
</select>
<select id="fireWaterSysHydrant" resultType="java.util.Map">
SELECT
......@@ -1274,16 +1435,8 @@
`d`.`mjnum` AS `mjnum`,
`d`.`mjqd` AS `mjqd`,
`d`.`mjgz` AS `mjgz`,
`d`.`mjpb` AS `mjpb`,
d.fhznum,
d.fhzpb,
d.fhzgz,
d.fhzhj,
d.yjgbnum,
d.yjgbpb,
d.yjgbgz,
d.yjgbqd
FROM
`d`.`mjpb` AS `mjpb`
FROM
(
SELECT
(
......@@ -1319,7 +1472,6 @@ FROM
`wl_equipment_specific_index` si
where
si.equipment_index_key = 'SCS_Blower_Shield'
and si.`value` = 'true'
) AS `sffjpb`,
(
select
......@@ -1496,51 +1648,7 @@ FROM
where
si.equipment_index_key = 'ACS_AccessControl_Shield'
and si.`value` = 'true'
) AS `mjpb`,
(SELECT
count(1)
from
`wl_equipment_specific_index` si
where
si.equipment_index_key = 'SCS_FireDamper_FireAlarm') as fhznum,
(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,
(SELECT
count(1)
from
`wl_equipment_specific_index` si
where
si.equipment_index_key = 'FES_FireBroadcast_Start') as yjgbnum,
(SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FES_FireBroadcast_Shield'
and s.`value` = 'true') as yjgbpb,
(SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FES_FireBroadcast_Fault'
and s.`value` = 'true') as yjgbgz,
(SELECT
count(1)
FROM `wl_equipment_specific_index` s
where s.equipment_index_key = 'FES_FireBroadcast_Start'
and s.`value` = 'true') as yjgbqd
) AS `mjpb`
) `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