修改

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

@@ -100,6 +100,15 @@ public class EslCommon {
         return chan;
     }
 
+    //根据会话id获取第一个通道
+    public static Channel getFirstChanBySessionId(String sessionId) {
+        List<Channel> cs = channels.stream().filter(p -> p.getSessionId().equals(sessionId) && p.getSessionSort() == 1).collect(Collectors.toList());
+        if (cs.size() > 0) {
+            return cs.get(0);
+        }
+        return null;
+    }
+
     //根据id获取会话
     public static Session getSessionById(String id){
         List<Session> cs=sessions.stream().filter(p -> p.getSessionId().equals(id)).collect(Collectors.toList());

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

@@ -336,6 +336,19 @@ public class EslEventListener implements IEslEventListener {
                                     result.put("Number", calleeNum);
                                     webSocketService.sendMessage(callerAgent.getAgent(), JSON.toJSONString(result));
                                 }
+                                if(chanNames[2].equals(calleeNum)) {
+                                    if (calleeAgent1 != null) {
+                                        Map<String, Object> result = new HashMap<>();
+                                        result.put("Type", "Incoming");
+                                        result.put("Result", true);
+                                        result.put("CallID", chan.getRecordId());
+                                        //result.put("Number", callerNum);
+                                        Channel fc = EslCommon.getFirstChanBySessionId(session.getSessionId());
+                                        result.put("Number", fc != null ? fc.getNumber() : callerNum);
+                                        result.put("Action", chan.getOpType());
+                                        webSocketService.sendMessage(calleeAgent1.getAgent(), JSON.toJSONString(result));
+                                    }
+                                }
                             } else {
                                 chan.setRecordId(EslCommon.getChanByNumber(callerNum).getRecordId());
                                 if (calleeAgent1 != null) {
@@ -413,9 +426,7 @@ public class EslEventListener implements IEslEventListener {
                                     if (!opType.equals("MakeCall") || calleeNum.equals(chanNames[2])) {
                                         actionNotice(opType, callerAgent.getAgent(), callId, true);
                                         if (opType.equals("Meeting") && chan.getSessionSort() == 3) {
-                                            eslClientService.talkJoinMeeting(callId);
                                             eslClientService.setConferenceExitSound(callId, true);
-                                            if (session != null) session.setMeeting(true);
                                         }
                                     }
                                 }
@@ -539,20 +550,6 @@ public class EslEventListener implements IEslEventListener {
                             if (callerAgent != null && StringHelper.isNotEmpty(chan.getOpType())) {
                                 actionNotice(chan.getOpType(), callerAgent.getAgent(), sid, false);
                             }
-                            if (chan.getOpType().equals("Meeting")) {
-                                List<Channel> channels = EslCommon.channels.stream().filter(p ->
-                                        p.getSessionId().equals(sid) && !p.getChanId().equals(chanId)).collect(Collectors.toList());
-                                AsyncHelper.instance().execute(new TimerTask() {
-                                    @Override
-                                    public void run() {
-                                        for (Channel c : channels) {
-                                            eslClientService.playBreak(c.getChanId());
-                                            eslClientService.playBack("/home/website/midware/files/others/noanswer.mp3",c.getChanId());
-                                        }
-                                    }
-                                });
-                            }
-
                         }
 
                         boolean isupdate = true;

midware-service/src/main/java/midware/service/init/EslClientService.java

@@ -289,9 +289,13 @@ public class EslClientService {
         try {
             String fix = action.substring(action.lastIndexOf("|") + 1);
             String command = EslCommandEnum.originate.name();
-            String arg = " {instant_ringback=true,origination_caller_id_number=" + callerNum
-                    + ",call_called=" + calleeNum.substring(fix.length()) + ",record_concat_video=true"
-                    + ",transfer_ringback=local_stream://moh,ignore_early_media=true"
+//            String arg = " {instant_ringback=true,origination_caller_id_number=" + callerNum
+//                    + ",call_called=" + calleeNum.substring(fix.length()) + ",record_concat_video=true"
+//                    + ",transfer_ringback=local_stream://moh,ignore_early_media=true"
+//                    + "}user/" + callerNum + " &bridge(" + getCallString(calleeNum) + ")"
+//                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
+            String arg = " {origination_caller_id_number=" + callerNum + ",call_called=" + calleeNum.substring(fix.length())
+                    + ",record_concat_video=true,transfer_ringback=local_stream://moh,ringback=${us-ring}"
                     + "}user/" + callerNum + " &bridge(" + getCallString(calleeNum) + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
@@ -487,19 +491,6 @@ public class EslClientService {
         return !result.equals("");
     }
 
-    //暂停播放语音
-    public boolean playBreak(String chanId) {
-        String result = "";
-        try {
-            String command = EslCommandEnum.uuid_break.name();
-            String arg = chanId ;
-            result = client.sendAsyncApiCommand(command, arg);
-        } catch (Exception e) {
-            log.error( chanId + " 暂停播放语音失败", e);
-        }
-        return !result.equals("");
-    }
-
     //会话加入会议
     public boolean talkJoinMeeting(String sessionId) {
         String result = "";
@@ -513,6 +504,7 @@ public class EslClientService {
             String arg = sessionId + " -both 'set:hangup_after_bridge=false,set:record_concat_video=true,"
                     + "conference:" + sessionId + "@" + at + "' inline";
             result = client.sendAsyncApiCommand(command, arg);
+            if (!result.equals("") && session != null) session.setMeeting(true);
         } catch (Exception e) {
             log.error(sessionId + " 会话加入会议失败", e);
         }
@@ -536,13 +528,13 @@ public class EslClientService {
             }
 
             String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + meetingId
-                    + ",call_called=" + calleeNum.substring(fix.length()) + argstr + "}"
-                    //+ getCallString(calleeNum) + " " + meetingId + " xml ExtenMeeting";
-                    + getCallString(calleeNum) + " &conference(" + meetingId + "@" + at + ")"
+                    + ",call_called=" + calleeNum.substring(fix.length())
+                    + ",transfer_ringback=local_stream://moh,ringback=${us-ring}"
+                    + argstr + "}" + getCallString(calleeNum)
+                    // + " " + meetingId + " xml ExtenMeeting";
+                    + " &conference(" + meetingId + "@" + at + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
-            playBack("local_stream://moh",meetingId);
-
         } catch (Exception e) {
             log.error(callerNum + "|" + calleeNum + "|" + meetingId + " 呼叫加入会议失败", e);
         }
@@ -629,9 +621,14 @@ public class EslClientService {
             String fix = action.substring(action.lastIndexOf("|") + 1);
             String command = EslCommandEnum.uuid_transfer.name();
             //String arg = chanId + " " + calleeNum + " xml ForExten";
+//            String arg = chanId + " 'm:^:set:hangup_after_bridge=false^set:record_concat_video=true^"
+//                    + "set:instant_ringback=true^set:transfer_ringback=local_stream://moh^"
+//                    + "bridge:{ignore_early_media=true,origination_caller_id_number=" + callerNum + ",call_called="
+//                    + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum) + "' inline"
+//                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             String arg = chanId + " 'm:^:set:hangup_after_bridge=false^set:record_concat_video=true^"
-                    + "set:instant_ringback=true^set:transfer_ringback=local_stream://moh^"
-                    + "bridge:{ignore_early_media=true,origination_caller_id_number=" + callerNum + ",call_called="
+                    + "set:transfer_ringback=local_stream://moh^set:ringback=${us-ring}^"
+                    + "bridge:{origination_caller_id_number=" + callerNum + ",call_called="
                     + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum) + "' inline"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);

midware-service/src/main/java/midware/service/init/WebSocketService.java

@@ -283,7 +283,14 @@ public class WebSocketService {
                                     result.put("Result", "目标号码忙碌中");
                                 } else {
                                     agent.setOpType(type);
-                                    isExec = eslClientService.callJoinMeeting(agent.getExten(), DestinationNumber, chan.getSessionId(), type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
+                                    if (eslClientService.talkJoinMeeting(chan.getSessionId())) {
+                                        try {
+                                            Thread.sleep(300);
+                                            isExec = eslClientService.callJoinMeeting(agent.getExten(), DestinationNumber, chan.getSessionId(), type + "|" + agentId + "|" + DestinationNumber + "|" + Fix);
+                                        } catch (InterruptedException e) {
+                                            throw new RuntimeException(e);
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -384,9 +391,8 @@ public class WebSocketService {
                                     Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
                                     if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
                                         agent.setOpType(type);
-                                        String sid = tchan.getSessionId(), cid = tchan.getChanId();
-                                        Channel channel = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)
-                                                && !p.getChanId().equals(cid)).findFirst().get();
+                                        String sid = tchan.getSessionId();
+                                        Channel channel = EslCommon.getFirstChanBySessionId(sid);
                                         isExec = eslClientService.intercept(agent.getExten(), tAgent.getExten(), channel.getChanId(), sid, type + "|" + agentId + "|" + agent.getExten());
                                     }
                                 } else {
@@ -439,9 +445,8 @@ public class WebSocketService {
                                             result.put("Result", "主叫不能代接");
                                         } else {
                                             agent.setOpType(type);
-                                            String sid = tchan.getSessionId(), cid = tchan.getChanId();
-                                            Channel channel = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)
-                                                    && !p.getChanId().equals(cid)).findFirst().get();
+                                            String sid = tchan.getSessionId();
+                                            Channel channel = EslCommon.getFirstChanBySessionId(sid);
                                             isExec = eslClientService.intercept(agent.getExten(), tAgent.getExten(), channel.getChanId(), sid, type + "|" + agentId + "|" + agent.getExten());
                                         }
                                     }