修改

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

@@ -87,15 +87,6 @@ public class EslCommon {
         return chan;
     }
 
-    //根据分机删除通道
-    public static boolean delChanByExten(String exten){
-        List<Channel> cs=channels.stream().filter(p -> p.getType() == 1 && p.getNumber().equals(exten)).collect(Collectors.toList());
-        if(cs.size()>0){
-            return channels.removeAll(cs);
-        }
-        return true;
-    }
-
     //根据id获取会话
     public static Session getSessionById(String id){
         List<Session> cs=sessions.stream().filter(p -> p.getSessionId().equals(id)).collect(Collectors.toList());

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

@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
 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));
 
         IRecordService iRecordService = SpringHelper.getBean(IRecordService.class);
         EslClientService eslClientService = SpringHelper.getBean(EslClientService.class);
@@ -51,7 +51,18 @@ public class EslEventListener implements IEslEventListener {
                     }
                     break;
                 case sofia_unregister:
-                    EslCommon.delChanByExten(exten);
+                    Channel chan1 = EslCommon.getChanByExten(exten);
+                    if(chan1!=null) {
+                        EslCommon.channels.remove(chan1);
+                        Agent at = EslCommon.getAgentByExten(exten);
+                        if (at != null){
+                            if (at.getAgentState() != EslAgentNum.logout.ordinal()) {
+                                at.setAgentState(EslAgentNum.logout.ordinal());
+                            }
+                            eslClientService.logout(at.getAgent(), at.getGroup());
+                            EslCommon.agents.remove(at);
+                        }
+                    }
                     break;
                 case callcenter_info:
                     String caller = header.get("Caller-Username");
@@ -179,24 +190,23 @@ public class EslEventListener implements IEslEventListener {
                     //呼出主叫通道/转移被叫通道 新增记录
                     if (session.getType() == 2) {
                         Agent callerAgent = EslCommon.getAgentByExten(callerNum);
-                        callerAgent.setCallType(0);
-                        if (!(calleeNum.equals(chanNames[2]) && callerAgent.getOpType() == 0)) {
-                            if (callerAgent.getOpType() > 0) {
+                        if (callerAgent != null) callerAgent.setCallType(0);
+                        Agent calleeAgent = EslCommon.getAgentByExten(calleeNum);
+                        if (calleeAgent != null) calleeAgent.setCallType(0);
+                        if (!(calleeNum.equals(chanNames[2]) && (callerAgent == null || callerAgent.getOpType() == 0))) {
+                            if (callerAgent != null && callerAgent.getOpType() > 0) {
                                 session.setActionId(session.getActionId() + 1);
                             }
 
                             Record record = new Record();
                             record.setCaller(callerNum);
-                            record.setCallerAgent(callerAgent.getAgent());
-                            record.setGroupNo(callerAgent.getGroup());
-                            record.setOpType(callerAgent.getOpType());
-
-                            record.setCallee(calleeNum);
-                            Agent calleeAgent = EslCommon.getAgentByExten(calleeNum);
-                            if (calleeAgent != null) {
-                                calleeAgent.setCallType(session.getType());
-                                record.setCalleeAgent(calleeAgent.getAgent());
+                            if (callerAgent != null) {
+                                record.setCallerAgent(callerAgent.getAgent());
+                                record.setGroupNo(callerAgent.getGroup());
+                                record.setOpType(callerAgent.getOpType());
                             }
+                            record.setCallee(calleeNum);
+                            if (calleeAgent != null) record.setCalleeAgent(calleeAgent.getAgent());
                             record.setCallType(2);
                             record.setUuid(callId);
                             record.setActionId(session.getActionId());
@@ -206,6 +216,14 @@ public class EslEventListener implements IEslEventListener {
                             chan.setRecordId(record.getId());
                         } else {
                             chan.setRecordId(EslCommon.getChanByNumber(callerNum).getRecordId());
+                            if (calleeAgent != null) {
+                                Map<String, Object> result = new HashMap<>();
+                                result.put("Type", "Incoming");
+                                result.put("Result", true);
+                                result.put("CallID", chan.getRecordId());
+                                result.put("Number", callerNum);
+                                SpringHelper.getBean(WebSocketService.class).sendMessage(calleeAgent.getAgent(), JSON.toJSONString(result));
+                            }
                         }
                     }
                     //呼入时查找记录更新被叫工号分机号坐席组
@@ -229,7 +247,7 @@ public class EslEventListener implements IEslEventListener {
                             Map<String, Object> result = new HashMap<>();
                             result.put("Type", "Incoming");
                             result.put("Result", true);
-                            result.put("CallID", callId);
+                            result.put("CallID", chan.getRecordId());
                             result.put("Number", callerNum);
                             SpringHelper.getBean(WebSocketService.class).sendMessage(calleeAgent.getAgent(), JSON.toJSONString(result));
                         }
@@ -427,7 +445,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));
 
         String bodys = event.getEventBodyLines().size() > 0 ? event.getEventBodyLines().get(0) : "";
         String uuid = event.getEventHeaders().get("Job-UUID");
@@ -511,6 +529,13 @@ public class EslEventListener implements IEslEventListener {
                     case "Break"://强拆
                         break;
                 }
+            }else{
+                if(type.equals("Login")){
+                    if(agent!=null) {
+                        SpringHelper.getBean(EslClientService.class).logout(agentId, agent.getGroup());
+                        EslCommon.agents.remove(agent);
+                    }
+                }
             }
             EslCommon.sessionOpera.remove(uuid);
             if (isEnd) {

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

@@ -12,7 +12,6 @@ import midware.util.helper.StringHelper;
 import org.springframework.stereotype.Component;
 
 import javax.websocket.*;
-import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.util.*;
@@ -56,7 +55,7 @@ public class WebSocketService {
                 EslCommon.agents.remove(a);
                 sessionPool.remove(agentId);
             }
-            if(subScribeSessionPool.contains(session))subScribeSessionPool.remove(session);
+            subScribeSessionPool.remove(session);
         } catch (Exception e) {
             log.error("close错误", e);
         }
@@ -70,15 +69,24 @@ public class WebSocketService {
     @OnMessage
     public void onMessage(String message) {
         try {
-            Map<String, Object> result = new HashMap<>();
             Map map = JSON.parseObject(message, Map.class);
             String type = map.get("Type").toString();
-            Agent agent = EslCommon.getAgent(agentId);
-            Channel chan = null;
-            if (agent != null) chan = EslCommon.getChanByExten(agent.getExten());
-            EslAgentNum state = agent == null ? null : EslAgentNum.values()[agent.getAgentState()];
+
+            Map<String, Object> result = new HashMap<>();
             result.put("Type", type);
             result.put("Result", "操作失败");
+            Agent agent = EslCommon.getAgent(agentId);
+            Channel chan = null;EslAgentNum state =null;
+            if (agent != null) {
+                chan = EslCommon.getChanByExten(agent.getExten());
+                state = EslAgentNum.values()[agent.getAgentState()];
+                if (chan == null) {
+                    result.put("Result", "分机未注册");
+                    state = null;
+                }
+            }
+
+
             String param = "";
             boolean isSend = true;
             switch (type) {
@@ -92,40 +100,37 @@ public class WebSocketService {
                     param = AgentExten + "|" + AgentGroup;
                     //String AgentType = map.get("AgentType").toString();
 
-                    if (StringHelper.isNotEmpty(agentId)) {
-                        result.put("Result", "重复签入");
-                    } else {
-                        if (StringHelper.isNotEmpty(AgentId) && StringHelper.isNotEmpty(AgentExten) && StringHelper.isNotEmpty(AgentGroup)) {
-                            if (EslCommon.existAgent(AgentId)) {
-                                result.put("Result", "坐席已存在");
-                            } else if (!EslCommon.existExten(AgentExten)) {
-                                result.put("Result", "分机未注册");
-                            } else if (EslCommon.getAgentByExten(AgentExten) != null) {
-                                result.put("Result", "分机已存在");
-                            } else {
-                                this.agentId = AgentId;
-                                sessionPool.put(AgentId,session);
+                    if (StringHelper.isNotEmpty(AgentId) && StringHelper.isNotEmpty(AgentExten) && StringHelper.isNotEmpty(AgentGroup)) {
+                        if (EslCommon.existAgent(AgentId)) {
+                            result.put("Result", "坐席已存在");
+                        } else if (!EslCommon.existExten(AgentExten)) {
+                            result.put("Result", "分机未注册");
+                        } else if (EslCommon.getAgentByExten(AgentExten) != null) {
+                            result.put("Result", "分机已存在");
+                        } else {
+                            this.agentId = AgentId;
+                            sessionPool.put(AgentId, session);
 
-                                agent = new Agent();
-                                agent.setAgent(AgentId);
-                                agent.setExten(AgentExten);
-                                agent.setGroup(AgentGroup);
-                                //agent.setAgentState(EslAgentNum.loging.ordinal());
+                            agent = new Agent();
+                            agent.setAgent(AgentId);
+                            agent.setExten(AgentExten);
+                            agent.setGroup(AgentGroup);
+                            agent.setAgentState(EslAgentNum.loging.ordinal());
 
-                                chan = EslCommon.getChanByExten(AgentExten);
-                                String rt = eslClientService.login(AgentId, AgentExten, AgentGroup);
-                                if (StringHelper.isNotEmpty(rt)) {
-                                    EslCommon.agents.add(agent);
-                                    EslCommon.sessionOpera.put(rt, type + "|" + AgentId);
-                                    isSend = false;
-                                }
+                            chan = EslCommon.getChanByExten(AgentExten);
+                            String rt = eslClientService.login(AgentId, AgentExten, AgentGroup);
+                            if (StringHelper.isNotEmpty(rt)) {
+                                EslCommon.agents.add(agent);
+                                EslCommon.sessionOpera.put(rt, type + "|" + AgentId);
+                                isSend = false;
                             }
                         }
                     }
+
                     break;
                 case "Logout"://签出
                     //空闲/置忙/话后处理  可以签出
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
+                    if (Arrays.asList(EslAgentNum.free, EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
                         String rt = eslClientService.logout(agentId, agent.getGroup());
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -137,7 +142,7 @@ public class WebSocketService {
                     break;
                 case "WorkOn"://置闲
                     //置忙/话后处理  可以置闲
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
+                    if (Arrays.asList(EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
                         String rt = eslClientService.setWork(agentId, true);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -147,7 +152,7 @@ public class WebSocketService {
                     break;
                 case "WorkOff"://置忙
                     //空闲/话后处理  可以置忙
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.aftertalk).contains(state)) {
+                    if (Arrays.asList(EslAgentNum.free, EslAgentNum.aftertalk).contains(state)) {
                         String rt = eslClientService.setWork(agentId, false);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -157,7 +162,7 @@ public class WebSocketService {
                     break;
                 case "MakeCall"://外呼
                     //空闲/置忙/话后处理  可以外呼
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
+                    if (map.get("DestinationNumber") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -176,7 +181,7 @@ public class WebSocketService {
                     break;
                 case "HoldOn"://开启保持
                     //通话中  可以开启保持
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentNum.talking)) {
                         String rt = eslClientService.setHold(chan.getSessionId(), true);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -186,7 +191,7 @@ public class WebSocketService {
                     break;
                 case "HoldOff"://关闭保持
                     //通话中  可以关闭保持
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentNum.talking)) {
                         String rt = eslClientService.setHold(chan.getSessionId(), false);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -196,7 +201,7 @@ public class WebSocketService {
                     break;
                 case "MuteOn"://开启静音
                     //通话中  可以开启静音
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentNum.talking)) {
                         String rt = eslClientService.setMute(chan.getChanId(), true);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -206,7 +211,7 @@ public class WebSocketService {
                     break;
                 case "MuteOff"://关闭静音
                     //通话中  可以关闭静音
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentNum.talking)) {
                         String rt = eslClientService.setMute(chan.getChanId(), false);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -216,7 +221,7 @@ public class WebSocketService {
                     break;
                 case "Transfer"://转移
                     //通话中  可以转移
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentNum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -244,7 +249,7 @@ public class WebSocketService {
                     break;
                 case "ConsultOn"://开启协商
                     //通话中  可以协商
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentNum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -272,7 +277,7 @@ public class WebSocketService {
                     break;
                 case "ConsultOff"://关闭协商
                     //通话中  可以协商取消
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentNum.talking)) {
                         String sid = chan.getSessionId();
                         Channel channel = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)
                                 && p.getSessionSort() == 3).findFirst().get();
@@ -285,7 +290,7 @@ public class WebSocketService {
                     break;
                 case "Meeting"://会议
                     //通话中  可以会议
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentNum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -311,7 +316,7 @@ public class WebSocketService {
                     break;
                 case "TurnMyd"://转满意度
                     //通话中  可以转满意度
-                    if (StringHelper.isNotEmpty(agentId) && Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentNum.talking)) {
                         String rt = eslClientService.turnMyd(chan.getSessionId());
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -321,7 +326,7 @@ public class WebSocketService {
                     break;
                 case "DropCall"://挂机
                     //通话中/请求中  可以挂机
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.talking, EslAgentNum.requested).contains(state)) {
+                    if (Arrays.asList(EslAgentNum.talking, EslAgentNum.requested).contains(state)) {
                         String rt = eslClientService.kill(chan.getChanId());
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -330,18 +335,18 @@ public class WebSocketService {
                     }
                     break;
                 case "SubScribeOn":
-                    agent.setIsMonitor(1);
+                    if (agent != null) agent.setIsMonitor(1);
                     subScribeSessionPool.add(this.session);
                     result.put("Result", true);
                     break;
                 case "SubScribeOff":
-                    agent.setIsMonitor(0);
+                    if (agent != null) agent.setIsMonitor(0);
                     subScribeSessionPool.remove(this.session);
                     result.put("Result", true);
                     break;
                 case "Listen"://监听
                     //空闲/置忙  可以监听
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -369,7 +374,7 @@ public class WebSocketService {
                     break;
                 case "Insert"://强插
                     //空闲/置忙  可以强插
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -398,7 +403,7 @@ public class WebSocketService {
                     break;
                 case "Intercept"://强截
                     //空闲/置忙  可以强截
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -428,7 +433,7 @@ public class WebSocketService {
                     }
                     break;
                 case "Break"://强拆
-                    if (state.ordinal() > 0) {
+                    if (map.get("TargetAgentID") != null) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -455,7 +460,7 @@ public class WebSocketService {
                     break;
                 case "Instead"://代接
                     //空闲/置忙  可以代接
-                    if (StringHelper.isNotEmpty(agentId) && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -491,7 +496,7 @@ public class WebSocketService {
                     break;
                 case "ForceWorkOn"://强制置闲
                 case "ForceWorkOff"://强制置忙
-                    if (state.ordinal() > 0) {
+                    if (map.get("TargetAgentID") != null) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -511,11 +516,14 @@ public class WebSocketService {
                     }
                     break;
             }
+
             AgentAction aa = new AgentAction();
             aa.setAction(type);
-            aa.setGroupNo(agent.getGroup());
-            aa.setAgent(agent.getAgent());
-            aa.setExten(agent.getExten());
+            if(agent!=null) {
+                aa.setGroupNo(agent.getGroup());
+                aa.setAgent(agent.getAgent());
+                aa.setExten(agent.getExten());
+            }
             aa.setParam(param);
             if (chan != null) aa.setUuid(chan.getSessionId());
             aa.setIsSuccess(0);
@@ -574,7 +582,7 @@ public class WebSocketService {
             EslCommon.agents.remove(a);
             sessionPool.remove(agentId);
         }
-        if(subScribeSessionPool.contains(session))subScribeSessionPool.remove(session);
+        subScribeSessionPool.remove(session);
         error.printStackTrace();
     }