zhoufan 10 mēneši atpakaļ
vecāks
revīzija
2129f03052

+ 3 - 1
midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

@@ -57,6 +57,8 @@ public class EslEventListenerEvent implements IEslEventListener {
57 57
                 String chanId = header.get("Unique-ID");
58 58
                 // 获取主叫
59 59
                 String callerNum = header.get("Caller-Caller-ID-Number");
60
+                String caller = header.get("variable_call_caller");
61
+                if (StringHelper.isNotEmpty(caller)) callerNum = caller;
60 62
                 // 获取被叫
61 63
                 String calleeNum = header.get("Caller-Callee-ID-Number");
62 64
                 if (StringHelper.isEmpty(calleeNum)) calleeNum = header.get("Caller-Destination-Number");
@@ -64,7 +66,7 @@ public class EslEventListenerEvent implements IEslEventListener {
64 66
                 String ccId = header.get("variable_cc_member_session_uuid");
65 67
                 if (StringHelper.isNotEmpty(ccId)) callId = ccId;
66 68
                 //代码呼叫时,create事件得到正确的被叫号码
67
-                String called = header.get("variable_call_called");
69
+                String called = header.get("variable_call_callee");
68 70
                 if (StringHelper.isNotEmpty(called)) {
69 71
                     calleeNum = called;
70 72
                     //会议打外线主叫和被叫改变了

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

@@ -186,13 +186,13 @@ public class WebSocketService {
186 186
                 case "HoldOn"://开启保持
187 187
                     //通话中  可以开启保持
188 188
                     if (Objects.equals(state, EslAgentEnum.talking)) {
189
-                        isExec = eslClientService.setHold(chan.getSessionId(), true,type + "|" + agentId);
189
+                        isExec = eslClientService.setHold(chan.getChanId(), true,type + "|" + agentId);
190 190
                     }
191 191
                     break;
192 192
                 case "HoldOff"://关闭保持
193 193
                     //通话中  可以关闭保持
194 194
                     if (Objects.equals(state, EslAgentEnum.talking)) {
195
-                        isExec = eslClientService.setHold(chan.getSessionId(), false,type + "|" + agentId);
195
+                        isExec = eslClientService.setHold(chan.getChanId(), false,type + "|" + agentId);
196 196
                     }
197 197
                     break;
198 198
                 case "MuteOn"://开启静音