修改

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

@@ -158,6 +158,7 @@ public class EslEventListener implements IEslEventListener {
             Channel chan = EslCommon.getChanByNumber(chanNames[2]);
             Agent agent = EslCommon.getAgentByExten(chanNames[2]);
             Session session = EslCommon.getSessionById(callId);
+            int callType = EslCommon.existExten(callerNum) ? 2 : 1;
 
             LambdaUpdateWrapper<Record> uw;
 
@@ -169,7 +170,6 @@ public class EslEventListener implements IEslEventListener {
                         chan.setVideo(isVideo);
                     }
                     if (session == null) {
-                        int callType = EslCommon.existExten(callerNum) ? 2 : 1;
                         session = new Session();
                         session.setSessionId(callId);
                         session.setType(callType);
@@ -188,15 +188,14 @@ public class EslEventListener implements IEslEventListener {
 
                     //更新坐席状态
                     if (agent != null) {
-                        if (session.getType() == 2) {
+                        if (callType==2) {
                             eslClientService.setWork(agent.getAgent(), false);
                         }
                         agent.setAgentState(EslAgentNum.requested.ordinal());
                         if (agent.getOpType() == 4) return;
                     }
 
-                    //呼出主叫通道/转移被叫通道 新增记录
-                    if (session.getType() == 2) {
+                    if (callType==2) {
                         Agent callerAgent = EslCommon.getAgentByExten(callerNum);
                         if (callerAgent != null) callerAgent.setCallType(0);
                         Agent calleeAgent = EslCommon.getAgentByExten(calleeNum);
@@ -237,7 +236,7 @@ public class EslEventListener implements IEslEventListener {
                         }
                     }
                     //呼入时查找记录更新被叫工号分机号坐席组
-                    if (session.getType() == 1 && calleeNum.equals(chanNames[2])) {
+                    if (callType==1) {
                         LambdaQueryWrapper<Record> qw = new LambdaQueryWrapper<>();
                         qw.eq(Record::getUuid, callId);
                         qw.select(Record::getId).last("limit 1");
@@ -283,12 +282,11 @@ public class EslEventListener implements IEslEventListener {
                     }
                     break;
                 case CHANNEL_ANSWER:
-                    if (callerNum.equals(chanNames[2])) {
-                    }
                     if (chan != null && !chan.isAnswer()) {
                         chan.setAnswer(true);
+
                         //呼出号码应答通知坐席
-                        if (session != null && session.getType() == 2) {
+                        if (callType==2) {
                             if (!EslCommon.sessionOpera.containsKey(chanNames[2])) {
                                 try {
                                     Thread.sleep(300);
@@ -315,14 +313,14 @@ public class EslEventListener implements IEslEventListener {
                                 agent.setAgentState(EslAgentNum.talking.ordinal());
                                 if (agent.getOpType() == 4) return;
                             }
-                            //呼出
-                            if (session.getType() == 2 && !session.isAnswer()) {
+                            //分机打分机时更新主叫坐席状态
+                            if (callType==2 && !session.isAnswer()) {
                                 Agent callerAgent = EslCommon.getAgentByExten(callerNum);
                                 if (callerAgent != null) callerAgent.setAgentState(EslAgentNum.talking.ordinal());
                             }
 
                             String ext = callerNum;
-                            if (session.getType() == 1) ext = calleeNum;
+                            if (callType==1) ext = calleeNum;
 
                             String sid = session.getSessionId(), cid = chan.getChanId();
                             if (session.isVideo()) {
@@ -362,7 +360,7 @@ public class EslEventListener implements IEslEventListener {
                     break;
                 case CHANNEL_BRIDGE:
                     //呼入播报工号
-                    if (session != null && session.getType() == 1) {
+                    if (callType==1) {
                         Agent agent1 = EslCommon.getAgentByExten(calleeNum);
                         if (agent1 != null) eslClientService.playAgent(agent1.getAgent(), chan.getChanId());
                     }
@@ -377,7 +375,7 @@ public class EslEventListener implements IEslEventListener {
                     if (session == null) session = EslCommon.getSessionById(sid);
 
                     //呼出号码未接通挂断通知坐席
-                    if (session != null && session.getType() == 2 && !chan.isAnswer()) {
+                    if (callType==2 && !chan.isAnswer()) {
                         if (!EslCommon.sessionOpera.containsKey(calleeNum)) {
                             try {
                                 Thread.sleep(300);
@@ -397,7 +395,7 @@ public class EslEventListener implements IEslEventListener {
                     if (chan.getType() == 1) {
                         if (agent != null) {
                             String agentNo = agent.getAgent();
-                            if (session.getType() == 1 && chan.isAnswer()) {//呼入接通后挂断-话后处理
+                            if (callType==1 && chan.isAnswer()) {//呼入接通后挂断-话后处理
                                 agent.setAgentState(EslAgentNum.aftertalk.ordinal());
                                 new ScheduledThreadPoolExecutor(1).schedule(() -> {
                                     Agent agent2 = EslCommon.getAgent(agentNo);
@@ -409,7 +407,7 @@ public class EslEventListener implements IEslEventListener {
                                 chan.setSessionId("");
                                 agent.setAgentState(EslAgentNum.free.ordinal());
                             }
-                            if (session.getType() == 2) {
+                            if (callType==2) {
                                 eslClientService.setWork(agentNo, true);
                             }
                             agent.setCallType(0);

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

@@ -138,8 +138,17 @@ public class EslClientService {
                             chan = new Channel();
                             chan.setType(1);
                             chan.setNumber(exten);
+                            EslCommon.channels.add(chan);
+                        }else {
+                            chan.setAnswer(false);
+                            chan.setChanId("");
+                            chan.setRecordPath("");
+                            chan.setCallType(0);
+                            chan.setSessionId("");
+                            chan.setRecordId(0);
+                            chan.setRingTime(null);
+                            chan.setSessionSort(0);
                         }
-                        EslCommon.channels.add(chan);
                     }
                 }
             }
@@ -322,7 +331,7 @@ public class EslClientService {
             String arg = chanId + " playback::" + path;
             result = client.sendAsyncApiCommand(command, arg);
         } catch (Exception e) {
-            log.error(num + "|" + chanId + " 播放坐席工号失败", e);
+            log.error(num + "|" + chanId + " 播放排队位置失败", e);
         }
         return result;
     }