修改微信

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

@@ -95,7 +95,7 @@ public class MessageController extends BaseController {
     @Log(title = "查询留言消息列表",businessType = BusinessType.QUERY)
     @GetMapping("/leavelist")
     public AjaxResult getLeaveList() {
-        LambdaQueryWrapper<Message> qw = new QueryWrapper().select("kh_user user,count(*) as count").lambda();
+        LambdaQueryWrapper<Message> qw = new QueryWrapper<Message>().select("kh_user user,count(*) as count,max(create_time) as time").lambda();
         qw.eq( Message::getSend, 1).isNull( Message::getKfUser).groupBy(Message::getKhUser);
         List<Map<String,Object>> list=messageService.getMaps(qw);
         if(list.stream().count()>0) {
@@ -106,7 +106,7 @@ public class MessageController extends BaseController {
             for (Map<String, Object> map : list) {
                 String user = map.get("user").toString();
                 List<Map<String, Object>> mapUsers = userlist.stream().filter(p -> p.get("customerNo").equals(user)).collect(Collectors.toList());
-                if (mapUsers != null && mapUsers.size() > 0) {
+                if (mapUsers.size() > 0) {
                     map.put("name", mapUsers.get(0).get("customerName"));
                 } else {
                     map.put("name", "");

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

@@ -1,5 +1,5 @@
 server:
-  port: 8060
+  port: 8110
 swagger: true
 
 spring:

zxdt-api/src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: production
-    #active: dev
+    #active: production
+    active: dev
   servlet:
     multipart:
       max-file-size: 20MB #单个文件最大为20M

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

@@ -94,7 +94,7 @@ public class WebSocket {
                         mv.setStatus("success");
                         mv.setType("text");
                         mv.setContent(first);
-                        session.getAsyncRemote().sendText(JSON.toJSONString(mv));
+                        sendText(session,JSON.toJSONString(mv));
 
                         Message msg1 = new Message();
                         msg1.setCreateTime(new Date());
@@ -118,7 +118,7 @@ public class WebSocket {
                 MessageView mv1 = new MessageView();
                 mv1.setStatus("error");
                 mv1.setContent("签入失败，重复签入");
-                session.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                sendText(session,JSON.toJSONString(mv1));
                 session.close();
             }
         } catch (Exception e) {
@@ -149,7 +149,7 @@ public class WebSocket {
                         mv1.setStatus("error");
                         mv1.setContent("客户已下线");
                         mv1.setUser(userCode);
-                        session1.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                        sendText(session1,JSON.toJSONString(mv1));
                     }
                     khsessionPool.remove(userCode);
                     khkfs.remove(userCode);
@@ -175,7 +175,7 @@ public class WebSocket {
                 mvh.setStatus("success");
                 mvh.setType(type);
                 mvh.setContent(mv.getContent());
-                session.getAsyncRemote().sendText(JSON.toJSONString(mvh));
+                sendText(session,JSON.toJSONString(mvh));
                 return;
             }
 
@@ -215,10 +215,10 @@ public class WebSocket {
                             WxMpKefuMessage wechatMessage = WxMpKefuMessage.TEXT().toUser(kh).content(content).build();
                             webSocket.wxMpService.getKefuService().sendKefuMessage(wechatMessage);
                         } catch (WxErrorException e) {
-                            log.error("发送微信消息失败",e);
+                            log.error("发送微信消息失败", e);
                             mv1.setStatus("error");
                             mv1.setContent("发送微信消息失败");
-                            session.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                            sendText(session,JSON.toJSONString(mv1));
                             return;
                         }
                     } else {
@@ -227,7 +227,7 @@ public class WebSocket {
                         mv1.setStatus("success");
                         mv1.setType(type);
                         mv1.setContent(content);
-                        session1.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                        sendText(session1,JSON.toJSONString(mv1));
                     }
                 } else {
                     mv1.setStatus("error");
@@ -235,7 +235,7 @@ public class WebSocket {
                 }
 
                 if (!exist) {
-                    session.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                    sendText(session,JSON.toJSONString(mv1));
                     return;
                 }
             } else {
@@ -249,7 +249,9 @@ public class WebSocket {
                     String first = webSocket.configService.getConfigValue("AutoReply");
                     if (StringHelper.isNotEmpty(first)) {//自动回复
                         if ("text".equals(type)) {
-                            if (!content.contains("人工")) {
+                            String[] keys = new String[]{"人工", "客服"};
+                            if (!StringHelper.containList(content, keys)) {
+                                //if (!content.contains("人工")) {
                                 //获取匹配的记录
                                 AutoReply[] list = webSocket.autoReplyService.selectMatchList(1, content);
                                 if (list != null && list.length > 0) {
@@ -265,7 +267,7 @@ public class WebSocket {
                                         throw new RuntimeException(e);
                                     }
                                     long n = webSocket.messageService.getCount(qw);//当天回复次数
-                                    if (ar.getReplyCount()==0||(ar.getReplyCount() > 0 && n < ar.getReplyCount())) {
+                                    if (ar.getReplyCount() == 0 || (ar.getReplyCount() > 0 && n < ar.getReplyCount())) {
                                         //回复内容条数
                                         List<Map<String, Object>> cs = ar.getContent();
                                         if (cs != null && cs.size() > 0) {
@@ -295,11 +297,7 @@ public class WebSocket {
                                                     mv1.setStatus("success");
                                                     mv1.setType(hftype);
                                                     mv1.setContent(hfcontent);
-                                                    try {
-                                                        session.getBasicRemote().sendText(JSON.toJSONString(mv1));
-                                                    } catch (IOException e) {
-                                                        throw new RuntimeException(e);
-                                                    }
+                                                    sendText(session,JSON.toJSONString(mv1));
                                                 }
                                             } else {
                                                 int rn = cs.size();
@@ -329,7 +327,7 @@ public class WebSocket {
                                                 mv1.setStatus("success");
                                                 mv1.setType(hftype);
                                                 mv1.setContent(hfcontent);
-                                                session.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                                                sendText(session,JSON.toJSONString(mv1));
                                             }
                                         }
                                     }
@@ -341,6 +339,17 @@ public class WebSocket {
                     } else {
                         zrg = true;
                     }
+                    if (zrg) {
+                        MessageView mv1 = new MessageView();
+                        mv1.setStatus("success");
+                        mv1.setType("text");
+                        mv1.setContent("人工客服正火速赶来，请稍等...");
+                        sendText(session,JSON.toJSONString(mv1));
+                        mv1.setContent("【人工客服工作时间为每天（含节假日）8:30-20:00，如现在非工作时间，建议您使用自助服务或者在工作时间联系我们。】");
+                        sendText(session,JSON.toJSONString(mv1));
+                        mv1.setContent("正在接入客服，请稍后...");
+                        sendText(session,JSON.toJSONString(mv1));
+                    }
                 } else if (servicers.get(kf) == 2) {//客服置忙
                     zrg = true;
                 }
@@ -360,7 +369,7 @@ public class WebSocket {
                         mv1.setType(type);
                         mv1.setContent(content);
                         mv1.setUser(userCode);
-                        session1.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                        sendText(session1,JSON.toJSONString(mv1));
                     }
                 }
             }
@@ -399,7 +408,7 @@ public class WebSocket {
                     mv1.setStatus("error");
                     mv1.setContent("客户已下线");
                     mv1.setUser(userCode);
-                    session1.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+                    sendText(session1,JSON.toJSONString(mv1));
                 }
                 khsessionPool.remove(userCode);
                 khkfs.remove(userCode);
@@ -408,6 +417,26 @@ public class WebSocket {
         error.printStackTrace();
     }
 
+    //发送消息处理
+    private void sendText(Session s,String msg){
+        if (s != null && s.isOpen()) {
+            synchronized (s) {
+                try {
+                    s.getBasicRemote().sendText(msg);
+                } catch (IOException e) {
+                    log.error(msg+" 发送失败",e);
+                    if(e.getMessage().contains("close")) {
+                        try {
+                            s.close();
+                        } catch (IOException ex) {
+                            log.error(msg + " 关闭失败", ex);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     //客户转移
     public String khTransfer(String kf,String kh) {
         String msg = "客户已下线";
@@ -454,7 +483,7 @@ public class WebSocket {
             mv1.setType("transfer");
             mv1.setContent("转移客户");
             mv1.setUser(kh);
-            session1.getAsyncRemote().sendText(JSON.toJSONString(mv1));
+            sendText(session1,JSON.toJSONString(mv1));
         }
 
         return msg;
@@ -545,7 +574,7 @@ public class WebSocket {
             mv1.setStatus("success");
             mv1.setType(type);
             mv1.setContent(content);
-            khsessionPool.get(kh).getAsyncRemote().sendText(JSON.toJSONString(mv1));
+            sendText(khsessionPool.get(kh),JSON.toJSONString(mv1));
         }
 
         webSocket.messageService.insert(message);
@@ -628,7 +657,9 @@ public class WebSocket {
             String first = webSocket.configService.getConfigValue("AutoReply");
             if (StringHelper.isNotEmpty(first)) {//自动回复
                 if ("text".equals(msgType)) {
-                    if (!content.contains("人工")) {
+                    String[] keys = new String[]{"人工", "客服"};
+                    if (!StringHelper.containList(content, keys)) {
+                        //if (!content.contains("人工")) {
                         //获取匹配的记录
                         AutoReply[] list = webSocket.autoReplyService.selectMatchList(2, content);
                         if (list != null && list.length > 0) {
@@ -746,6 +777,21 @@ public class WebSocket {
             } else {
                 zrg = true;
             }
+            if (zrg) {
+                try {
+                    String ct1="人工客服正火速赶来，请稍等……";
+                    WxMpKefuMessage wechatMessage1 = WxMpKefuMessage.TEXT().toUser(sendUser).content(ct1).build();
+                    webSocket.wxMpService.getKefuService().sendKefuMessage(wechatMessage1);
+                    String ct2="【人工客服工作时间为每天（含节假日）8:30-20:00，如现在非工作时间，建议您使用自助服务或者在工作时间联系我们。】";
+                    WxMpKefuMessage wechatMessage2 = WxMpKefuMessage.TEXT().toUser(sendUser).content(ct2).build();
+                    webSocket.wxMpService.getKefuService().sendKefuMessage(wechatMessage2);
+                    String ct3="正在接入客服,请稍后...";
+                    WxMpKefuMessage wechatMessage3 = WxMpKefuMessage.TEXT().toUser(sendUser).content(ct3).build();
+                    webSocket.wxMpService.getKefuService().sendKefuMessage(wechatMessage3);
+                } catch (WxErrorException e) {
+                    throw new RuntimeException(e);
+                }
+            }
         } else if (servicers.get(kf) == 2) {//客服置忙
             zrg = true;
         }
@@ -765,7 +811,7 @@ public class WebSocket {
                 mv.setType(msgType);
                 mv.setContent(content);
                 mv.setUser(sendUser);
-                session1.getAsyncRemote().sendText(JSON.toJSONString(mv));
+                sendText(session1,JSON.toJSONString(mv));
             }
         }
 

zxdt-util/src/main/java/api/util/helper/StringHelper.java

@@ -334,4 +334,12 @@ public class StringHelper {
         }
         return resultList;
     }
+
+    //字符串是否包含集合中的某一项
+    public static boolean containList(String source,String[] list){
+        for (String k:list ) {
+            if(source.contains(k)) return true;
+        }
+        return false;
+    }
 }