Merge branch 'master' into zyyt

midware-service/src/main/java/midware/service/eslclient/EslCommon.java

@@ -78,6 +78,15 @@ public class EslCommon {
     }
 
     //根据id获取通道
+    public static Channel getChanById(String chanId) {
+        List<Channel> cs = channels.stream().filter(p -> p.getChanId().equals(chanId)).collect(Collectors.toList());
+        if (cs.size() > 0) {
+            return cs.get(0);
+        }
+        return null;
+    }
+
+    //根据号码获取通道
     public static Channel getChanByNumber(String number) {
         List<Channel> cs = channels.stream().filter(p -> p.getNumber().equals(number)).collect(Collectors.toList());
         if (cs.size() > 0) {

midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

@@ -78,8 +78,12 @@ public class EslEventListenerEvent implements IEslEventListener {
                 String codec = header.get("variable_ep_codec_string");
                 boolean isVideo = StringHelper.isNotEmpty(codec) && codec.contains("H264");
 
-                Channel chan = EslCommon.getChanByNumber(chanNames[2]);
-                Agent agent = EslCommon.getAgentByExten(chanNames[2]);
+                Agent agent = null;
+                Channel chan = EslCommon.getChanById(chanId);
+                if(EslCommon.existExten(chanNames[2])) {
+                    if (chan == null) chan = EslCommon.getChanByNumber(chanNames[2]);
+                    agent = EslCommon.getAgentByExten(chanNames[2]);
+                }
                 Session session = EslCommon.getSessionById(callId);
                 if (callType == 0) callType = EslCommon.existExten(callerNum) ? 2 : 1;