648540858
2024-03-14 d4f6ec39b7e0421757a6b9d1a68b1c4610ea2e8c
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
old mode 100644 new mode 100755
@@ -137,6 +137,7 @@
                                MobilePosition mobilePosition = new MobilePosition();
                                mobilePosition.setCreateTime(DateUtil.getNow());
                                mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
                                mobilePosition.setChannelId(channelId);
                                mobilePosition.setTime(deviceAlarm.getAlarmTime());
                                mobilePosition.setLongitude(deviceAlarm.getLongitude());
                                mobilePosition.setLatitude(deviceAlarm.getLatitude());
@@ -164,7 +165,7 @@
                                // 发送redis消息。 通知位置信息的变化
                                JSONObject jsonObject = new JSONObject();
                                jsonObject.put("time", mobilePosition.getTime());
                                jsonObject.put("time", DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(mobilePosition.getTime()));
                                jsonObject.put("serial", deviceChannel.getDeviceId());
                                jsonObject.put("code", deviceChannel.getChannelId());
                                jsonObject.put("longitude", mobilePosition.getLongitude());
@@ -269,12 +270,15 @@
        if (channelId.equals(parentPlatform.getDeviceGBId())) {
            // 发送给平台的报警信息。 发送redis通知
            AlarmChannelMessage alarmChannelMessage = new AlarmChannelMessage();
            alarmChannelMessage.setAlarmSn(Integer.parseInt(deviceAlarm.getAlarmMethod()));
            if (deviceAlarm.getAlarmMethod() != null) {
                alarmChannelMessage.setAlarmSn(Integer.parseInt(deviceAlarm.getAlarmMethod()));
            }
            alarmChannelMessage.setAlarmDescription(deviceAlarm.getAlarmDescription());
            alarmChannelMessage.setGbId(channelId);
            alarmChannelMessage.setAlarmType(Integer.parseInt(deviceAlarm.getAlarmType()));
            if (deviceAlarm.getAlarmType() != null) {
                alarmChannelMessage.setAlarmType(Integer.parseInt(deviceAlarm.getAlarmType()));
            }
            redisCatchStorage.sendAlarmMsg(alarmChannelMessage);
            return;
        }
    }
}