Skip to content

A
amos-boot-biz
Commit 6f9a1f40 authored by maoying's avatar maoying
Browse files
Options

车辆数据推送更新添加时间戳，消报系统组态页面数据返回修改

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