修改

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

@@ -32,6 +32,7 @@ public class EslEventListener implements IEslEventListener {
     @Override
     public void eventReceived(EslEvent event) {
         //System.out.println(1 + "|" + JSON.toJSONString(event));
+        //log.warn(1 + "|" + JSON.toJSONString(event));
 
         IRecordService iRecordService = SpringHelper.getBean(IRecordService.class);
         EslClientService eslClientService = SpringHelper.getBean(EslClientService.class);
@@ -211,6 +212,7 @@ public class EslEventListener implements IEslEventListener {
                                 record.setCallerAgent(callerAgent.getAgent());
                                 record.setGroupNo(callerAgent.getGroup());
                                 record.setOpType(callerAgent.getOpType());
+                                if (callerAgent.getOpType() == 1) callerAgent.setOpType(0);
                             }
                             record.setCallee(calleeNum);
                             if (calleeAgent != null) record.setCalleeAgent(calleeAgent.getAgent());
@@ -272,8 +274,17 @@ public class EslEventListener implements IEslEventListener {
                         uw.eq(Record::getId, chan.getRecordId()).set(Record::getRingTime, new Date());
                         iRecordService.updateBatch(uw);
                     }
+                    //签入视频话机外呼
+                    if(chan != null && chan.getSessionSort() == 1 && !session.isVideo()&& isVideo) {
+                        session.setVideo(true);
+                        uw = new LambdaUpdateWrapper<>();
+                        uw.eq(Record::getId, chan.getRecordId()).set(Record::getIsVideo, 1);
+                        iRecordService.updateBatch(uw);
+                    }
                     break;
                 case CHANNEL_ANSWER:
+                    if (callerNum.equals(chanNames[2])) {
+                    }
                     if (chan != null && !chan.isAnswer()) {
                         chan.setAnswer(true);
                         //呼出号码应答通知坐席
@@ -293,6 +304,7 @@ public class EslEventListener implements IEslEventListener {
                                 //会议第三方应答则将原会话加入会议
                                 if (values[0].equals("Meeting") && chan.getSessionSort() == 3) {
                                     eslClientService.talkJoinMeeting(chan.getSessionId());
+                                    eslClientService.setConferenceExitSound(chan.getSessionId(),true);
                                     session.setMeeting(true);
                                 }
                             }
@@ -305,7 +317,6 @@ public class EslEventListener implements IEslEventListener {
                             }
                             //呼出
                             if (session.getType() == 2 && !session.isAnswer()) {
-                                session.setVideo(isVideo);
                                 Agent callerAgent = EslCommon.getAgentByExten(callerNum);
                                 if (callerAgent != null) callerAgent.setAgentState(EslAgentNum.talking.ordinal());
                             }
@@ -340,8 +351,8 @@ public class EslEventListener implements IEslEventListener {
                             }
 
                             uw = new LambdaUpdateWrapper<>();
-                            uw.set(Record::getRecordPath, chan.getRecordPath()).set(Record::getIsVideo, session.isVideo() ? 1 : 0)
-                                    .set(Record::getAnswerTime, new Date()).set(Record::getIsAnswer, 1);
+                            uw.set(Record::getRecordPath, chan.getRecordPath()).set(Record::getAnswerTime, new Date())
+                                    .set(Record::getIsAnswer, 1);
                             uw.eq(Record::getId, chan.getRecordId());
                             iRecordService.updateBatch(uw);
 
@@ -406,7 +417,7 @@ public class EslEventListener implements IEslEventListener {
                             if (agent.getOpType() == 4) {
                                 isupdate = false;
                             }
-                            agent.setOpType(0);
+                            if (agent.getOpType() > 1) agent.setOpType(0);
                         }
                     }
 
@@ -472,6 +483,7 @@ public class EslEventListener implements IEslEventListener {
     @Override
     public void backgroundJobResultReceived(EslEvent event) {
         //System.out.println(2 + "|" + JSON.toJSONString(event));
+        //log.warn(2 + "|" + JSON.toJSONString(event));
 
         String bodys = event.getEventBodyLines().size() > 0 ? event.getEventBodyLines().get(0) : "";
         String uuid = event.getEventHeaders().get("Job-UUID");