修改

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

@@ -95,6 +95,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) {
@@ -107,8 +109,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, "");
@@ -164,7 +165,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;
                                     }
                                 }
@@ -180,7 +180,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());
@@ -260,10 +260,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

@@ -723,6 +723,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 = "";
@@ -738,15 +755,16 @@ 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;
                 client.sendAsyncApiCommand(command, arg);
                 arg = meetingId + " mute " + memberId
-                        +"\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
+                        + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
                 result = client.sendAsyncApiCommand(command, arg);
             } else {
                 String arg = meetingId + " undeaf " + memberId;
@@ -754,12 +772,12 @@ public class EslClientService {
                 arg = meetingId + " stop all " + memberId;
                 client.sendAsyncApiCommand(command, arg);
                 arg = meetingId + " unmute " + memberId
-                        +"\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
+                        + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
                 result = client.sendAsyncApiCommand(command, arg);
             }
-            
+
         } 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)) {