修改

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

@@ -93,6 +93,8 @@ public class EslEventListenerEvent implements IEslEventListener {
                             session.setVideo(isVideo);
                             session.setCreateTime(new Date());
                             EslCommon.sessions.add(session);
+                        }else {
+                            session.setActionId(session.getActionId() + 1);
                         }
 
                         if (chan == null) {
@@ -105,8 +107,7 @@ public class EslEventListenerEvent implements IEslEventListener {
                         chan.setSessionId(session.getSessionId());
                         chan.setCallType(session.getType());
                         chan.setCreateTime(new Date());
-                        String finalCallId = callId;
-                        chan.setSessionSort(EslCommon.channels.stream().filter(p -> p.getSessionId().equals(finalCallId)).count());
+                        chan.setSessionSort(session.getActionId());
                         //更新坐席状态
                         if (agent != null) {
                             if (callType == 2) eslClientService.setWork(agent.getAgent(), false, "");
@@ -162,7 +163,6 @@ public class EslEventListenerEvent implements IEslEventListener {
                                     if (!(isAdd && opType.equals("MakeCall"))) callerAgent.setOpType("");
                                     //过滤分机呼出/坐席呼出
                                     if (!(opType.equals("") || opType.equals("MakeCall"))) {
-                                        session.setActionId(session.getActionId() + 1);
                                         if (!isAdd) isAdd = true;
                                     }
                                 }
@@ -178,7 +178,7 @@ public class EslEventListenerEvent implements IEslEventListener {
                                     if (calleeAgent1 != null) record.setCalleeAgent(calleeAgent1.getAgent());
                                     record.setCallType(2);
                                     record.setUuid(callId);
-                                    record.setActionId(session.getActionId());
+                                    record.setActionId(session.getActionId()>1?session.getActionId()-1:1);
                                     record.setIsAnswer(0);
                                     record.setIsVideo(session.isVideo() ? 1 : 0);
                                     record.setCreateTime(new Date());
@@ -258,10 +258,24 @@ public class EslEventListenerEvent implements IEslEventListener {
                                     if (callerAgent != null) {
                                         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);
+                                            if (opType.equals("Meeting")) {
+                                                if(chan.getSessionSort() == 3) {
+                                                    if(eslClientService.talkJoinMeeting(callId)) {
+                                                        if (session != null){
+                                                            session.setMeeting(true);
+                                                            try {
+                                                                Thread.sleep(500);
+                                                            } catch (InterruptedException e) {
+                                                                throw new RuntimeException(e);
+                                                            }
+                                                            eslClientService.setConferenceExitSound(callId, true);
+                                                        }
+                                                    }
+                                                }
+                                                //第一个人静音和禁听
+                                                if (session != null&&session.isMeetingMute()) {
+                                                    eslClientService.setConferenceIsMute(callId, callId, true, "");
+                                                }
                                             }
                                         }
                                     }

midware-service/src/main/java/midware/service/eslclient/entity/Session.java

@@ -16,6 +16,8 @@ public class Session {
     private boolean isAnswer = false;
     //是否会议
     private boolean isMeeting = false;
+    //是否会议静音
+    private boolean isMeetingMute = false;
     //是否视频
     private boolean isVideo = false;
     //视频路径

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

@@ -579,32 +579,31 @@ public class EslClientService {
     }
 
     //呼叫号码加入会议
-    public boolean callJoinMeeting(String callerNum, String calleeNum, String meetingId,String action) {
+    public boolean callJoinMeeting(String callerNum, String calleeNum, String sessionId,String action) {
         String result = "";
         try {
             String fix = action.substring(action.lastIndexOf("|") + 1);
             String command = EslCommandEnum.originate.name();
             String at = "threeway", argstr = "";
-            Session session = EslCommon.getSessionById(meetingId);
+            Session session = EslCommon.getSessionById(sessionId);
             if (session != null && session.isVideo()) {
                 at = "video-mcu-stereo";
                 String parentPath = "files/video/meeting/" + new SimpleDateFormat("yyyyMMdd").format(new Date());
-                String path = new File(parentPath).getAbsolutePath() + "/" + meetingId + ".mp4";
-                session.setVideoPath(parentPath + "/" + meetingId + ".mp4");
+                String path = new File(parentPath).getAbsolutePath() + "/" + sessionId + ".mp4";
+                session.setVideoPath(parentPath + "/" + sessionId + ".mp4");
                 argstr = ",record_concat_video=true,conference_auto_record=" + path;
             }
-
-            String arg = " {cc_member_session_uuid=" + meetingId+",call_caller=" + callerNum
+            String arg = " {cc_member_session_uuid=" + sessionId+",call_caller=" + callerNum
                     + ",call_callee=" + calleeNum.substring(fix.length())
                     + ",transfer_ringback=local_stream://moh,ringback=local_stream://moh"
                     + argstr + "}" + getCallString(calleeNum)
                     // + " " + meetingId + " xml ExtenMeeting";
-                    + " &conference(" + meetingId + "@" + at + ")"
+                    + " &conference(" + sessionId + "@" + at + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 
         } catch (Exception e) {
-            log.error(callerNum + "|" + calleeNum + "|" + meetingId + " 呼叫加入会议失败", e);
+            log.error(callerNum + "|" + calleeNum + "|" + sessionId + " 呼叫加入会议失败", e);
         }
         return !result.equals("");
     }
@@ -646,7 +645,7 @@ public class EslClientService {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_record.name();
-            String arg = chanId + (isRecord ? " start" : " stop") + filePath;
+            String arg = chanId + (isRecord ? " start " : " stop ") + filePath;
             result = client.sendAsyncApiCommand(command, arg);
         } catch (Exception e) {
             String state = isRecord ? "开启" : "关闭";
@@ -726,6 +725,23 @@ public class EslClientService {
         return !result.equals("");
     }
 
+    //获取会议人员id
+    public String getConferenceMemberId(String meetingId, String chanId) {
+        String memberId = "";
+        try {
+            //获取会议所有人员
+            EslMessage message = client.sendSyncApiCommand("conference", meetingId + " list");
+            if (message != null && message.getBodyLines().size() > 0) {
+                for (String line : message.getBodyLines()) {
+                    if (line.contains(chanId)) memberId = line.split(";")[0];
+                }
+            }
+        } catch (Exception e) {
+            log.error("获取会议人员id失败", e);
+        }
+        return memberId;
+    }
+
     //设置会议人员离开是否播放声音
     public boolean setConferenceExitSound(String meetingId, boolean isplay) {
         String result = "";
@@ -733,7 +749,7 @@ public class EslClientService {
             String command = EslCommandEnum.conference.name();
             String arg = meetingId + " exit_sound " + (isplay ? "on" : "off");
             result = client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(meetingId + "|" + isplay + " 设置会议离开失败", e);
         }
@@ -741,9 +757,10 @@ public class EslClientService {
     }
 
     //设置会议人员是否静音
-    public boolean setConferenceIsMute(String meetingId, String memberId, boolean isMute,String action) {
+    public boolean setConferenceIsMute(String meetingId, String chanId, boolean isMute,String action) {
         String result = "";
         try {
+            String memberId=getConferenceMemberId(meetingId,chanId);
             String command = EslCommandEnum.conference.name();
             if (isMute) {
                 String arg = meetingId + " deaf " + memberId;
@@ -762,7 +779,7 @@ public class EslClientService {
             }
             
         } catch (Exception e) {
-            log.error(meetingId + "|" + memberId + "|" + isMute + " 设置会议静音失败", e);
+            log.error(meetingId + "|" + chanId + "|" + isMute + " 设置会议静音失败", e);
         }
         return !result.equals("");
     }

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

@@ -283,12 +283,34 @@ public class WebSocketService {
                                     result.put("Result", "目标号码忙碌中");
                                 } else {
                                     agent.setOpType(type);
+                                    String mute = map.get("Mute") != null ? map.get("Mute").toString() : "";
+                                    EslCommon.getSessionById(chan.getSessionId()).setMeetingMute(mute.equals("true"));
                                     isExec = eslClientService.callJoinMeeting(agent.getExten(), DestinationNumber, chan.getSessionId(), type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
                                 }
                             }
                         }
                     }
                     break;
+                case "MeetingMuteOn"://会议开启静音
+                    //通话中  可以会议开启静音
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
+                        String mid = chan.getSessionId();
+                        String Number = map.get("Number") != null ? map.get("Number").toString() : "";
+                        Channel cl = EslCommon.getChanByNumber(Number);
+                        if (cl != null) mid = cl.getChanId();
+                        isExec = eslClientService.setConferenceIsMute(chan.getSessionId(), mid, true, type + "|" + agentId);
+                    }
+                    break;
+                case "MeetingMuteOff"://会议取消静音
+                    //通话中  可以会议取消静音
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
+                        String mid = chan.getSessionId();
+                        String Number = map.get("Number") != null ? map.get("Number").toString() : "";
+                        Channel cl = EslCommon.getChanByNumber(Number);
+                        if (cl != null) mid = cl.getChanId();
+                        isExec = eslClientService.setConferenceIsMute(chan.getSessionId(),mid, false,type + "|" + agentId);
+                    }
+                    break;
                 case "TurnMyd"://转满意度
                     //通话中  可以转满意度
                     if (Objects.equals(state, EslAgentEnum.talking)) {