Merge branch 'master' into zz12356

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

@@ -336,8 +336,8 @@ public class EslClientService {
         try {
             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)
+            String arg = chanId + " att_xfer::{record_concat_video=true,call_caller=" + callerNum
+                    + ",call_callee=" + calleeNum.substring(fix.length()) + getOrigination(calleeNum)+ "}" + getCallString(calleeNum)
                     + "\r\nJob-UUID: " + action + "|" + System.currentTimeMillis();
             result = client.sendAsyncApiCommand(command, arg);
 

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

@@ -172,14 +172,12 @@ public class WebSocketService {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
                         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 + "|" + DestinationNumber + "|" + Fix);
-                            }
+                        String check = checkTargetNumber(agent.getExten() ,DestinationNumber);
+                        if (StringHelper.isEmpty(check)) {
+                            agent.setOpType(type);
+                            isExec = eslClientService.extenCall(agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber + "|" + Fix);
+                        } else {
+                            result.put("Result", check);
                         }
                     }
                     break;
@@ -213,22 +211,16 @@ public class WebSocketService {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
                         param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
-                        if (StringHelper.isNotEmpty(DestinationNumber)) {
-                            if (DestinationNumber.equals(agent.getExten())) {
-                                result.put("Result", "目标不能是自己");
+                        String check = checkTargetNumber(agent.getExten(),DestinationNumber);
+                        if (StringHelper.isEmpty(check)) {
+                            if (chan.getSessionSort() == 1) {//呼出方不可以转移
+                                result.put("Result", "主叫不能此操作");
                             } else {
-                                Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                                if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
-                                    result.put("Result", "目标坐席忙碌中");
-                                } else if (EslCommon.isInSession(DestinationNumber)) {
-                                    result.put("Result", "目标号码忙碌中");
-                                } else if (chan.getSessionSort() == 1) {//呼出方不可以转移
-                                    result.put("Result", "主叫不能此操作");
-                                } else {
-                                    agent.setOpType(type);
-                                    isExec = eslClientService.transfer(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
-                                }
+                                agent.setOpType(type);
+                                isExec = eslClientService.transfer(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber + "|" + Fix);
                             }
+                        } else {
+                            result.put("Result", check);
                         }
                     }
                     break;
@@ -238,22 +230,16 @@ public class WebSocketService {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
                         param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
-                        if (StringHelper.isNotEmpty(DestinationNumber)) {
-                            if (DestinationNumber.equals(agent.getExten())) {
-                                result.put("Result", "目标不能是自己");
+                        String check = checkTargetNumber(agent.getExten(), DestinationNumber);
+                        if (StringHelper.isEmpty(check)) {
+                            if (chan.getSessionSort() == 1) {//呼出方不可以转移
+                                result.put("Result", "主叫不能此操作");
                             } else {
-                                Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                                if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
-                                    result.put("Result", "目标坐席忙碌中");
-                                } else if (EslCommon.isInSession(DestinationNumber)) {
-                                    result.put("Result", "目标号码忙碌中");
-                                } else if (chan.getSessionSort() == 1) {//呼出方不可以协商
-                                    result.put("Result", "主叫不能此操作");
-                                } else {
-                                    agent.setOpType(type);
-                                    isExec = eslClientService.consult(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber+ "|" + Fix);
-                                }
+                                agent.setOpType(type);
+                                isExec = eslClientService.consult(chan.getSessionId(), agent.getExten(), DestinationNumber, type + "|" + agentId + "|" + DestinationNumber + "|" + Fix);
                             }
+                        } else {
+                            result.put("Result", check);
                         }
                     }
                     break;
@@ -272,22 +258,15 @@ public class WebSocketService {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         String Fix = map.get("Fix") != null ? map.get("Fix").toString() : "";
                         param = DestinationNumber + (Fix.equals("") ? "" : "|" + Fix);
-                        if (StringHelper.isNotEmpty(DestinationNumber)) {
-                            if (DestinationNumber.equals(agent.getExten())) {
-                                result.put("Result", "目标不能是自己");
-                            } else {
-                                Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                                if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
-                                    result.put("Result", "目标坐席忙碌中");
-                                } else if (EslCommon.isInSession(DestinationNumber)) {
-                                    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);
-                                }
-                            }
+
+                        String check = checkTargetNumber(agent.getExten(), DestinationNumber);
+                        if (StringHelper.isEmpty(check)) {
+                            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);
+                        } else {
+                            result.put("Result", check);
                         }
                     }
                     break;
@@ -348,20 +327,16 @@ public class WebSocketService {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
-                            if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "目标不能是自己");
-                            } else {
-                                Agent tAgent = EslCommon.getAgent(TargetAgentID);
-                                String check = checkTargetAgentTalk(tAgent);
-                                if (StringHelper.isEmpty(check)) {
-                                    Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
-                                    if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
-                                        agent.setOpType(type);
-                                        isExec = eslClientService.listen(agent.getExten(),tchan.getNumber(), tchan.getSessionId(), type + "|" + agentId + "|" + agent.getExten());
-                                    }
-                                } else {
-                                    result.put("Result", check);
+                            Agent tAgent = EslCommon.getAgent(TargetAgentID);
+                            String check = checkTargetAgentTalk(tAgent);
+                            if (StringHelper.isEmpty(check)) {
+                                Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
+                                if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
+                                    agent.setOpType(type);
+                                    isExec = eslClientService.listen(agent.getExten(),tchan.getNumber(), tchan.getSessionId(), type + "|" + agentId + "|" + agent.getExten());
                                 }
+                            } else {
+                                result.put("Result", check);
                             }
                         }
                     }
@@ -372,21 +347,17 @@ public class WebSocketService {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
-                            if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "目标不能是自己");
-                            } else {
-                                Agent tAgent = EslCommon.getAgent(TargetAgentID);
-                                String check = checkTargetAgentTalk(tAgent);
-                                if (StringHelper.isEmpty(check)) {
-                                    Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
-                                    if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
-                                        agent.setOpType(type);
-                                        String sid = tchan.getSessionId();
-                                        isExec = eslClientService.insert(agent.getExten(), tchan.getNumber(), sid, type + "|" + agentId + "|" + agent.getExten());
-                                    }
-                                } else {
-                                    result.put("Result", check);
+                            Agent tAgent = EslCommon.getAgent(TargetAgentID);
+                            String check = checkTargetAgentTalk(tAgent);
+                            if (StringHelper.isEmpty(check)) {
+                                Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
+                                if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
+                                    agent.setOpType(type);
+                                    String sid = tchan.getSessionId();
+                                    isExec = eslClientService.insert(agent.getExten(), tchan.getNumber(), sid, type + "|" + agentId + "|" + agent.getExten());
                                 }
+                            } else {
+                                result.put("Result", check);
                             }
                         }
                     }
@@ -397,22 +368,18 @@ public class WebSocketService {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
-                            if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "目标不能是自己");
-                            } else {
-                                Agent tAgent = EslCommon.getAgent(TargetAgentID);
-                                String check = checkTargetAgentTalk(tAgent);
-                                if (StringHelper.isEmpty(check)) {
-                                    Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
-                                    if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
-                                        agent.setOpType(type);
-                                        String sid = tchan.getSessionId();
-                                        Channel channel = EslCommon.getFirstChanBySessionId(sid);
-                                        isExec = eslClientService.intercept(agent.getExten(), tAgent.getExten(), channel.getChanId(), sid, type + "|" + agentId + "|" + agent.getExten());
-                                    }
-                                } else {
-                                    result.put("Result", check);
+                            Agent tAgent = EslCommon.getAgent(TargetAgentID);
+                            String check = checkTargetAgentTalk(tAgent);
+                            if (StringHelper.isEmpty(check)) {
+                                Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
+                                if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
+                                    agent.setOpType(type);
+                                    String sid = tchan.getSessionId();
+                                    Channel channel = EslCommon.getFirstChanBySessionId(sid);
+                                    isExec = eslClientService.intercept(agent.getExten(), tAgent.getExten(), channel.getChanId(), sid, type + "|" + agentId + "|" + agent.getExten());
                                 }
+                            } else {
+                                result.put("Result", check);
                             }
                         }
                     }
@@ -422,19 +389,15 @@ public class WebSocketService {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
-                            if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "目标不能是自己");
-                            } else {
-                                Agent tAgent = EslCommon.getAgent(TargetAgentID);
-                                String check = checkTargetAgentTalk(tAgent);
-                                if (StringHelper.isEmpty(check)) {
-                                    Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
-                                    if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
-                                        isExec = eslClientService.kill(tchan.getSessionId(),type + "|" + agentId);
-                                    }
-                                } else {
-                                    result.put("Result", check);
+                            Agent tAgent = EslCommon.getAgent(TargetAgentID);
+                            String check = checkTargetAgentTalk(tAgent);
+                            if (StringHelper.isEmpty(check)) {
+                                Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
+                                if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
+                                    isExec = eslClientService.kill(tchan.getSessionId(),type + "|" + agentId);
                                 }
+                            } else {
+                                result.put("Result", check);
                             }
                         }
                     }
@@ -542,8 +505,37 @@ public class WebSocketService {
         String result = "";
         if (agent == null) {
             result = "目标坐席未签入";
-        } else if (agent.getAgentState() != EslAgentEnum.talking.ordinal()) {
-            result = "目标坐席未通话";
+        } else {
+            if (agent.getAgent().equals(agentId)) {
+                result = "目标不能是自己";
+            }else if (agent.getAgentState() != EslAgentEnum.talking.ordinal()) {
+                result = "目标坐席未通话";
+            }
+        }
+        return result;
+    }
+
+    //判断目标号码是否可以呼出
+    private String checkTargetNumber(String exten,String num) {
+        String result = "";
+        if (StringHelper.isEmpty(num)) {
+            result = "目标号码不能为空";
+        } else {
+            if (exten.equals(num)) {
+                result = "目标不能是自己";
+            } else {
+                Channel chan = EslCommon.getChanByNumber(num);
+                if (chan != null) {
+                    if (!chan.getSessionId().equals("")) {
+                        result = "目标号码忙碌中";
+                    } else if (chan.getType() == 1) {//坐席
+                        Agent tAgent = EslCommon.getAgentByExten(num);
+                        if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
+                            result = "目标坐席忙碌中";
+                        }
+                    }
+                }
+            }
         }
         return result;
     }