大华其他事件 channelSn值错误临时解决

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -224,6 +224,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             for (String url : datasetUrl.split(";")) {
+                //http://116.142.80.12:8090/iserver/services/data-chengchunzhen/rest/data/featureResults.json?returnContent=true&datasetNames=["chengchuanzhen:城川镇_1"];
+                // http://116.142.80.12:8090/iserver/services/data-yunzhaijidi/rest/data/featureResults.json?returnContent=true&datasetNames=["宅基地设施用地_1:宅基地设施用地"];
+                // http://116.142.80.12:8090/iserver/services/data-aozhen/rest/data/featureResults.json?returnContent=true&datasetNames=["aozhen红线:敖镇耕地红线_1","aozhen红线:敖镇人工草地","aozhen红线:敖镇土地确权"]
                 JSONObject requestBody = JSONObject.parseObject("{" +
                         "\"getFeatureMode\": \"SPATIAL\"," +
                         "\"datasetNames\": " + url.split("&datasetNames=")[1] + "," +
@@ -448,8 +451,16 @@ 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(daHuaOtherEventVO.getChannelSn()).getData();
+        CenterdataTCamera centerdataTCamera = SpringUtils.getBean(RemoteMonitorService.class).getInfoByChannelCode(channelCode.toString()).getData();
         if (StringUtils.isNull(centerdataTCamera)) {
             logger.info(ERROR_MSG_CHANNEL, daHuaOtherEventVO.getChannelSn());
             return "";