修改

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

@@ -15,6 +15,7 @@ import midware.service.rep.IOutPhoneService;
 import midware.service.rep.IRecordService;
 import midware.util.enums.EslAgentEnum;
 import midware.util.enums.EslEventEnum;
+import midware.util.helper.AsyncHelper;
 import midware.util.helper.RedisHelper;
 import midware.util.helper.SpringHelper;
 import midware.util.helper.StringHelper;
@@ -39,7 +40,7 @@ import java.util.stream.Collectors;
 public class EslEventListener implements IEslEventListener {
     @Override
     public void eventReceived(EslEvent event) {
-        //System.out.println(1 + "|" + JSON.toJSONString(event));
+        System.out.println(1 + "|" + JSON.toJSONString(event));
         //log.warn(1 + "|" + JSON.toJSONString(event));
 
         IConfigService iConfigService = SpringHelper.getBean(IConfigService.class);
@@ -120,7 +121,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);
@@ -155,7 +156,7 @@ public class EslEventListener implements IEslEventListener {
                                     result.put("Type", "Wait");
                                     result.put("Result", true);
                                     result.put("Count", EslCommon.groupWaitList.get(queue).size());
-                                    webSocketService.sendMessageGroupAll(queue,JSON.toJSONString(result));
+                                    webSocketService.sendMessageGroupAll(queue, JSON.toJSONString(result));
                                 }
                             }
                             //eslClientService.playAgent(header.get("CC-Agent"), header.get("CC-Member-Session-UUID"));
@@ -171,12 +172,26 @@ public class EslEventListener implements IEslEventListener {
                                     result.put("Type", "Wait");
                                     result.put("Result", true);
                                     result.put("Count", EslCommon.groupWaitList.get(queue).size());
-                                    webSocketService.sendMessageGroupAll(queue,JSON.toJSONString(result));
+                                    webSocketService.sendMessageGroupAll(queue, JSON.toJSONString(result));
                                 }
                             }
                             break;
                     }
                     break;
+
+                case mod_funasr_json:
+                    // 获取通道名称
+                    String[] chanNames = header.get("Channel-Name").split("\\@")[0].split("\\/");
+                    Channel chan2 = EslCommon.getChanByNumber(chanNames[2]);
+                    String asrs = header.get("funasr_result").toString();
+                    Map asr = JSON.parseObject(asrs, Map.class);
+                    if (asr.containsKey("mode") && asr.get("mode").toString().equals("2pass-offline")) {
+                        String text = asr.get("text").toString();
+                        if (StringHelper.isNotEmpty(text)) {
+                            sendAsr(chan2,text);
+                        }
+                    }
+                    break;
             }
         } else {
             // 获取会话ID
@@ -338,6 +353,16 @@ 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);
+                                        webSocketService.sendMessage(calleeAgent1.getAgent(), JSON.toJSONString(result));
+                                    }
+                                }
                             } else {
                                 chan.setRecordId(EslCommon.getChanByNumber(callerNum).getRecordId());
                                 if (calleeAgent1 != null) {
@@ -502,8 +527,9 @@ public class EslEventListener implements IEslEventListener {
                         } else {
                             //是否开启语音识别
                             if (iConfigService.getConfigValue("EnableAsr").equals("1")) {
-                                eslClientService.appCommand(chanId, "set", "fire_asr_events=true");
-                                eslClientService.appCommand(chanId, "detect_speech", "unimrcp:mrcpv2 hello hello");
+                                //eslClientService.appCommand(chanId, "set", "fire_asr_events=true");
+                                //eslClientService.appCommand(chanId, "detect_speech", "unimrcp:mrcpv2 hello hello");
+                                eslClientService.funasr(chanId);
                             }
                         }
                     }
@@ -531,6 +557,19 @@ 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;
@@ -637,34 +676,7 @@ public class EslEventListener implements IEslEventListener {
                                 String xml = String.join("", results);
                                 xmlResult = getXmlResult(xml, true);
                                 if (StringHelper.isNotEmpty(xmlResult)) {
-                                    String csid = chan.getSessionId();
-                                    List<Channel> channels = EslCommon.channels.stream().filter(p ->
-                                            p.getSessionId().equals(csid) && p.getType() == 1).collect(Collectors.toList());
-                                    for (Channel c : channels) {
-                                        Agent agent1 = EslCommon.getAgentByExten(c.getNumber());
-                                        if (agent1 != null) {
-                                            Map<String, Object> result = new HashMap<>();
-                                            result.put("Type", "Asr");
-                                            result.put("Result", true);
-                                            result.put("Speech", xmlResult);
-                                            result.put("Number", chanNames[2]);
-                                            webSocketService.sendMessage(agent1.getAgent(), JSON.toJSONString(result));
-                                        }
-                                    }
-
-                                    Asr asr = new Asr();
-                                    asr.setNumber(chanNames[2]);
-                                    asr.setResult(xmlResult);
-                                    asr.setUuid(csid);
-                                    if (agent != null) {
-                                        asr.setAgent(agent.getAgent());
-                                        asr.setGroupNo(agent.getGroup());
-                                    }
-                                    asr.setCreateTime(new Date());
-
-                                    synchronized (EslCommon.asrs) {
-                                        EslCommon.asrs.add(asr);
-                                    }
+                                    sendAsr(chan,xmlResult);
                                 }
                             }
                         }
@@ -704,7 +716,7 @@ public class EslEventListener implements IEslEventListener {
 
     @Override
     public void backgroundJobResultReceived(EslEvent event) {
-        //System.out.println(2 + "|" + JSON.toJSONString(event));
+        System.out.println(2 + "|" + JSON.toJSONString(event));
         //log.warn(2 + "|" + JSON.toJSONString(event));
 
         String bodys = event.getEventBodyLines().size() > 0 ? event.getEventBodyLines().get(0) : "";
@@ -830,4 +842,38 @@ public class EslEventListener implements IEslEventListener {
         }
         return result;
     }
+
+    //发送识别结果
+    private void sendAsr(Channel chan,String text){
+        WebSocketService webSocketService = SpringHelper.getBean(WebSocketService.class);
+        String csid = chan.getSessionId();Agent agent=null;
+        List<Channel> channels = EslCommon.channels.stream().filter(p ->
+                p.getSessionId().equals(csid) && p.getType() == 1).collect(Collectors.toList());
+        for (Channel c : channels) {
+            Agent agent1 = EslCommon.getAgentByExten(c.getNumber());
+            if (agent1 != null) {
+                Map<String, Object> result = new HashMap<>();
+                result.put("Type", "Asr");
+                result.put("Result", true);
+                result.put("Speech", text);
+                result.put("Number", chan.getNumber());
+                webSocketService.sendMessage(agent1.getAgent(), JSON.toJSONString(result));
+                if (c.getChanId().equals(chan.getChanId())) agent = agent1;
+            }
+        }
+
+        Asr asr = new Asr();
+        asr.setNumber(chan.getNumber());
+        asr.setResult(text);
+        asr.setUuid(csid);
+        if (agent != null) {
+            asr.setAgent(agent.getAgent());
+            asr.setGroupNo(agent.getGroup());
+        }
+        asr.setCreateTime(new Date());
+
+        synchronized (EslCommon.asrs) {
+            EslCommon.asrs.add(asr);
+        }
+    }
 }

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

@@ -26,6 +26,8 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
@@ -487,6 +489,41 @@ 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 funasr(String chanId) {
+        String result = "";
+        try {
+            String command = EslCommandEnum.uuid_audio_stream.name();
+            Map<String, Object> params = new HashMap<>();
+            params.put("chunk_size", new int[]{5, 10, 5});
+            params.put("wav_name", "h5");
+            params.put("is_speaking", true);
+            params.put("chunk_interval", 10);
+            params.put("itn", true);
+            params.put("mode", "offline");
+            params.put("hotwords", null);
+            String arg = chanId + " start ws://192.168.1.40:10095 mono 16k " + JSON.toJSONString(params);
+            result = client.sendAsyncApiCommand(command, arg);
+
+        } catch (Exception e) {
+            log.error(chanId + " 语音识别失败", e);
+        }
+        return !result.equals("");
+    }
+
     //会话加入会议
     public boolean talkJoinMeeting(String sessionId) {
         String result = "";
@@ -522,13 +559,13 @@ public class EslClientService {
                 argstr = ",record_concat_video=true,conference_auto_record=" + path;
             }
 
-            String arg = " {instant_ringback=true,origination_caller_id_number=" + callerNum
-                    + ",cc_member_session_uuid=" + meetingId + ",call_called=" + calleeNum.substring(fix.length())
-                    + argstr + ",transfer_ringback=local_stream://moh,ignore_early_media=true}"
+            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 + ")"
                     + "\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);

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

@@ -104,7 +104,7 @@ public class WebSocketService {
                     String AgentId = map.get("AgentId").toString();
                     String AgentExten = map.get("AgentExten").toString();
                     String AgentGroup = map.get("AgentGroup").toString();
-                    param = AgentExten + "|" + AgentGroup;
+                    param =  AgentGroup;
                     //String AgentType = map.get("AgentType").toString();
 
                     if (StringHelper.isNotEmpty(AgentId) && StringHelper.isNotEmpty(AgentExten) && StringHelper.isNotEmpty(AgentGroup)) {
@@ -140,7 +140,7 @@ public class WebSocketService {
 
                             EslCommon.agents.add(agent);
                             chan = EslCommon.getChanByExten(AgentExten);
-                            isExec = eslClientService.login(AgentId, AgentExten, AgentGroup, type + "|" + AgentId);
+                            isExec = eslClientService.login(AgentId, AgentExten, AgentGroup, type + "|" + AgentId + "|" + AgentExten + "|" + AgentGroup);
                             if (!isExec) {
                                 EslCommon.agents.remove(agent);
                             }
@@ -171,14 +171,14 @@ public class WebSocketService {
                     if (map.get("DestinationNumber") != null && Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy, EslAgentEnum.aftertalk).contains(state)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
-                        param = DestinationNumber + "|" + Fix;
+                        param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
                             if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
                                 result.put("Result", "目标坐席忙碌中");
                             } else {
                                 agent.setOpType(type);
-                                isExec = eslClientService.extenCall(agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + param + "|" + Fix);
+                                isExec = eslClientService.extenCall(agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber + "|" + Fix);
                             }
                         }
                     }
@@ -212,7 +212,7 @@ public class WebSocketService {
                     if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentEnum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
-                        param = DestinationNumber+ "|" + Fix;
+                        param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             if (DestinationNumber.equals(agent.getExten())) {
                                 result.put("Result", "目标不能是自己");
@@ -226,7 +226,7 @@ public class WebSocketService {
                                     result.put("Result", "主叫不能此操作");
                                 } else {
                                     agent.setOpType(type);
-                                    isExec = eslClientService.transfer(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + param+ "|" + Fix);
+                                    isExec = eslClientService.transfer(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
                                 }
                             }
                         }
@@ -237,7 +237,7 @@ public class WebSocketService {
                     if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentEnum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
-                        param = DestinationNumber+ "|" + Fix;
+                        param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             if (DestinationNumber.equals(agent.getExten())) {
                                 result.put("Result", "目标不能是自己");
@@ -251,7 +251,7 @@ public class WebSocketService {
                                     result.put("Result", "主叫不能此操作");
                                 } else {
                                     agent.setOpType(type);
-                                    isExec = eslClientService.consult(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + param+ "|" + Fix);
+                                    isExec = eslClientService.consult(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
                                 }
                             }
                         }
@@ -271,7 +271,7 @@ public class WebSocketService {
                     if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentEnum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
-                        param = DestinationNumber+ "|" + Fix;
+                        param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             if (DestinationNumber.equals(agent.getExten())) {
                                 result.put("Result", "目标不能是自己");
@@ -283,7 +283,7 @@ public class WebSocketService {
                                     result.put("Result", "目标号码忙碌中");
                                 } else {
                                     agent.setOpType(type);
-                                    isExec = eslClientService.callJoinMeeting(agent.getExten(), DestinationNumber, chan.getSessionId(), type + "|" + agentId + "|" + param+ "|" + Fix);
+                                    isExec = eslClientService.callJoinMeeting(agent.getExten(), DestinationNumber, chan.getSessionId(), type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
                                 }
                             }
                         }
@@ -494,6 +494,10 @@ public class WebSocketService {
                     result1.put("Result", true);
                     List<Agent> agents = new ArrayList<>(EslCommon.agents);
                     for (Agent agent1 : agents) {
+                        result1.put("State", agent1.getAgentState());
+                        result1.put("AgentId", agent1.getAgent());
+                        result1.put("Exten", agent1.getExten());
+                        result1.put("Monitor", agent1.getIsMonitor());
                         sendText(session,JSON.toJSONString(result1));
                     }
                     //通知其他监控

midware-util/src/main/java/midware/util/enums/EslCommandEnum.java

@@ -57,6 +57,8 @@ public enum EslCommandEnum {
     //uuid_transfer <uuid> [-bleg|-both] <dest-exten> [<dialplan>] [<context>]
     uuid_transfer("将现有呼叫转移到和中的特定分机。拨号计划可以是“xml”或“directory”。"),
 
+    uuid_audio_stream("asr"),
+
     callcenter_config("配置"),
     uuid_send_dtmf("按键"),
     conference("会议"),

midware-util/src/main/java/midware/util/enums/EslEventEnum.java

@@ -22,6 +22,7 @@ public enum EslEventEnum {
 
     conference_maintenance("会议","conference::maintenance","custom"),
 
+    mod_funasr_json("识别结果","mod_funasr::json","custom"),
     ;