修改

midware-api/src/main/resources/application-dev.yml

@@ -23,7 +23,8 @@ spring:
     timeout: 10s
 
   freeswitch:
-    host: 192.168.8.17
+    #不在一台服务器时修改为具体ip
+    host: 0.0.0.0
     port: 8021
     password: 123456
     timeout: 20

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

@@ -587,7 +587,7 @@ public class EslEventListener implements IEslEventListener {
     private void actionNotice(String type,String agentId,String sessionId,boolean isSuccess) {
         Map<String, Object> result = new HashMap<>();
         result.put("Type", type);
-        result.put("Result", "操作失败");
+        result.put("Result", "操作失败2");
         if (isSuccess) result.put("Result", true);
         SpringHelper.getBean(WebSocketService.class).sendMessage(agentId, JSON.toJSONString(result));
         AgentAction aa = EslCommon.actionTempList.get(agentId);

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

@@ -74,7 +74,7 @@ public class WebSocketService {
 
             Map<String, Object> result = new HashMap<>();
             result.put("Type", type);
-            result.put("Result", "操作失败");
+            result.put("Result", "操作失败1");
             Agent agent = EslCommon.getAgent(agentId);
             Channel chan = null;EslAgentNum state =null;
             if (agent != null) {
@@ -225,7 +225,7 @@ public class WebSocketService {
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             if (DestinationNumber.equals(agent.getExten())) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
                                 if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
@@ -233,7 +233,7 @@ public class WebSocketService {
                                 } else if (EslCommon.isInSession(DestinationNumber)) {
                                     result.put("Result", "目标号码忙碌中");
                                 } else if (chan.getSessionSort() == 1) {//呼出方不可以转移
-                                    result.put("Result", "操作失败");
+                                    result.put("Result", "主叫不能此操作");
                                 } else {
                                     agent.setOpType(1);
                                     String rt = eslClientService.transfer(chan.getSessionId(), agent.getExten(), DestinationNumber);
@@ -253,7 +253,7 @@ public class WebSocketService {
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             if (DestinationNumber.equals(agent.getExten())) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
                                 if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
@@ -261,7 +261,7 @@ public class WebSocketService {
                                 } else if (EslCommon.isInSession(DestinationNumber)) {
                                     result.put("Result", "目标号码忙碌中");
                                 } else if (chan.getSessionSort() == 1) {//呼出方不可以协商
-                                    result.put("Result", "操作失败");
+                                    result.put("Result", "主叫不能此操作");
                                 } else {
                                     agent.setOpType(1);
                                     String rt = eslClientService.consult(chan.getSessionId(), agent.getExten(), DestinationNumber);
@@ -294,7 +294,7 @@ public class WebSocketService {
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             if (DestinationNumber.equals(agent.getExten())) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
                                 if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
@@ -350,7 +350,7 @@ public class WebSocketService {
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
                             if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgent(TargetAgentID);
                                 String check = checkTargetAgentTalk(tAgent);
@@ -378,7 +378,7 @@ public class WebSocketService {
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
                             if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgent(TargetAgentID);
                                 String check = checkTargetAgentTalk(tAgent);
@@ -407,7 +407,7 @@ public class WebSocketService {
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
                             if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgent(TargetAgentID);
                                 String check = checkTargetAgentTalk(tAgent);
@@ -437,7 +437,7 @@ public class WebSocketService {
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
                             if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgent(TargetAgentID);
                                 String check = checkTargetAgentTalk(tAgent);
@@ -464,7 +464,7 @@ public class WebSocketService {
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
                             if (TargetAgentID.equals(agentId)) {
-                                result.put("Result", "操作失败");
+                                result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgent(TargetAgentID);
                                 if (tAgent == null) {
@@ -475,7 +475,7 @@ public class WebSocketService {
                                     Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
                                     if (tchan != null && StringHelper.isNotEmpty(tchan.getSessionId())) {
                                         if (tchan.getSessionSort() == 1) {//不能代接开始方
-                                            result.put("Result", "操作失败");
+                                            result.put("Result", "主叫不能代接");
                                         } else {
                                             agent.setOpType(5);
                                             String sid = tchan.getSessionId(), cid = tchan.getChanId();