修改在线客服

zxkf-api/src/main/java/api/controller/online/MessageController.java

@@ -101,7 +101,7 @@ public class MessageController extends BaseController {
     @PostMapping("/connect/{userId}")
     public AjaxResult connect(@PathVariable String userId) {
         String userCode = CurrentUser().getUserName();
-        String conn = webSocket.kfconnectKh(userId, userCode);
+        String conn = webSocket.khExist(userCode,userId);
         if (StringHelper.isEmpty(conn)) {
             LambdaQueryWrapper<Message> qw = new LambdaQueryWrapper();
             qw.eq(Message::getKhUser, userId).eq(Message::getSend, 1).isNull(Message::getKfUser);
@@ -136,7 +136,7 @@ public class MessageController extends BaseController {
     @PostMapping("/upload/{userId}")
     public AjaxResult uploadFile(MultipartFile file,@PathVariable String userId) {
         String userCode = CurrentUser().getUserName();
-        String en = webSocket.khExist(userId, userCode);
+        String en = webSocket.khExist(userCode,userId);
         if (StringHelper.isEmpty(en)) {
             String path = "files/online/" + DateHelper.getDate();
             String filePath = "";

zxkf-service/src/main/java/api/service/websocket/WebSocket.java

@@ -31,8 +31,6 @@ public class WebSocket {
     @Autowired
     private IMessageService messageService;
     @Autowired
-    private ICustomerService customerService;
-    @Autowired
     private WxMpService wxMpService;
 
     private Session session;
@@ -91,7 +89,9 @@ public class WebSocket {
                 kfsessionPool.remove(userCode);
                 servicerQueue.remove(userCode);
                 servicers.remove(userCode);
-                khkfs.values().removeIf(p->p.equals(userCode));
+                if(khkfs.values().contains(userCode)) {
+                    khkfs.values().removeIf(p -> p.equals(userCode));
+                }
             } else {
                 customers.remove(userCode);
                 String kf = khkfs.get(userCode);
@@ -145,7 +145,7 @@ public class WebSocket {
                 MessageView mv1 = new MessageView();
                 mv1.setUser(userCode);
 
-                String en = khExist(kh, userCode);
+                String en = khExist( userCode,kh);
                 if (StringHelper.isEmpty(en)) {
                     exist = true;
                     msg.setKhUser(kh);
@@ -184,8 +184,10 @@ public class WebSocket {
                 String kf = khkfs.get(userCode);
                 if (StringHelper.isEmpty(kf)) {
                     kf = servicerQueue.poll();
-                    servicerQueue.add(kf);
-                    khkfs.put(userCode, kf);
+                    if(!StringHelper.isEmpty(kf)) {
+                        servicerQueue.add(kf);
+                        khkfs.put(userCode, kf);
+                    }
                 }
                 if (!StringHelper.isEmpty(kf)) {
                     Session session1 = kfsessionPool.get(kf);
@@ -221,7 +223,9 @@ public class WebSocket {
             kfsessionPool.remove(userCode);
             servicerQueue.remove(userCode);
             servicers.remove(userCode);
-            khkfs.values().removeIf(p->p.equals(userCode));
+            if(khkfs.values().contains(userCode)) {
+                khkfs.values().removeIf(p -> p.equals(userCode));
+            }
         } else {
             customers.remove(userCode);
             String kf = khkfs.get(userCode);
@@ -241,25 +245,16 @@ public class WebSocket {
         error.printStackTrace();
     }
 
-    //客服连接留言客户
-    public String kfconnectKh(String kf,String kh){
-        if(khkfs.containsKey(kh)){
-            return "其他客服已接入";
-        }
-        if(!customers.containsKey(kh)){
-            return "客户不在线";
-        }
-        khkfs.put(kh,kf);
-        return "";
-    }
-
     //客户是否存在
     public String khExist(String kf,String kh) {
         String msg = "客户已下线";
-        if (!StringHelper.isEmpty(kh)) {
+        if(!(servicers.containsKey(kf)&&kfsessionPool.containsKey(kf))){
+            msg = "未签入";
+        }
+        else if (!StringHelper.isEmpty(kh)) {
             if (customers.containsKey(kh)) {
                 if (khkfs.containsKey(kh)) {
-                    if (khkfs.get(kh) == userCode) {
+                    if (khkfs.get(kh).equals(kf) ) {
                         if (customers.get(kh) == 2) {
                             msg = "";
                         } else {
@@ -271,24 +266,29 @@ public class WebSocket {
                         msg = "其他客服已接入";
                     }
                 } else {
-                    if (khsessionPool.containsKey(kh)) {
+                    if (customers.get(kh) == 2||khsessionPool.containsKey(kh)) {
                         khkfs.put(kh, kf);
                         msg = "";
                     }
                 }
             } else {
                 LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper();
-                qw.eq(Customer::getCustomerNo, kh);
-                Customer cus = customerService.getEntity(qw);
-                if (cus != null && cus.getType() == 2) {
-                    customers.put(kh, 2);
-                    msg = "";
+                qw.eq(Customer::getCustomerNo, kh).eq(Customer::getType,2);
+                if (SpringHelper.getBean(ICustomerService.class).exists(qw)) {
+                    Date dt=new Date();
+                    Date sj=new Date(dt.getTime()-(1000*60*60*48));
+                    LambdaQueryWrapper<Message> qw1 = new LambdaQueryWrapper();
+                    qw1.eq(Message::getKhUser,kh).eq(Message::getSend,2).gt(Message::getCreateTime,sj);
+                    if(SpringHelper.getBean(IMessageService.class).exists(qw1)) {
+                        customers.put(kh, 2);
+                        khkfs.put(kh, kf);
+                        msg = "";
+                    }
                 }
             }
         } else {
             msg = "客户不能为空";
         }
-
         return msg;
     }
 
@@ -400,8 +400,10 @@ public class WebSocket {
         String kf = khkfs.get(sendUser);
         if (StringHelper.isEmpty(kf)) {
             kf = servicerQueue.poll();
-            servicerQueue.add(kf);
-            khkfs.put(sendUser, kf);
+            if(!StringHelper.isEmpty(kf)) {
+                servicerQueue.add(kf);
+                khkfs.put(sendUser, kf);
+            }
         }
         if (!StringHelper.isEmpty(kf)) {
             message.setKfUser(kf);
@@ -419,15 +421,17 @@ public class WebSocket {
         messageService.insert(message);
     }
 
-    public void addCustomer(String userCode,Integer source){
+    public void addCustomer(String userCode,Integer source) {
+        ICustomerService cusService = SpringHelper.getBean(ICustomerService.class);
         LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper();
-        qw.eq(Customer::getCustomerNo,userCode);
-        if(!customerService.exists(qw)){
-            Customer customer=new Customer();
+        qw.eq(Customer::getCustomerNo, userCode);
+        if (!cusService.exists(qw)) {
+            Customer customer = new Customer();
             customer.setCustomerNo(userCode);
             customer.setType(Long.valueOf(source));
             customer.setFCreatetime(new Date());
-            customerService.insert(customer);
+            customer.setFIsdelete(0L);
+            cusService.insert(customer);
         }
     }