old mode 100644
new mode 100755
| | |
| | | |
| | | if (CmdType.CATALOG.equals(cmd)) { |
| | | logger.info("接收到Catalog通知"); |
| | | // processNotifyCatalogList(take.getEvt()); |
| | | processNotifyCatalogList(take.getEvt()); |
| | | notifyRequestForCatalogProcessor.process(take.getEvt()); |
| | | } else if (CmdType.ALARM.equals(cmd)) { |
| | | logger.info("接收到Alarm通知"); |
| | |
| | | logger.info("[收到Notify-Alarm]:{}/{}", device.getDeviceId(), deviceAlarm.getChannelId()); |
| | | if ("4".equals(deviceAlarm.getAlarmMethod())) { |
| | | MobilePosition mobilePosition = new MobilePosition(); |
| | | mobilePosition.setChannelId(channelId); |
| | | mobilePosition.setCreateTime(DateUtil.getNow()); |
| | | mobilePosition.setDeviceId(deviceAlarm.getDeviceId()); |
| | | mobilePosition.setTime(deviceAlarm.getAlarmTime()); |
| | |
| | | logger.info("[收到目录订阅]:但是解析失败 {}", new String(evt.getRequest().getRawContent())); |
| | | continue; |
| | | } |
| | | if (channel.getParentId().equals(sipConfig.getId())) { |
| | | if (channel.getParentId() != null && channel.getParentId().equals(sipConfig.getId())) { |
| | | channel.setParentId(null); |
| | | } |
| | | channel.setDeviceId(device.getDeviceId()); |