Commit f9214099 authored by 李秀明's avatar 李秀明

TASK#31253: 装备告警数据组装数据同步消息

parent a41fb46f
......@@ -22,7 +22,9 @@ public enum TopicEnum {
ALARM_LOG_INSERT("alarm/log/insert","告警日志插入"),
IOT_SYSTEM__AlARM("iot-system-alarm", "确警消息"),
SHBZYCXH("fasNormalIndexInsertOrUpdate", "四横八纵遥测信号"),
XFXTYXZT("fasFireSystemRunStateUpdate", "站端消防系统运行状态更新主题");
XFXTYXZT("fasFireSystemRunStateUpdate", "站端消防系统运行状态更新主题"),
ALARM_DATA_SYNC("equip/sync/alarm", "告警数据上送(中心接收emq主题)"),
STATION_ALARM_DATA_SYNC("emq.equip.created", "告警数据上送(站端emq主题)");
private String topic;
......
......@@ -678,6 +678,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
// // 告警消息推送
if (!ObjectUtils.isEmpty(equipmentSpecificAlarms)) {
publishDataToDCCenterPage(equipmentSpecificIndexList);
syncAlarmDataToCenter(equipmentSpecificAlarms);
}
//推送数据到组态大屏(消防系统)
......@@ -968,6 +969,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
// // 告警消息推送
if (!ObjectUtils.isEmpty(equipmentSpecificAlarms)) {
publishDataToDCCenterPage(equipmentSpecificIndexList);
syncAlarmDataToCenter(equipmentSpecificAlarms);
}
//推送数据到组态大屏(消防系统)
......@@ -1295,6 +1297,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
// 告警消息推送
if (!ObjectUtils.isEmpty(equipmentSpecificAlarms)) {
publishDataToDCCenterPage(equipmentSpecificIndexList);
syncAlarmDataToCenter(equipmentSpecificAlarms);
}
// 四横八纵遥测信号信息列表刷新
......@@ -2429,6 +2432,16 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
log.info(String.format("四横八纵遥测指标消息发送:%s", JSON.toJSONString(equipmentSpecificIndexList)));
}
private void syncAlarmDataToCenter(List<EquipmentSpecificAlarm> equipmentSpecificAlarms) {
for (EquipmentSpecificAlarm equipmentSpecificAlarm : equipmentSpecificAlarms) {
JSONObject message = new JSONObject();
message.put("topic", TopicEnum.ALARM_DATA_SYNC.getTopic());
message.put("data", equipmentSpecificAlarm);
mqttSendGateway.sendToMqtt(TopicEnum.STATION_ALARM_DATA_SYNC.getTopic(), message.toJSONString());
log.info(String.format("告警数据上送:%s", message.toJSONString()));
}
}
public void publishDataToMessage(List<EquipmentSpecificIndex> equipmentSpeIndexes, Boolean isAlarm) {
equipmentSpeIndexes.forEach(equipmentSpeIndex -> {
SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
......
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