zhoufan vor 7 Monaten
Ursprung
Commit
bfeb257a9f

+ 3 - 0
midware-api/src/main/java/midware/controller/rep/OutPhoneController.java

@@ -92,6 +92,8 @@ public class OutPhoneController extends BaseController {
92 92
             } else {
93 93
                 return Error("主叫号码归属地未维护");
94 94
             }
95
+
96
+            if(EslCommon.existChannel(caller))return Error("主叫号码繁忙,请稍后再拨");
95 97
         }
96 98
         if (StringHelper.isEmpty(input.getCallee()) || input.getCallee().length() != 11) {
97 99
             return Error("被叫号码错误");
@@ -107,6 +109,7 @@ public class OutPhoneController extends BaseController {
107 109
             } else {
108 110
                 return Error("被叫号码归属地未维护");
109 111
             }
112
+            if(EslCommon.existChannel(callee))return Error("被叫号码繁忙,请稍后再拨");
110 113
         }
111 114
         String ct = configService.getConfigValue("TrunkCount");
112 115
         if (EslCommon.sessions.size() >= Integer.parseInt(ct)) {

+ 5 - 0
midware-service/src/main/java/midware/service/eslclient/EslCommon.java

@@ -70,6 +70,11 @@ public class EslCommon {
70 70
     }
71 71
 
72 72
     //号码是否在会话中
73
+    public static boolean existChannel(String number) {
74
+        return channels.stream().anyMatch(p -> p.getNumber().equals(number));
75
+    }
76
+
77
+    //号码是否在会话中
73 78
     public static boolean isInSession(String number) {
74 79
         return channels.stream().anyMatch(p -> p.getNumber().equals(number) && !p.getSessionId().equals(""));
75 80
     }