|
@@ -452,16 +452,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
@Transactional
|
|
|
@Override
|
|
|
public String insertDaHuaOtherEvent(DaHuaOtherEventVO daHuaOtherEventVO) {
|
|
|
- StringBuilder channelCode = new StringBuilder();
|
|
|
- //临时解决其他事件有报文没事件的问题 (等待大华解决后,还原代码: 460行使用getChannelSn())
|
|
|
- if (StringUtils.isNotBlank(daHuaOtherEventVO.getChannelCode())) {
|
|
|
- channelCode.append(daHuaOtherEventVO.getChannelCode());
|
|
|
- }else{
|
|
|
- channelCode.append(daHuaOtherEventVO.getChannelSn());
|
|
|
- }
|
|
|
|
|
|
// 验证是否配置摄像头通道
|
|
|
- CenterdataTCamera centerdataTCamera = SpringUtils.getBean(RemoteMonitorService.class).getInfoByChannelCode(channelCode.toString()).getData();
|
|
|
+ CenterdataTCamera centerdataTCamera = SpringUtils.getBean(RemoteMonitorService.class).getInfoByChannelCode(daHuaOtherEventVO.getChannelSn()).getData();
|
|
|
if (StringUtils.isNull(centerdataTCamera)) {
|
|
|
logger.info(ERROR_MSG_CHANNEL, daHuaOtherEventVO.getChannelSn());
|
|
|
return "";
|