修改

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

@@ -365,7 +365,7 @@ public class EslEventListenerEvent implements IEslEventListener {
                             if (agent1 != null) agent1.setAgentState(EslAgentEnum.talking.ordinal());
                         }
                         break;
-                    case CHANNEL_HANGUP_COMPLETE:
+                    case CHANNEL_HANGUP:
                         if (chan != null) {
                             String sid = chan.getSessionId();
                             if (session == null) session = EslCommon.getSessionById(sid);

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

@@ -56,10 +56,10 @@ public class EslClientService {
                 try {
                     if (EslCommon.agents.size() > 0) {
                         for (Agent a : EslCommon.agents) {
-                            logout(a.getAgent(), a.getGroup(),"");
+                            logout(a.getAgent(), a.getGroup(), "");
                             a.setAgentState(EslAgentEnum.logout.ordinal());
                         }
-                        EslCommon.agents=new ArrayList<>();
+                        EslCommon.agents = new ArrayList<>();
                     }
 
                     client.connect(config.getHost(), config.getPort(), config.getPassword(), config.getTimeout());
@@ -80,8 +80,8 @@ public class EslClientService {
                     //扫描已注册的分机
                     scanExten();
                     //设置中间件根目录
-                    String path=new File("").getAbsolutePath();
-                    client.sendAsyncApiCommand(EslCommandEnum.global_setvar.name(), "md_base_dir=" +path );
+                    String path = new File("").getAbsolutePath();
+                    client.sendAsyncApiCommand(EslCommandEnum.global_setvar.name(), "md_base_dir=" + path);
                 } catch (Exception e) {
                     log.error("fs reConnect Exception", e);
                 }
@@ -94,8 +94,8 @@ public class EslClientService {
             //扫描已注册的分机
             scanExten();
             //设置中间件根目录
-            String path=new File("").getAbsolutePath();
-            client.sendAsyncApiCommand(EslCommandEnum.global_setvar.name(), "md_base_dir=" +path );
+            String path = new File("").getAbsolutePath();
+            client.sendAsyncApiCommand(EslCommandEnum.global_setvar.name(), "md_base_dir=" + path);
         }
 
         EslCommon.checkAuth();
@@ -105,10 +105,10 @@ public class EslClientService {
     public void destroy() {
         if (EslCommon.agents.size() > 0) {
             for (Agent a : EslCommon.agents) {
-                logout(a.getAgent(), a.getGroup(),"");
+                logout(a.getAgent(), a.getGroup(), "");
                 a.setAgentState(EslAgentEnum.logout.ordinal());
             }
-            EslCommon.agents=new ArrayList<>();
+            EslCommon.agents = new ArrayList<>();
         }
     }
 
@@ -182,7 +182,7 @@ public class EslClientService {
     }
 
     //坐席签入
-    public boolean login(String agent, String ext, String group,String action) {
+    public boolean login(String agent, String ext, String group, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.callcenter_config.name();
@@ -216,9 +216,9 @@ public class EslClientService {
             // 添加梯队到队列等价于坐席组
             group = StringHelper.isEmpty(group) ? "ZXZ" : group;
             arg = " tier add " + group + " " + agent + " 1 1"
-                    +"\r\nJob-UUID:" + action + "|"+ System.currentTimeMillis();
+                    + "\r\nJob-UUID:" + action + "|" + System.currentTimeMillis();
             client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(agent + "|" + ext + "|" + group + " 签入失败", e);
         }
@@ -226,7 +226,7 @@ public class EslClientService {
     }
 
     //坐席签出
-    public boolean logout(String agent, String group,String action) {
+    public boolean logout(String agent, String group, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.callcenter_config.name();
@@ -236,9 +236,9 @@ public class EslClientService {
             // 删除梯队
             group = StringHelper.isEmpty(group) ? "ZXZ" : group;
             arg = " tier del " + group + " " + agent
-                    +"\r\nJob-UUID:" + action + "|"+ System.currentTimeMillis();
+                    + "\r\nJob-UUID:" + action + "|" + System.currentTimeMillis();
             client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(agent + "|" + group + " 签出失败", e);
         }
@@ -246,15 +246,15 @@ public class EslClientService {
     }
 
     //坐席置忙/置闲
-    public boolean setWork(String agent, boolean isWork,String action) {
+    public boolean setWork(String agent, boolean isWork, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.callcenter_config.name();
             String state = isWork ? "'Available'" : "'On Break'";
             String arg = " agent set status " + agent + " " + state
-                    +"\r\nJob-UUID:" + action + "|"+ System.currentTimeMillis();
+                    + "\r\nJob-UUID:" + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             String state = isWork ? "置闲" : "置忙";
             log.error(agent + "|" + isWork + " " + state + "失败", e);
@@ -263,12 +263,12 @@ public class EslClientService {
     }
 
     //删除
-    public boolean kill(String chanId,String action) {
+    public boolean kill(String chanId, String action) {
         String result = "";
         try {
             result = client.sendAsyncApiCommand(EslCommandEnum.uuid_kill.name(), chanId
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis());
-            
+
         } catch (Exception e) {
             log.error(chanId + " 删除失败", e);
         }
@@ -280,16 +280,16 @@ public class EslClientService {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_broadcast.name();
-            String arg = chanId + " hangup::NORMAL_CLEARING" ;
+            String arg = chanId + " hangup::NORMAL_CLEARING";
             result = client.sendAsyncApiCommand(command, arg);
         } catch (Exception e) {
-            log.error( chanId + " app挂断失败", e);
+            log.error(chanId + " app挂断失败", e);
         }
         return !result.equals("");
     }
 
     //分机呼叫
-    public boolean extenCall(String callerNum, String calleeNum,String action) {
+    public boolean extenCall(String callerNum, String calleeNum, String action) {
         String result = "";
         try {
             String fix = action.substring(action.lastIndexOf("|") + 1);
@@ -313,12 +313,12 @@ public class EslClientService {
     }
 
     //呼叫2个号码并桥接
-    public boolean bridgeNum(String callerNum, String calleeNum,String action) {
+    public boolean bridgeNum(String callerNum, String calleeNum, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.originate.name();
             String arg = " {call_caller=" + callerNum + ",call_callee=" + calleeNum + ",call_type=2"
-                    + getOrigination(calleeNum) +"}"+ getCallString(callerNum)
+                    + getOrigination(calleeNum) + "}" + getCallString(callerNum)
                     + " &bridge({call_caller=" + callerNum + getOrigination(calleeNum)
                     + "}" + getCallString(calleeNum) + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
@@ -331,16 +331,16 @@ public class EslClientService {
     }
 
     //协商呼叫
-    public boolean consult(String chanId, String callerNum,String calleeNum,String action) {
+    public boolean consult(String chanId, String callerNum, String calleeNum, String action) {
         String result = "";
         try {
-            String fix = action.substring(action.lastIndexOf("|")+1);
+            String fix = action.substring(action.lastIndexOf("|") + 1);
             String command = EslCommandEnum.uuid_broadcast.name();
             String arg = chanId + " att_xfer::{origination_caller_id_number=12356,record_concat_video=true"
                     + ",call_caller=" + callerNum + ",call_callee=" + calleeNum.substring(fix.length()) + "}" + getCallString(calleeNum)
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(chanId + "|" + calleeNum + " 协商呼叫失败", e);
         }
@@ -348,7 +348,7 @@ public class EslClientService {
     }
 
     //强插
-    public boolean insert(String callerNum,String calleeNum, String sessionId,String action) {
+    public boolean insert(String callerNum, String calleeNum, String sessionId, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.originate.name();
@@ -363,7 +363,7 @@ public class EslClientService {
     }
 
     //强截
-    public boolean intercept(String callerNum,String calleeNum, String chanId,String sessionId,String action) {
+    public boolean intercept(String callerNum, String calleeNum, String chanId, String sessionId, String action) {
         String result = "";
         try {
             Session session = EslCommon.getSessionById(sessionId);
@@ -380,15 +380,15 @@ public class EslClientService {
     }
 
     //监听
-    public boolean listen(String callerNum,String calleeNum, String sessionId,String action) {
+    public boolean listen(String callerNum, String calleeNum, String sessionId, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.originate.name();
-            String arg = " {origination_caller_id_number=" + callerNum+ ",cc_member_session_uuid=" + sessionId
-                    + ",absolute_codec_string='PCMA,PCMU',call_callee=" + calleeNum+ "}user/" + callerNum + " &eavesdrop(" + sessionId + ")"
+            String arg = " {origination_caller_id_number=" + callerNum + ",cc_member_session_uuid=" + sessionId
+                    + ",absolute_codec_string='PCMA,PCMU',call_callee=" + calleeNum + "}user/" + callerNum + " &eavesdrop(" + sessionId + ")"
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(callerNum + "|" + sessionId + " 监听失败", e);
         }
@@ -426,7 +426,8 @@ public class EslClientService {
             try {
                 Integer.parseInt(agent);
                 at = agent.replaceAll("(.)", " $1").substring(1);
-            } catch (Exception ex) { }
+            } catch (Exception ex) {
+            }
 
             String path = TtsHelper.TextToSpeechAgent("你好，" + at + "号话务员为您服务", agent);
             String arg = chanId + " playback::" + path + " both";
@@ -482,7 +483,7 @@ public class EslClientService {
     }
 
     //放音收号
-    public boolean playAndGetDigits(String path,String var, String chanId) {
+    public boolean playAndGetDigits(String path, String var, String chanId) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_broadcast.name();
@@ -498,7 +499,7 @@ public class EslClientService {
     }
 
     //放音识别
-    public boolean playAndDetectSpeech(String path,String var,  String chanId) {
+    public boolean playAndDetectSpeech(String path, String var, String chanId) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_broadcast.name();
@@ -519,16 +520,16 @@ public class EslClientService {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_break.name();
-            String arg = chanId ;
+            String arg = chanId;
             result = client.sendAsyncApiCommand(command, arg);
         } catch (Exception e) {
-            log.error( chanId + " 暂停播放语音失败", e);
+            log.error(chanId + " 暂停播放语音失败", e);
         }
         return !result.equals("");
     }
 
     //语音识别
-    public boolean funasr(String chanId,boolean isAsr) {
+    public boolean funasr(String chanId, boolean isAsr) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_audio_stream.name();
@@ -542,7 +543,7 @@ public class EslClientService {
             params.put("hotwords", null);
             String arg = "";
             if (isAsr) {
-                String url=SpringHelper.getRequiredProperty("common.funasr");
+                String url = SpringHelper.getRequiredProperty("common.funasr");
                 arg = chanId + " start " + url + " mono 16k " + JSON.toJSONString(params);
             } else {
                 arg = chanId + " stop " + JSON.toJSONString(params);
@@ -576,7 +577,7 @@ public class EslClientService {
     }
 
     //呼叫号码加入会议
-    public boolean callJoinMeeting(String callerNum, String calleeNum, String meetingId,String action) {
+    public boolean callJoinMeeting(String callerNum, String calleeNum, String meetingId, String action) {
         String result = "";
         try {
             String fix = action.substring(action.lastIndexOf("|") + 1);
@@ -593,7 +594,7 @@ public class EslClientService {
 
             String arg = " {cc_member_session_uuid=" + meetingId
                     + getOrigination(calleeNum)
-                    + ",call_callee=" + calleeNum.substring(fix.length())+",call_caller=" + callerNum
+                    + ",call_callee=" + calleeNum.substring(fix.length()) + ",call_caller=" + callerNum
                     + ",transfer_ringback=local_stream://moh,ringback=local_stream://moh"
                     + argstr + "}" + getCallString(calleeNum)
                     // + " " + meetingId + " xml ExtenMeeting";
@@ -608,12 +609,12 @@ public class EslClientService {
     }
 
     //开启/关闭静音
-    public boolean setMute(String chanId, boolean isMute,String action) {
+    public boolean setMute(String chanId, boolean isMute, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_audio.name();
             String arg = chanId + (isMute ? " start" : " stop") + " write mute -4"
-                    +"\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
+                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 
         } catch (Exception e) {
@@ -624,7 +625,7 @@ public class EslClientService {
     }
 
     //开启/关闭保持
-    public boolean setHold(String chanId, boolean isHold,String action) {
+    public boolean setHold(String chanId, boolean isHold, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_hold.name();
@@ -640,7 +641,7 @@ public class EslClientService {
     }
 
     //录音
-    public boolean record(String chanId, String filePath,boolean isRecord) {
+    public boolean record(String chanId, String filePath, boolean isRecord) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_record.name();
@@ -669,15 +670,15 @@ public class EslClientService {
     }
 
     //转满意度
-    public boolean transferMyd(String chanId,String action) {
+    public boolean transferMyd(String chanId, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_transfer.name();
             //String arg = chanId + " turnmyd xml ForExten";
             String arg = chanId + " 'set:hangup_after_bridge=false,ivr:myd' inline"
-                    +"\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
+                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(chanId + " 转满意度失败", e);
         }
@@ -685,7 +686,7 @@ public class EslClientService {
     }
 
     //转移号码
-    public boolean transfer(String chanId,String callerNum, String calleeNum,String action) {
+    public boolean transfer(String chanId, String callerNum, String calleeNum, String action) {
         String result = "";
         try {
             String fix = action.substring(action.lastIndexOf("|") + 1);
@@ -710,14 +711,14 @@ public class EslClientService {
     }
 
     //发送按键
-    public boolean sendDtmf(String chanId, String dtmf,String action) {
+    public boolean sendDtmf(String chanId, String dtmf, String action) {
         String result = "";
         try {
             String command = EslCommandEnum.uuid_send_dtmf.name();
             String arg = chanId + " " + dtmf
-                    +"\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
+                    + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
-            
+
         } catch (Exception e) {
             log.error(chanId + "|" + dtmf + " 发送按键失败", e);
         }
@@ -748,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);
         }
@@ -756,7 +757,7 @@ public class EslClientService {
     }
 
     //设置会议人员是否静音
-    public boolean setConferenceIsMute(String meetingId, String chanId, boolean isMute,String action) {
+    public boolean setConferenceIsMute(String meetingId, String chanId, boolean isMute, String action) {
         String result = "";
         try {
             String memberId = getConferenceMemberId(meetingId, chanId);
@@ -784,7 +785,7 @@ public class EslClientService {
     }
 
     //自动外呼
-    public boolean autoCall(String callerNum, String calleeNum,String taskId,String phoneId) {
+    public boolean autoCall(String callerNum, String calleeNum, String taskId, String phoneId) {
         String result = "";
         try {
             String command = EslCommandEnum.originate.name();
@@ -810,9 +811,9 @@ public class EslClientService {
         return !result.equals("");
     }
 
-    public boolean appCommand(String chanId,String command, String arg) {
+    public boolean appCommand(String chanId, String command, String arg) {
         try {
-            SendMsg sm=new SendMsg(chanId);
+            SendMsg sm = new SendMsg(chanId);
             sm.addCallCommand("execute");
             sm.addExecuteAppName(command);
             sm.addExecuteAppArg(arg);
@@ -826,7 +827,7 @@ public class EslClientService {
     //源号码
     private String getOrigination(String calleeNum) {
         String str = "";
-        String origination= SpringHelper.getRequiredProperty("common.gateway.origination");
+        String origination = SpringHelper.getRequiredProperty("common.gateway.origination");
         if (!EslCommon.existExten(calleeNum) && StringHelper.isNotEmpty(origination)) {
             str = ",origination_caller_id_number=" + origination;
         }
@@ -839,16 +840,16 @@ public class EslClientService {
         String callStr = "user/" + calleeNum;
         //呼叫外线号码
         if (!EslCommon.existExten(calleeNum)) {
-            String register= SpringHelper.getRequiredProperty("common.gateway.register");
+            String register = SpringHelper.getRequiredProperty("common.gateway.register");
             if (StringHelper.isNotEmpty(register)) {
-                callStr = "sofia/internal/" + calleeNum + "@" + register;
-
-//            //注册网关
-//            EslMessage message = client.sendSyncApiCommand("sofia_contact", "9400");
-//            if (message != null && message.getBodyLines().size() > 0) {
-//                String gwip = message.getBodyLines().get(0);
-//                callStr = "sofia/internal/" + calleeNum + gwip.substring(gwip.indexOf("@"));
-//            }
+                //callStr = "sofia/internal/" + calleeNum + "@" + register;
+
+                //注册网关
+                EslMessage message = client.sendSyncApiCommand("sofia_contact", register);
+                if (message != null && message.getBodyLines().size() > 0) {
+                    String gwip = message.getBodyLines().get(0);
+                    callStr = "sofia/internal/" + calleeNum + gwip.substring(gwip.indexOf("@"));
+                }
 
             } else {
                 callStr = "sofia/gateway/hykj/" + calleeNum;

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

@@ -6,7 +6,8 @@ public enum EslEventEnum {
     CHANNEL_PROGRESS_MEDIA("媒体进度"),
     CHANNEL_ANSWER("接听"),
     CHANNEL_BRIDGE("桥接"),
-    CHANNEL_HANGUP_COMPLETE("挂机完成"),
+    CHANNEL_HANGUP("挂机"),
+    //CHANNEL_HANGUP_COMPLETE("挂机完成"),
     //CHANNEL_HOLD("保持"),
     //CHANNEL_UNHOLD("接回"),
     //CHANNEL_EXECUTE_COMPLETE("执行完成"),