修改

midware-api/src/main/java/midware/ApiApplication.java

@@ -8,13 +8,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 @SpringBootApplication
 @EnableAsync
 public class ApiApplication {
-    public static void main(String[] args) throws UnknownHostException {
+    public static void main(String[] args) {
         //SpringApplication.run(WebApiApplication.class, args);
         SpringApplication springApplication = new SpringApplication(ApiApplication.class);
         springApplication.setBannerMode(Banner.Mode.OFF);

midware-api/src/main/java/midware/controller/HomeController.java

@@ -12,16 +12,14 @@ import midware.service.eslclient.entity.Channel;
 import midware.service.eslclient.entity.Session;
 import midware.service.init.EslClientService;
 import midware.service.rep.IIvrService;
-import midware.util.helper.CodeHelper;
-import midware.util.helper.RedisHelper;
-import midware.util.helper.StringHelper;
-import midware.util.helper.TtsHelper;
+import midware.util.helper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -56,6 +54,18 @@ public class HomeController extends BaseController {
         return Success("", new Date());
     }
 
+    @GetMapping("/mac")
+    public AjaxResult Mac() {
+        return Success("", IpHelper.getMac());
+    }
+
+    @GetMapping("/authcode/{date}/{num}")
+    public AjaxResult AuthCode(@PathVariable String date,@PathVariable int num) {
+        String str = SecretHelper.MD5(IpHelper.getMac()) + "|" + date + "|" + num;
+        String result = Base64.getEncoder().encodeToString(SecretHelper.AesEncrypt(str).getBytes());
+        return Success("", result);
+    }
+
     @GetMapping("/esl")
     public AjaxResult Esl() {
         Map<String, Object> map = new HashMap<>();

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

@@ -1,22 +1,38 @@
 package midware.service.eslclient;
 
+import lombok.extern.slf4j.Slf4j;
 import midware.entity.database.rep.AgentAction;
 import midware.entity.database.rep.AgentState;
 import midware.entity.database.rep.ChanEvent;
 import midware.service.eslclient.entity.Agent;
+import midware.service.eslclient.entity.Auth;
 import midware.service.eslclient.entity.Channel;
 import midware.service.eslclient.entity.Session;
+import midware.service.init.EslClientService;
+import midware.util.enums.EslAgentEnum;
+import midware.util.helper.IpHelper;
+import midware.util.helper.SecretHelper;
+import midware.util.helper.SpringHelper;
+import midware.util.helper.StringHelper;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
+@Slf4j
 public class EslCommon {
     static Lock eslLock=new ReentrantLock();
+    //授权信息
+    public static Auth auth=new Auth();
     //坐席列表
     public static List<Agent> agents=new ArrayList<>();
     //通道列表
@@ -100,4 +116,50 @@ public class EslCommon {
     public static boolean isInSession(String number) {
         return channels.stream().anyMatch(p -> p.getNumber().equals(number) && !p.getSessionId().equals(""));
     }
+
+    public static void checkAuth(){
+        boolean isAuth = false;
+        Date time = null;
+        int agentNum = 0;
+        try {
+            File file = new File("jyxx");
+            if (file.exists()) {
+                String s = "";
+                InputStreamReader in = new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8);
+                BufferedReader br = new BufferedReader(in);
+                StringBuilder sb = new StringBuilder();
+                while ((s = br.readLine()) != null) {
+                    sb.append(s);
+                }
+                String content = sb.toString();
+                String result = SecretHelper.AesDecrypt(new String(Base64.getDecoder().decode(content)));
+                if (StringHelper.isNotEmpty(result)) {
+                    String[] results = result.split("\\|");
+                    if (SecretHelper.MD5(IpHelper.getMac()).equals(results[0])) {
+                        time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(results[1] + " 23:59:59");
+                        agentNum = Integer.parseInt(results[2]);
+                        isAuth = true;
+                    }
+                }
+            }
+
+        } catch (IOException | ParseException e) {
+            log.error("授权解析失败", e);
+        }
+        if (isAuth && time.compareTo(new Date()) > 0) {
+            EslCommon.auth.setExpire(false);
+            EslCommon.auth.setExpireTime(time);
+            EslCommon.auth.setAgentNum(agentNum);
+        } else {
+            EslCommon.auth = new Auth();
+            if (EslCommon.agents.size() > 0) {
+                EslClientService eslClientService = SpringHelper.getBean(EslClientService.class);
+                for (Agent a : EslCommon.agents) {
+                    eslClientService.logout(a.getAgent(), a.getGroup());
+                    a.setAgentState(EslAgentEnum.logout.ordinal());
+                }
+                EslCommon.agents=new ArrayList<>();
+            }
+        }
+    }
 }

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

@@ -13,7 +13,7 @@ import midware.service.eslclient.entity.Session;
 import midware.service.init.EslClientService;
 import midware.service.init.WebSocketService;
 import midware.service.rep.IRecordService;
-import midware.util.enums.EslAgentNum;
+import midware.util.enums.EslAgentEnum;
 import midware.util.enums.EslCommandEnum;
 import midware.util.enums.EslEventEnum;
 import midware.util.helper.SpringHelper;
@@ -55,11 +55,20 @@ public class EslEventListener implements IEslEventListener {
                     if(StringHelper.isEmpty(exten))exten=header.get("from-user");
                     Channel chan1 = EslCommon.getChanByExten(exten);
                     if(chan1!=null) {
+                        //通话中或者振铃中，断开
+                        if (StringHelper.isNotEmpty(chan1.getSessionId())) {
+                            try {
+                                eslClientService.kill(chan1.getSessionId());
+                                Thread.sleep(300);
+                            } catch (InterruptedException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
                         EslCommon.channels.remove(chan1);
                         Agent at = EslCommon.getAgentByExten(exten);
-                        if (at != null){
-                            if (at.getAgentState() != EslAgentNum.logout.ordinal()) {
-                                at.setAgentState(EslAgentNum.logout.ordinal());
+                        if (at != null) {
+                            if (at.getAgentState() != EslAgentEnum.logout.ordinal()) {
+                                at.setAgentState(EslAgentEnum.logout.ordinal());
                             }
                             eslClientService.logout(at.getAgent(), at.getGroup());
                             EslCommon.agents.remove(at);
@@ -191,7 +200,7 @@ public class EslEventListener implements IEslEventListener {
                         if (callType==2) {
                             eslClientService.setWork(agent.getAgent(), false);
                         }
-                        agent.setAgentState(EslAgentNum.requested.ordinal());
+                        agent.setAgentState(EslAgentEnum.requested.ordinal());
                         if (agent.getOpType() == 4) return;
                     }
 
@@ -310,13 +319,13 @@ public class EslEventListener implements IEslEventListener {
                         //被叫应答
                         if (chan.getSessionSort() > 1) {
                             if (agent != null) {
-                                agent.setAgentState(EslAgentNum.talking.ordinal());
+                                agent.setAgentState(EslAgentEnum.talking.ordinal());
                                 if (agent.getOpType() == 4) return;
                             }
                             //分机打分机时更新主叫坐席状态
                             if (callType==2 && !session.isAnswer()) {
                                 Agent callerAgent = EslCommon.getAgentByExten(callerNum);
-                                if (callerAgent != null) callerAgent.setAgentState(EslAgentNum.talking.ordinal());
+                                if (callerAgent != null) callerAgent.setAgentState(EslAgentEnum.talking.ordinal());
                             }
 
                             String ext = callerNum;
@@ -367,7 +376,7 @@ public class EslEventListener implements IEslEventListener {
                     //代接
                     if(agent!=null&&agent.getOpType()==5) {
                         Agent agent1 = EslCommon.getAgentByExten(header.get("Caller-Callee-ID-Number"));
-                        if (agent1 != null) agent1.setAgentState(EslAgentNum.talking.ordinal());
+                        if (agent1 != null) agent1.setAgentState(EslAgentEnum.talking.ordinal());
                     }
                     break;
                 case CHANNEL_HANGUP_COMPLETE:
@@ -396,16 +405,16 @@ public class EslEventListener implements IEslEventListener {
                         if (agent != null) {
                             String agentNo = agent.getAgent();
                             if (callType==1 && chan.isAnswer()) {//呼入接通后挂断-话后处理
-                                agent.setAgentState(EslAgentNum.aftertalk.ordinal());
+                                agent.setAgentState(EslAgentEnum.aftertalk.ordinal());
                                 new ScheduledThreadPoolExecutor(1).schedule(() -> {
                                     Agent agent2 = EslCommon.getAgent(agentNo);
-                                    if (agent2 != null && agent2.getAgentState() == EslAgentNum.aftertalk.ordinal()) {
-                                        agent2.setAgentState(EslAgentNum.free.ordinal());
+                                    if (agent2 != null && agent2.getAgentState() == EslAgentEnum.aftertalk.ordinal()) {
+                                        agent2.setAgentState(EslAgentEnum.free.ordinal());
                                     }
                                 }, 20, TimeUnit.SECONDS);
                             } else {//呼出挂断-空闲
                                 chan.setSessionId("");
-                                agent.setAgentState(EslAgentNum.free.ordinal());
+                                agent.setAgentState(EslAgentEnum.free.ordinal());
                             }
                             if (callType==2) {
                                 eslClientService.setWork(agentNo, true);
@@ -519,23 +528,23 @@ public class EslEventListener implements IEslEventListener {
             if (bodys.startsWith("+OK")) {
                 switch (type) {
                     case "Login"://签入
-                        agent.setAgentState(EslAgentNum.free.ordinal());
+                        agent.setAgentState(EslAgentEnum.free.ordinal());
                         break;
                     case "Logout"://签出
-                        agent.setAgentState(EslAgentNum.logout.ordinal());
+                        agent.setAgentState(EslAgentEnum.logout.ordinal());
                         EslCommon.agents.remove(agent);
                         break;
                     case "WorkOn"://置闲
-                        agent.setAgentState(EslAgentNum.free.ordinal());
+                        agent.setAgentState(EslAgentEnum.free.ordinal());
                         break;
                     case "WorkOff"://置忙
-                        agent.setAgentState(EslAgentNum.busy.ordinal());
+                        agent.setAgentState(EslAgentEnum.busy.ordinal());
                         break;
                     case "ForceWorkOn"://强制置闲
                     case "ForceWorkOff"://强制置忙
                         Agent tagent = EslCommon.getAgent(values[2]);
-                        if (type.equals("ForceWorkOn")) tagent.setAgentState(EslAgentNum.free.ordinal());
-                        else tagent.setAgentState(EslAgentNum.busy.ordinal());
+                        if (type.equals("ForceWorkOn")) tagent.setAgentState(EslAgentEnum.free.ordinal());
+                        else tagent.setAgentState(EslAgentEnum.busy.ordinal());
                         break;
                     case "HoldOn"://开启保持
                         break;

midware-service/src/main/java/midware/service/eslclient/entity/Agent.java

@@ -6,14 +6,11 @@ import lombok.Setter;
 import midware.entity.database.rep.AgentState;
 import midware.service.eslclient.EslCommon;
 import midware.service.init.WebSocketService;
-import midware.service.rep.IAgentStateService;
-import midware.util.helper.AsyncHelper;
 import midware.util.helper.SpringHelper;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TimerTask;
 
 @Data
 public class Agent {

midware-service/src/main/java/midware/service/eslclient/entity/Auth.java

@@ -0,0 +1,17 @@
+package midware.service.eslclient.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Auth {
+    //过期时间
+    private Date ExpireTime = null;
+    //是否过期
+    private boolean isExpire = true;
+    // 通道数量
+    //private long channelNum = 0;
+    // 坐席数量
+    private long agentNum = 0;
+}

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

@@ -8,6 +8,7 @@ import midware.service.eslclient.EslCommon;
 import midware.service.eslclient.EslEventListener;
 import midware.service.eslclient.entity.Session;
 import midware.util.config.EslClientConfig;
+import midware.util.enums.EslAgentEnum;
 import midware.util.enums.EslCommandEnum;
 import midware.util.enums.EslEventEnum;
 import midware.util.helper.StringHelper;
@@ -22,6 +23,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.io.File;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -68,6 +70,14 @@ public class EslClientService {
                     } catch (Exception e1) {
                     }
                 }
+            }else {
+                if (EslCommon.agents.size() > 0) {
+                    for (Agent a : EslCommon.agents) {
+                        logout(a.getAgent(), a.getGroup());
+                        a.setAgentState(EslAgentEnum.logout.ordinal());
+                    }
+                    EslCommon.agents=new ArrayList<>();
+                }
             }
         }, 1, 5000, TimeUnit.MILLISECONDS);
 
@@ -81,6 +91,8 @@ public class EslClientService {
             String path=new File("").getAbsolutePath();
             client.sendAsyncApiCommand(EslCommandEnum.global_setvar.name(), "md_base_dir=" +path );
         }
+
+        EslCommon.checkAuth();
     }
 
     @PreDestroy
@@ -88,7 +100,9 @@ public class EslClientService {
         if (EslCommon.agents.size() > 0) {
             for (Agent a : EslCommon.agents) {
                 logout(a.getAgent(), a.getGroup());
+                a.setAgentState(EslAgentEnum.logout.ordinal());
             }
+            EslCommon.agents=new ArrayList<>();
         }
     }
 

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

@@ -1,6 +1,7 @@
 package midware.service.init;
 
 import lombok.extern.slf4j.Slf4j;
+import midware.service.quartz.job.AuthJob;
 import midware.service.quartz.job.BatchInsertJob;
 import midware.service.quartz.util.QuartzHelper;
 import org.quartz.Scheduler;
@@ -27,5 +28,6 @@ public class QuartzService {
         }
 
         QuartzHelper.createScheduleJob(scheduler, new BatchInsertJob());
+        QuartzHelper.createScheduleJob(scheduler, new AuthJob());
     }
 }

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

@@ -6,7 +6,7 @@ import midware.entity.database.rep.AgentAction;
 import midware.service.eslclient.EslCommon;
 import midware.service.eslclient.entity.Agent;
 import midware.service.eslclient.entity.Channel;
-import midware.util.enums.EslAgentNum;
+import midware.util.enums.EslAgentEnum;
 import midware.util.helper.SpringHelper;
 import midware.util.helper.StringHelper;
 import org.springframework.stereotype.Component;
@@ -48,8 +48,8 @@ public class WebSocketService {
         try {
             Agent a = EslCommon.getAgent(agentId);
             if (a != null) {
-                if (a.getAgentState() != EslAgentNum.logout.ordinal()) {
-                    a.setAgentState(EslAgentNum.logout.ordinal());
+                if (a.getAgentState() != EslAgentEnum.logout.ordinal()) {
+                    a.setAgentState(EslAgentEnum.logout.ordinal());
                 }
                 eslClientService.logout(a.getAgent(), a.getGroup());
                 EslCommon.agents.remove(a);
@@ -74,12 +74,20 @@ public class WebSocketService {
 
             Map<String, Object> result = new HashMap<>();
             result.put("Type", type);
+
+            if(EslCommon.auth.isExpire()){
+                result.put("Result", "授权过期");
+                session.getBasicRemote().sendText(JSON.toJSONString(result));
+                return;
+            }
+
             result.put("Result", "操作失败1");
             Agent agent = EslCommon.getAgent(agentId);
-            Channel chan = null;EslAgentNum state =null;
+            Channel chan = null;
+            EslAgentEnum state =null;
             if (agent != null) {
                 chan = EslCommon.getChanByExten(agent.getExten());
-                state = EslAgentNum.values()[agent.getAgentState()];
+                state = EslAgentEnum.values()[agent.getAgentState()];
                 if (chan == null) {
                     result.put("Result", "分机未注册");
                     state = null;
@@ -106,6 +114,8 @@ public class WebSocketService {
                             result.put("Result", "分机未注册");
                         } else if (EslCommon.getAgentByExten(AgentExten) != null) {
                             result.put("Result", "分机已存在");
+                        } else if (EslCommon.auth.getAgentNum()>0&& EslCommon.agents.size()>=EslCommon.auth.getAgentNum()) {
+                            result.put("Result", "坐席数量已达上限");
                         } else {
                             this.agentId = AgentId;
                             sessionPool.put(AgentId, session);
@@ -114,7 +124,7 @@ public class WebSocketService {
                             agent.setAgent(AgentId);
                             agent.setExten(AgentExten);
                             agent.setGroup(AgentGroup);
-                            agent.setAgentState(EslAgentNum.loging.ordinal());
+                            agent.setAgentState(EslAgentEnum.loging.ordinal());
 
                             chan = EslCommon.getChanByExten(AgentExten);
                             String rt = eslClientService.login(AgentId, AgentExten, AgentGroup);
@@ -129,7 +139,7 @@ public class WebSocketService {
                     break;
                 case "Logout"://签出
                     //空闲/置忙/话后处理  可以签出
-                    if (Arrays.asList(EslAgentNum.free, EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
+                    if (Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy, EslAgentEnum.aftertalk).contains(state)) {
                         String rt = eslClientService.logout(agentId, agent.getGroup());
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -141,7 +151,7 @@ public class WebSocketService {
                     break;
                 case "WorkOn"://置闲
                     //置忙/话后处理  可以置闲
-                    if (Arrays.asList(EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
+                    if (Arrays.asList(EslAgentEnum.busy, EslAgentEnum.aftertalk).contains(state)) {
                         String rt = eslClientService.setWork(agentId, true);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -151,7 +161,7 @@ public class WebSocketService {
                     break;
                 case "WorkOff"://置忙
                     //空闲/话后处理  可以置忙
-                    if (Arrays.asList(EslAgentNum.free, EslAgentNum.aftertalk).contains(state)) {
+                    if (Arrays.asList(EslAgentEnum.free, EslAgentEnum.aftertalk).contains(state)) {
                         String rt = eslClientService.setWork(agentId, false);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -161,12 +171,12 @@ public class WebSocketService {
                     break;
                 case "MakeCall"://外呼
                     //空闲/置忙/话后处理  可以外呼
-                    if (map.get("DestinationNumber") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy, EslAgentNum.aftertalk).contains(state)) {
+                    if (map.get("DestinationNumber") != null && Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy, EslAgentEnum.aftertalk).contains(state)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
                             Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                            if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
+                            if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
                                 result.put("Result", "目标坐席忙碌中");
                             } else {
                                 String rt = eslClientService.extenCall(agent.getExten(), DestinationNumber);
@@ -180,7 +190,7 @@ public class WebSocketService {
                     break;
                 case "HoldOn"://开启保持
                     //通话中  可以开启保持
-                    if (Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
                         String rt = eslClientService.setHold(chan.getSessionId(), true);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -190,7 +200,7 @@ public class WebSocketService {
                     break;
                 case "HoldOff"://关闭保持
                     //通话中  可以关闭保持
-                    if (Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
                         String rt = eslClientService.setHold(chan.getSessionId(), false);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -200,7 +210,7 @@ public class WebSocketService {
                     break;
                 case "MuteOn"://开启静音
                     //通话中  可以开启静音
-                    if (Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
                         String rt = eslClientService.setMute(chan.getChanId(), true);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -210,7 +220,7 @@ public class WebSocketService {
                     break;
                 case "MuteOff"://关闭静音
                     //通话中  可以关闭静音
-                    if (Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
                         String rt = eslClientService.setMute(chan.getChanId(), false);
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -220,7 +230,7 @@ public class WebSocketService {
                     break;
                 case "Transfer"://转移
                     //通话中  可以转移
-                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentNum.talking)) {
+                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentEnum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -228,7 +238,7 @@ public class WebSocketService {
                                 result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                                if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
+                                if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
                                     result.put("Result", "目标坐席忙碌中");
                                 } else if (EslCommon.isInSession(DestinationNumber)) {
                                     result.put("Result", "目标号码忙碌中");
@@ -248,7 +258,7 @@ public class WebSocketService {
                     break;
                 case "ConsultOn"://开启协商
                     //通话中  可以协商
-                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentNum.talking)) {
+                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentEnum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -256,7 +266,7 @@ public class WebSocketService {
                                 result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                                if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
+                                if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
                                     result.put("Result", "目标坐席忙碌中");
                                 } else if (EslCommon.isInSession(DestinationNumber)) {
                                     result.put("Result", "目标号码忙碌中");
@@ -276,7 +286,7 @@ public class WebSocketService {
                     break;
                 case "ConsultOff"://关闭协商
                     //通话中  可以协商取消
-                    if (Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
                         String sid = chan.getSessionId();
                         Channel channel = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)
                                 && p.getSessionSort() == 3).findFirst().get();
@@ -289,7 +299,7 @@ public class WebSocketService {
                     break;
                 case "Meeting"://会议
                     //通话中  可以会议
-                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentNum.talking)) {
+                    if (map.get("DestinationNumber") != null && Objects.equals(state, EslAgentEnum.talking)) {
                         String DestinationNumber = map.get("DestinationNumber").toString();
                         param = DestinationNumber;
                         if (StringHelper.isNotEmpty(DestinationNumber)) {
@@ -297,7 +307,7 @@ public class WebSocketService {
                                 result.put("Result", "目标不能是自己");
                             } else {
                                 Agent tAgent = EslCommon.getAgentByExten(DestinationNumber);
-                                if (tAgent != null && tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
+                                if (tAgent != null && tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
                                     result.put("Result", "目标坐席忙碌中");
                                 } else if (EslCommon.isInSession(DestinationNumber)) {
                                     result.put("Result", "目标号码忙碌中");
@@ -315,7 +325,7 @@ public class WebSocketService {
                     break;
                 case "TurnMyd"://转满意度
                     //通话中  可以转满意度
-                    if (Objects.equals(state, EslAgentNum.talking)) {
+                    if (Objects.equals(state, EslAgentEnum.talking)) {
                         String rt = eslClientService.turnMyd(chan.getSessionId());
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -325,7 +335,7 @@ public class WebSocketService {
                     break;
                 case "DropCall"://挂机
                     //通话中/请求中  可以挂机
-                    if (Arrays.asList(EslAgentNum.talking, EslAgentNum.requested).contains(state)) {
+                    if (Arrays.asList(EslAgentEnum.talking, EslAgentEnum.requested).contains(state)) {
                         String rt = eslClientService.kill(chan.getChanId());
                         if (StringHelper.isNotEmpty(rt)) {
                             EslCommon.sessionOpera.put(rt, type + "|" + agentId);
@@ -345,7 +355,7 @@ public class WebSocketService {
                     break;
                 case "Listen"://监听
                     //空闲/置忙  可以监听
-                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -373,7 +383,7 @@ public class WebSocketService {
                     break;
                 case "Insert"://强插
                     //空闲/置忙  可以强插
-                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -402,7 +412,7 @@ public class WebSocketService {
                     break;
                 case "Intercept"://强截
                     //空闲/置忙  可以强截
-                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -459,7 +469,7 @@ public class WebSocketService {
                     break;
                 case "Instead"://代接
                     //空闲/置忙  可以代接
-                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentNum.free, EslAgentNum.busy).contains(state)) {
+                    if (map.get("TargetAgentID") != null && Arrays.asList(EslAgentEnum.free, EslAgentEnum.busy).contains(state)) {
                         String TargetAgentID = map.get("TargetAgentID").toString();
                         param = TargetAgentID;
                         if (StringHelper.isNotEmpty(TargetAgentID)) {
@@ -469,7 +479,7 @@ public class WebSocketService {
                                 Agent tAgent = EslCommon.getAgent(TargetAgentID);
                                 if (tAgent == null) {
                                     result.put("Result", "目标坐席未签入");
-                                } else if (tAgent.getAgentState() != EslAgentNum.requested.ordinal()) {
+                                } else if (tAgent.getAgentState() != EslAgentEnum.requested.ordinal()) {
                                     result.put("Result", "目标坐席未振铃");
                                 } else {
                                     Channel tchan = EslCommon.getChanByExten(tAgent.getExten());
@@ -502,7 +512,7 @@ public class WebSocketService {
                             Agent tAgent = EslCommon.getAgent(TargetAgentID);
                             if (tAgent == null) {
                                 result.put("Result", "目标坐席未签入");
-                            } else if (tAgent.getAgentState() != EslAgentNum.free.ordinal()) {
+                            } else if (tAgent.getAgentState() != EslAgentEnum.free.ordinal()) {
                                 result.put("Result", "目标坐席不能置忙");
                             } else {
                                 String rt = eslClientService.setWork(TargetAgentID, type.equals("ForceWorkOn"));
@@ -559,7 +569,7 @@ public class WebSocketService {
         String result = "";
         if (agent == null) {
             result = "目标坐席未签入";
-        } else if (agent.getAgentState() != EslAgentNum.talking.ordinal()) {
+        } else if (agent.getAgentState() != EslAgentEnum.talking.ordinal()) {
             result = "目标坐席未通话";
         }
         return result;
@@ -574,8 +584,8 @@ public class WebSocketService {
     public void onError(Throwable error) {
         Agent a = EslCommon.getAgent(agentId);
         if (a != null) {
-            if (a.getAgentState() != EslAgentNum.logout.ordinal()) {
-                a.setAgentState(EslAgentNum.logout.ordinal());
+            if (a.getAgentState() != EslAgentEnum.logout.ordinal()) {
+                a.setAgentState(EslAgentEnum.logout.ordinal());
             }
             eslClientService.logout(a.getAgent(), a.getGroup());
             EslCommon.agents.remove(a);

midware-service/src/main/java/midware/service/quartz/job/AuthJob.java

@@ -0,0 +1,19 @@
+package midware.service.quartz.job;
+
+import lombok.extern.slf4j.Slf4j;
+import midware.service.eslclient.EslCommon;
+import midware.service.quartz.util.QuartzJob;
+import org.quartz.JobExecutionContext;
+
+//批量插入数据库
+@Slf4j
+public class AuthJob extends QuartzJob {
+    public AuthJob() {
+        cron = "0 0/1 * * * ?";
+    }
+
+    @Override
+    protected void doExecute(JobExecutionContext context) {
+        EslCommon.checkAuth();
+    }
+}

midware-util/src/main/java/midware/util/enums/EslAgentNum.java

@@ -1,6 +1,6 @@
 package midware.util.enums;
 
-public enum EslAgentNum {
+public enum EslAgentEnum {
     unkown("未知"),
     loging("登录中"),
     free("空闲"),
@@ -12,7 +12,7 @@ public enum EslAgentNum {
     ;
 
     private String description;
-    EslAgentNum(String description) {
+    EslAgentEnum(String description) {
         this.description = description;
     }
 }

midware-util/src/main/java/midware/util/helper/IpHelper.java

@@ -26,4 +26,33 @@ public class IpHelper {
         }
         return hostIP;
     }
+
+    public static String getMac(){
+        String mac="";
+        try {
+            Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
+            while (networkInterfaces.hasMoreElements()) {
+                NetworkInterface ni = networkInterfaces.nextElement();
+                if (ni.isLoopback() || ni.isVirtual() || !ni.isUp()) {
+                    continue;
+                }
+                byte[] macByte = ni.getHardwareAddress();
+                if (macByte == null) {
+                    continue;
+                }
+                StringBuilder buf = new StringBuilder();
+                for (byte aMac : macByte) {
+                    buf.append(String.format("%02X-", aMac));
+                }
+                if (buf.length() > 0) {
+                    buf.deleteCharAt(buf.length() - 1);
+                    mac=buf.toString();
+                    break;
+                }
+            }
+        } catch (SocketException e) {
+            e.printStackTrace();
+        }
+        return mac;
+    }
 }