修改

midware-api/src/main/java/midware/controller/HomeController.java

@@ -67,6 +67,11 @@ public class HomeController extends BaseController {
         return Success("", result);
     }
 
+    @GetMapping("/agentfree")
+    public String AgentFree() {
+        return EslCommon.agents.stream().anyMatch(p -> p.getAgentState() == 2) ? "1" : "0";
+    }
+
     @GetMapping("/esl")
     public AjaxResult Esl() {
         Map<String, Object> map = new HashMap<>();

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

@@ -108,7 +108,8 @@ public class EslEventListener implements IEslEventListener {
                             String uuid = header.get("Channel-Call-UUID");
                             new ScheduledThreadPoolExecutor(1).schedule(() -> {
                                 if (EslCommon.groupTempList.get(queue).remove(caller)) {
-                                    if (!EslCommon.groupWaitList.containsKey(queue)) {
+                                    long wn = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(uuid)).count();
+                                    if (wn == 1 && !EslCommon.groupWaitList.containsKey(queue)) {
                                         EslCommon.groupWaitList.put(queue, new ArrayList<>());
                                     }
                                     List<String> listWait = EslCommon.groupWaitList.get(queue);
@@ -118,7 +119,7 @@ public class EslEventListener implements IEslEventListener {
                                     result.put("Type", "Wait");
                                     result.put("Result", true);
                                     result.put("Count", listWait.size());
-                                    webSocketService.sendMessageGroupAll(queue,JSON.toJSONString(result));
+                                    webSocketService.sendMessageGroupAll(queue, JSON.toJSONString(result));
 
                                     //播报位置
                                     eslClientService.playPosition(listWait.indexOf(caller) + 1, uuid);
@@ -131,9 +132,15 @@ public class EslEventListener implements IEslEventListener {
                                     //每隔20s播报位置
                                     ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
                                     executor.scheduleAtFixedRate(() -> {
+                                        long wc = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(uuid)).count();
                                         int postion = EslCommon.groupWaitList.get(queue).indexOf(caller);
                                         if (postion >= 0) {
-                                            eslClientService.playPosition(postion + 1, uuid);
+                                            if (wc == 1) {
+                                                eslClientService.playPosition(postion + 1, uuid);
+                                            } else {
+                                                delWait(queue,caller);
+                                                executor.shutdown();
+                                            }
                                         } else {
                                             executor.shutdown();
                                         }
@@ -143,35 +150,11 @@ public class EslEventListener implements IEslEventListener {
                             break;
                         case "agent-offering":
                             String phone = header.get("CC-Member-CID-Name");
-                            if (EslCommon.groupTempList.containsKey(queue)) {
-                                EslCommon.groupTempList.get(queue).remove(phone);
-                            }
-                            if (EslCommon.groupWaitList.containsKey(queue)) {
-                                if (EslCommon.groupWaitList.get(queue).remove(phone)) {
-                                    //排队数量
-                                    Map<String, Object> result = new HashMap<>();
-                                    result.put("Type", "Wait");
-                                    result.put("Result", true);
-                                    result.put("Count", EslCommon.groupWaitList.get(queue).size());
-                                    webSocketService.sendMessageGroupAll(queue,JSON.toJSONString(result));
-                                }
-                            }
+                            delWait(queue,phone);
                             //eslClientService.playAgent(header.get("CC-Agent"), header.get("CC-Member-Session-UUID"));
                             break;
                         case "member-queue-end":
-                            if (EslCommon.groupTempList.containsKey(queue)) {
-                                EslCommon.groupTempList.get(queue).remove(caller);
-                            }
-                            if (EslCommon.groupWaitList.containsKey(queue)) {
-                                if (EslCommon.groupWaitList.get(queue).remove(caller)) {
-                                    //排队数量
-                                    Map<String, Object> result = new HashMap<>();
-                                    result.put("Type", "Wait");
-                                    result.put("Result", true);
-                                    result.put("Count", EslCommon.groupWaitList.get(queue).size());
-                                    webSocketService.sendMessageGroupAll(queue,JSON.toJSONString(result));
-                                }
-                            }
+                            delWait(queue,caller);
                             break;
                     }
                     break;
@@ -259,19 +242,7 @@ public class EslEventListener implements IEslEventListener {
                             if (calleeAgent != null) {
 
                                 String queue = calleeAgent.getGroup();
-                                if (EslCommon.groupTempList.containsKey(queue)) {
-                                    EslCommon.groupTempList.get(queue).remove(callerNum);
-                                }
-                                if (EslCommon.groupWaitList.containsKey(queue)) {
-                                    if (EslCommon.groupWaitList.get(queue).remove(callerNum)) {
-                                        //排队数量
-                                        Map<String, Object> result = new HashMap<>();
-                                        result.put("Type", "Wait");
-                                        result.put("Result", true);
-                                        result.put("Count", EslCommon.groupWaitList.get(queue).size());
-                                        webSocketService.sendMessageGroupAll(queue,JSON.toJSONString(result));
-                                    }
-                                }
+                                delWait(queue,callerNum);
 
                                 calleeAgent.setCallType(1);
                                 uw = new LambdaUpdateWrapper<>();
@@ -810,6 +781,23 @@ public class EslEventListener implements IEslEventListener {
         }
     }
 
+    //删除排队
+    private void delWait(String queue,String phone){
+        if (EslCommon.groupTempList.containsKey(queue)) {
+            EslCommon.groupTempList.get(queue).remove(phone);
+        }
+        if (EslCommon.groupWaitList.containsKey(queue)) {
+            if (EslCommon.groupWaitList.get(queue).remove(phone)) {
+                //排队数量
+                Map<String, Object> result = new HashMap<>();
+                result.put("Type", "Wait");
+                result.put("Result", true);
+                result.put("Count", EslCommon.groupWaitList.get(queue).size());
+                SpringHelper.getBean(WebSocketService.class).sendMessageGroupAll(queue,JSON.toJSONString(result));
+            }
+        }
+    }
+
     //获取识别结果
     private String getXmlResult(String xml, boolean islm) {
         String result = "";

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

@@ -505,7 +505,6 @@ public class EslClientService {
                     + "conference:" + sessionId + "@" + at + "' inline";
             result = client.sendAsyncApiCommand(command, arg);
             if (!result.equals("") && session != null) session.setMeeting(true);
-            setConferenceExitSound(sessionId, true);
         } catch (Exception e) {
             log.error(sessionId + " 会话加入会议失败", e);
         }
@@ -536,6 +535,7 @@ public class EslClientService {
                     + " &conference(" + meetingId + "@" + at + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
+            setConferenceExitSound(meetingId, true);
         } catch (Exception e) {
             log.error(callerNum + "|" + calleeNum + "|" + meetingId + " 呼叫加入会议失败", e);
         }