|
|
@@ -400,29 +400,30 @@ public class EslEventListenerEvent implements IEslEventListener {
|
|
400
|
400
|
chan.setSessionSort(0);
|
|
401
|
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
|
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
|
427
|
ChanEvent chanEvent = new ChanEvent();
|
|
427
|
428
|
chanEvent.setChan(chanNames[2]);
|
|
428
|
429
|
chanEvent.setEvent(eventname);
|
|
|
@@ -432,7 +433,7 @@ public class EslEventListenerEvent implements IEslEventListener {
|
|
432
|
433
|
synchronized (EslCommon.events) {
|
|
433
|
434
|
EslCommon.events.add(chanEvent);
|
|
434
|
435
|
}
|
|
435
|
|
- }
|
|
|
436
|
+// }
|
|
436
|
437
|
}
|
|
437
|
438
|
}
|
|
438
|
439
|
}
|