Ver Código Fonte

修改ip话机打不出去

zhoufan 10 meses atrás
pai
commit
b6533467e1

+ 19 - 18
midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

400
                                 chan.setSessionSort(0);
400
                                 chan.setSessionSort(0);
401
                                 chan.setOpType("");
401
                                 chan.setOpType("");
402
                             }
402
                             }
403
-                            if (session != null) {
404
-                                if (EslCommon.channels.stream().noneMatch(p -> p.getSessionId().equals(sid))) {
405
-                                    EslCommon.sessions.remove(session);
406
-                                }
407
-                                //会议剩下最后一个时挂机
408
-                                if (session.isMeeting()) {
409
-                                    if (EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)).count() == 1) {
410
-                                        Channel last = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)).findFirst().get();
411
-                                        eslClientService.kill(last.getChanId(), "");
412
-                                    }
403
+                        }
404
+                        if (session != null) {
405
+                            String sid = session.getSessionId();
406
+                            if (EslCommon.channels.stream().noneMatch(p -> p.getSessionId().equals(sid))) {
407
+                                EslCommon.sessions.remove(session);
408
+                            }
409
+                            //会议剩下最后一个时挂机
410
+                            if (session.isMeeting()) {
411
+                                if (EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)).count() == 1) {
412
+                                    Channel last = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)).findFirst().get();
413
+                                    eslClientService.kill(last.getChanId(), "");
413
                                 }
414
                                 }
414
                             }
415
                             }
415
                         }
416
                         }
416
                         break;
417
                         break;
417
-                    case DTMF:
418
-                    case CHANNEL_EXECUTE_COMPLETE:
419
-                    case DETECTED_SPEECH:
420
-                    case CHANNEL_HOLD:
421
-                    case CHANNEL_UNHOLD:
422
-                        break;
418
+//                    case DTMF:
419
+//                    case CHANNEL_EXECUTE_COMPLETE:
420
+//                    case DETECTED_SPEECH:
421
+//                    case CHANNEL_HOLD:
422
+//                    case CHANNEL_UNHOLD:
423
+//                        break;
423
                 }
424
                 }
424
                 //过滤执行完成事件,识别事件
425
                 //过滤执行完成事件,识别事件
425
-                if (!Arrays.asList(EslEventEnum.CHANNEL_EXECUTE_COMPLETE, EslEventEnum.DETECTED_SPEECH).contains(EslEventEnum.valueOf(eventname))) {
426
+//                if (!Arrays.asList(EslEventEnum.CHANNEL_EXECUTE_COMPLETE, EslEventEnum.DETECTED_SPEECH).contains(EslEventEnum.valueOf(eventname))) {
426
                     ChanEvent chanEvent = new ChanEvent();
427
                     ChanEvent chanEvent = new ChanEvent();
427
                     chanEvent.setChan(chanNames[2]);
428
                     chanEvent.setChan(chanNames[2]);
428
                     chanEvent.setEvent(eventname);
429
                     chanEvent.setEvent(eventname);
432
                     synchronized (EslCommon.events) {
433
                     synchronized (EslCommon.events) {
433
                         EslCommon.events.add(chanEvent);
434
                         EslCommon.events.add(chanEvent);
434
                     }
435
                     }
435
-                }
436
+//                }
436
             }
437
             }
437
         }
438
         }
438
     }
439
     }

+ 5 - 6
midware-util/src/main/java/midware/util/enums/EslEventEnum.java

2
 
2
 
3
 public enum EslEventEnum {
3
 public enum EslEventEnum {
4
     CHANNEL_CREATE("创建"),
4
     CHANNEL_CREATE("创建"),
5
-    //CHANNEL_BRIDGE("转接"),
6
     CHANNEL_PROGRESS("进度"),
5
     CHANNEL_PROGRESS("进度"),
7
     CHANNEL_PROGRESS_MEDIA("媒体进度"),
6
     CHANNEL_PROGRESS_MEDIA("媒体进度"),
8
     CHANNEL_ANSWER("接听"),
7
     CHANNEL_ANSWER("接听"),
9
     CHANNEL_BRIDGE("桥接"),
8
     CHANNEL_BRIDGE("桥接"),
10
     CHANNEL_HANGUP_COMPLETE("挂机完成"),
9
     CHANNEL_HANGUP_COMPLETE("挂机完成"),
11
-    CHANNEL_HOLD("保持"),
12
-    CHANNEL_UNHOLD("接回"),
13
-    CHANNEL_EXECUTE_COMPLETE("执行完成"),
14
-    DTMF("按键"),
15
-    DETECTED_SPEECH("语音识别"),
10
+    //CHANNEL_HOLD("保持"),
11
+    //CHANNEL_UNHOLD("接回"),
12
+    //CHANNEL_EXECUTE_COMPLETE("执行完成"),
13
+    //DTMF("按键"),
14
+    //DETECTED_SPEECH("语音识别"),
16
     BACKGROUND_JOB("后台任务"),
15
     BACKGROUND_JOB("后台任务"),
17
 
16
 
18
     sofia_register("分机上线","sofia::register","custom"),
17
     sofia_register("分机上线","sofia::register","custom"),