群组设计更改 群组变为临时群组 当客户离线时,删除群组(例外,当客户去与认领该客户的客服聊天时,该客服不在线,则创建离线群组);增加创建群组时,创建会话数据,会话id 和 群组id 一致

jim-common/src/main/java/org/jim/common/packets/Group.java

@@ -6,6 +6,10 @@ package org.jim.common.packets;
 import java.util.List;
 
 /**
+ * 群组是临时性的; 客户/游客每一次 和 客服 聊天 都会创建一个在线群组
+ * 但是有例外: 当客户去与认领该客户的客服聊天时,该客服不在线,则创建离线群组
+ * 离线群组不删除,在线群组删除(每创建一次群组,都会创建一次会话,群组id 就是 会话id )
+ * 群组主键id 和 会话主键id 一致
  * 版本: [1.0]
  * 功能说明: 
  * 作者: WChao 创建时间: 2017年9月21日 下午1:54:04
@@ -64,12 +68,25 @@ public class Group extends Message{
 	 */
 	private String departmentId;
 
+	/**
+	 * 每一次对话 生成新的 会话id 不保存到群组中
+	 */
+	private String conversationId;
+
 	public Group(){}
 	public Group(String group_id , String name){
 		this.group_id = group_id;
 		this.name = name;
 	}
 
+	public String getConversationId() {
+		return conversationId;
+	}
+
+	public void setConversationId(String conversationId) {
+		this.conversationId = conversationId;
+	}
+
 	public String getCompanyId() {
 		return companyId;
 	}

jim-server/src/main/java/org/jim/server/enums/ServiceAccountOfflineType.java

@@ -0,0 +1,29 @@
+package org.jim.server.enums;
+
+/**
+ * 客服是否是离线状态 1: 是 0: 否
+ * @author Darren
+ * @date 2020/2/5 20:13
+ */
+public enum ServiceAccountOfflineType {
+
+    YES(1, "是离线状态"),
+    NO(0, "不是离线状态");
+
+    private int key;
+    private String desc;
+
+    private ServiceAccountOfflineType(int key, String desc) {
+        this.key = key;
+        this.desc = desc;
+    }
+
+    public int getKey() {
+        return key;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+}

server-chat/src/main/java/com/cn/config/PropertyDataBaseConfigBuilder.java

@@ -1,9 +1,6 @@
 package com.cn.config;
 
-import com.cn.model.ChatGroup;
-import com.cn.model.Conversation;
-import com.cn.model.ServiceAccount;
-import com.cn.model.ServiceAccountRoleDepartmentMiddle;
+import com.cn.model.*;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import org.apache.commons.lang3.StringUtils;
@@ -35,7 +32,9 @@ public class PropertyDataBaseConfigBuilder {
         ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin);
         //设置实体 表 关系映射
         arp.addMapping("sw_conversation","id", Conversation.class);
+        arp.addMapping("sw_conversation_record","id", ConversationRecord.class);
         arp.addMapping("sw_service_account","id", ServiceAccount.class);
+        arp.addMapping("sw_role_department_middle","id", RoleDepartmentMiddle.class);
         arp.addMapping(
                 "sw_service_account_role_department_middle"
                 ,"id"

server-chat/src/main/java/com/cn/service/IMChatLoginServiceProcessor.java

@@ -1,8 +1,8 @@
 package com.cn.service;
 
-import com.alibaba.druid.sql.visitor.functions.Nil;
 import com.alibaba.fastjson.JSONObject;
 import com.cn.model.ChatGroup;
+import com.cn.model.ServiceAccountRoleDepartmentMiddle;
 import nl.basjes.shaded.org.springframework.util.CollectionUtils;
 import org.jim.server.enums.*;
 import org.apache.commons.lang3.StringUtils;
@@ -10,7 +10,6 @@ import org.jim.common.ImConst;
 import org.jim.common.ImStatus;
 import org.jim.common.cache.redis.JedisTemplate;
 import org.jim.common.packets.*;
-import org.jim.common.utils.JsonKit;
 import org.jim.server.command.handler.processor.login.LoginCmdProcessor;
 import org.jim.server.util.SnowflakeIdUtils;
 import org.slf4j.Logger;
@@ -32,11 +31,6 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
 
     private static final String GROUP_PROPERTY = " group_id,name,avatar,service_account_role_department_middle_id,consumerId,group_type,company_id,department_id ";
 
-    /**
-     * 客服对话客户/游客的起始数量
-     */
-    private static final String SERVICE_ACCOUNT_START_USER_NUM = "0";
-
     static {
         try {
             jedisTemplate = JedisTemplate.me();
@@ -46,7 +40,6 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         }
     }
 
-
     /**
      * doLogin方法注意：J-IM登陆命令是根据user是否为空判断是否登陆成功,
      * 当登陆失败时设置user属性需要为空，相反登陆成功user属性是必须非空的;
@@ -124,11 +117,12 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         user.setAvatar(headImg);
         String nickname = map.get("nickname");
         user.setNick(nickname);
-        Map<String, Object> customerMap = new HashMap<>();
-        customerMap.put("visitorId",map.get("id"));
-        customerMap.put("companyId",map.get("companyId"));
-        customerMap.put("departmentId",map.get("departmentId"));
-        user.setExtras(new JSONObject(customerMap));
+        Map<String, Object> visitorMap = new HashMap<>();
+        visitorMap.put("visitorId",map.get("id"));
+        visitorMap.put("companyId",map.get("companyId"));
+        visitorMap.put("departmentId",map.get("departmentId"));
+        visitorMap.put("phone",map.get("phone"));
+        user.setExtras(new JSONObject(visitorMap));
         //访问类型 (SERVICEACCOUNT 客服 / CUSTOMER 客户 / VISITOR 游客)
         user.setVisitType(VisitTypeEnum.VISITOR.getKey());
         user.setGroups(this.initVisitorGroups(user));
@@ -159,7 +153,6 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
                 =  user.getExtras().getString("companyId") + ImConst.SEPARATOR
                 + user.getExtras().getString("departmentId") + ImConst.SEPARATOR
                 + VisitTypeEnum.SERVICEACCOUNT.getKey() ;
-
         List<Group> groups = new ArrayList<>();
         //从当前在线的客服中 获取 连接客户数最少的 客服
         //value组成 : Map<String ( serviceAccountRoleDepartmentId ), String (当前连接客户人数)>
@@ -168,21 +161,14 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         if( null != minReceptionNumServiceAccount ){
             //当前平台下部门下 存在客服
             user.getExtras().put("serviceAccountRoleDepartmentId",minReceptionNumServiceAccount.getKey());
-            String sql = this.createSelectGroupSql(user);
-            ChatGroup chatGroup = ChatGroup.dao.findFirst(sql);
-            if( null != chatGroup ){
-                //具有当前符合条件的群组
-                Group group = this.disposeChatGroupToGroup(chatGroup);
-                groups.add(group);
-            }else{
-                //创建群组
-                Group group = this.createGroup(user);
-                //把 Group 转成 Map 用于 jfianl框架的 添加使用
-                Map<String, Object> attrs = groupToMap(group);
-                //jfianl框架的 保存
-                ChatGroup.dao._setAttrs(attrs).save();
-                groups.add(group);
-            }
+            //创建临时在线群组 当客户 断开连接时 删除群组
+            Group group = this.createGroup(user);
+            //把 Group 转成 Map 用于 jfianl框架的 添加使用
+            Map<String, Object> attrs = groupToMap(group);
+            attrs.put("service_account_type",ServiceAccountOfflineType.NO.getKey());
+            //jfianl框架的 保存
+            ChatGroup.dao._setAttrs(attrs).save();
+            groups.add(group);
             //更改 客服正在 服务的 客户/游客 数量
             int num = Integer.valueOf(minReceptionNumServiceAccount.getValue());
             jedisTemplate.hashSet(serviceAccountContainerKey,minReceptionNumServiceAccount.getKey(),String.valueOf(++num));
@@ -218,6 +204,7 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         customerMap.put("companyId",map.get("companyId"));
         customerMap.put("departmentId",map.get("departmentId"));
         customerMap.put("serviceAccountId",map.get("serviceAccountId"));
+        customerMap.put("phone",map.get("phone"));
         customerMap.put("serviceAccountRoleDepartmentId",map.get("serviceAccountRoleDepartmentId"));
         user.setExtras(new JSONObject(customerMap));
         //访问类型 (SERVICEACCOUNT 客服 / CUSTOMER 客户 / VISITOR 游客)
@@ -247,52 +234,83 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         String isBlack = user.getExtras().getString("isBlack");
         if( CustomerClaimTypeEnum.YES.getKey().equals(isClaim) && BlackListStateEnum.NO.getKey().equals(isBlack) ){
             //被认领 并且 没有加入黑名单
-            //查询是否有 符合 该条件的 群组
-            String sql = this.createSelectGroupSql(user);
-            ChatGroup chatGroup = ChatGroup.dao.findFirst(sql);
-            if( null != chatGroup ){
-                //具有当前符合条件的群组
-                Group group = this.disposeChatGroupToGroup(chatGroup);
-                groups.add(group);
-            }else{
-                //创建群组
+            String receptionNum
+                    = jedisTemplate.hashGet(
+                            serviceAccountContainerKey
+                    , user.getExtras().getString("serviceAccountRoleDepartmentId")
+            );
+            //判断当前 认领这个 客户 的客服 是否在线
+            if( StringUtils.isNotBlank(receptionNum) ){
+                //在线
+                //创建临时在线群组 当客户 断开连接时 删除群组
                 Group group = this.createGroup(user);
                 //把 Group 转成 Map 用于 jfianl框架的 添加使用
                 Map<String, Object> attrs = groupToMap(group);
+                //客服是否是离线状态 1: 是 0: 否
+                attrs.put("service_account_type",ServiceAccountOfflineType.NO.getKey());
                 //jfianl框架的 保存
                 ChatGroup.dao._setAttrs(attrs).save();
                 groups.add(group);
-            }
-            String receptionNum
-                    = jedisTemplate.hashGet(serviceAccountContainerKey, user.getExtras().getString("serviceAccountRoleDepartmentId"));
-            //判断当前 认领这个 客户 的客服 是否在线
-            if( StringUtils.isNotBlank(receptionNum) ){
-                //在线
                 Integer num = Integer.valueOf(receptionNum);
                 //更改客服的服务数量
                 jedisTemplate.hashSet(serviceAccountContainerKey,user.getExtras().getString("serviceAccountRoleDepartmentId"),String.valueOf(++num));
+            }else{
+                //离线
+                //查询客户 是否有 上一次 留言的离线群组
+                String sql = createSelectGroupSql(user);
+                ChatGroup chatGroup = ChatGroup.dao.findFirst(sql);
+                if( null != chatGroup ) {
+                    // 客户 上一次 留言的离线群组
+                    Group group = this.disposeChatGroupToGroup(chatGroup);
+                    groups.add(group);
+                }else{
+                    //创建临时离线群组 当客户 断开连接时 删除群组
+                    Group group = this.createGroup(user);
+                    //把 Group 转成 Map 用于 jfianl框架的 添加使用
+                    Map<String, Object> attrs = groupToMap(group);
+                    //客服是否是离线状态 1: 是 0: 否
+                    attrs.put("service_account_type",ServiceAccountOfflineType.YES.getKey());
+                    //jfianl框架的 保存
+                    ChatGroup.dao._setAttrs(attrs).save();
+                    groups.add(group);
+                }
             }
+
         }else{
-            //按照游客 方式 处理 找到
+            //按照游客 方式 处理 找到 在线客服 连接数 最少的
             groups.addAll(this.disposeVisitorGroupData(user));
         }
         return groups;
     }
 
     /**
-     * 获取容器中 接待数量最少的 客服
-     * @param serviceAccountContainer
-     * @return {@link {@link Map.Entry< String, String>}}
+     * 创建 sw_conversation 数据
+     * @param group
+     * @param user
+     * @return {@link }
      * @author Darren
-     * @date 2020/2/5 10:34
+     * @date 2020/2/6 10:16
      */
-    private Map.Entry<String,String> getServiceAccountMinReceptionNum( Map<String, String> serviceAccountContainer ){
-        if(!CollectionUtils.isEmpty(serviceAccountContainer)){
-            List<Map.Entry<String, String>> entries = serviceAccountContainer.entrySet().stream().collect(Collectors.toList());
-            entries.sort( (o1,o2) -> (Integer.valueOf(o1.getValue()) - Integer.valueOf(o2.getValue())) );
-            return entries.get(0);
+    private void createConversation(Group group,User user) {
+        ServiceAccountRoleDepartmentMiddle dao = ServiceAccountRoleDepartmentMiddle.dao;
+        Map<String, Object> attrs = new HashMap<>();
+        attrs.put("id", group.getGroup_id());
+        //会话状态 0：游客会话 1：客户会话  群组类型 0:游客-客服 类型 1:客户-客服 类型
+        attrs.put("state", group.getGroupType());
+        if(VisitTypeEnum.CUSTOMER.getKey().equals(user.getVisitType())){
+            attrs.put("user_id", user.getExtras().getString("customerId"));
         }
-        return null;
+        if(VisitTypeEnum.VISITOR.getKey().equals(user.getVisitType())){
+            attrs.put("user_id", user.getExtras().getString("visitorId"));
+        }
+        attrs.put("user_nickname", user.getNick());
+        attrs.put("user_phone", user.getExtras().getString("phone"));
+        attrs.put("company_id", group.getCompanyId());
+        attrs.put("department_id", group.getDepartmentId());
+        ServiceAccountRoleDepartmentMiddle pojo
+                = dao.findById(group.getServiceAccountRoleDepartmentId());
+        attrs.put("service_account_id", pojo.get("service_account_id"));
+        dao._setAttrs(attrs).save();
     }
 
     /**
@@ -304,21 +322,37 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
      */
     public String createSelectGroupSql(User user){
         StringBuilder sql = new StringBuilder();
-         sql.append(" select ")
-            .append(GROUP_PROPERTY)
-            .append(" from sw_group where 1 = 1 ")
-            .append(" and company_id = " + user.getExtras().getString("companyId"))
-            .append(" and department_id = " + user.getExtras().getString("departmentId"))
-            .append(
-                    " and service_account_role_department_middle_id = "
-                            + user.getExtras().getString("serviceAccountRoleDepartmentId")
-            )
-            .append(" and consumer_id = " + user.getId())
-            .append(" order by create_time desc");
+        sql.append(" select ")
+                .append(GROUP_PROPERTY)
+                .append(" from sw_group where service_account_type = 1 ")
+                .append(" and company_id = " + user.getExtras().getString("companyId"))
+                .append(" and department_id = " + user.getExtras().getString("departmentId"))
+                .append(
+                        " and service_account_role_department_middle_id = "
+                                + user.getExtras().getString("serviceAccountRoleDepartmentId")
+                )
+                .append(" and consumer_id = " + user.getId())
+                .append(" order by create_time desc");
         return sql.toString();
     }
 
     /**
+     * 获取容器中 接待数量最少的 客服
+     * @param serviceAccountContainer
+     * @return {@link {@link Map.Entry< String, String>}}
+     * @author Darren
+     * @date 2020/2/5 10:34
+     */
+    private Map.Entry<String,String> getServiceAccountMinReceptionNum( Map<String, String> serviceAccountContainer ){
+        if(!CollectionUtils.isEmpty(serviceAccountContainer)){
+            List<Map.Entry<String, String>> entries = serviceAccountContainer.entrySet().stream().collect(Collectors.toList());
+            entries.sort( (o1,o2) -> (Integer.valueOf(o1.getValue()) - Integer.valueOf(o2.getValue())) );
+            return entries.get(0);
+        }
+        return null;
+    }
+
+    /**
      * 把 Group 转成 Map 用于 jfianl框架的 添加使用
      * @param group
      * @return {@link {@link Map< String, Object>}}
@@ -363,6 +397,10 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         }
         group.setCompanyId(user.getExtras().getString("companyId"));
         group.setDepartmentId(user.getExtras().getString("departmentId"));
+
+        //创建会话
+        this.createConversation(group,user);
+
         return group;
     }
 
@@ -420,7 +458,7 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
                     + ImConst.SEPARATOR + user.getExtras().getString("departmentId")
                     + ImConst.SEPARATOR +  ImConst.ADMIN ;
             List<String> adminContainer = jedisTemplate.listGetAll(adminContainerKey);
-            if( nl.basjes.shaded.org.springframework.util.CollectionUtils.isEmpty(adminContainer) ){
+            if( CollectionUtils.isEmpty(adminContainer) ){
                 //adminContainer 不存在
                 jedisTemplate.listPushTail(adminContainerKey,user.getId());
                 flag = true;
@@ -482,7 +520,6 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
      * @date 2020/2/3 19:55
      */
     private List<Group> initServiceAccountGroups(User user) {
-        List<Group> groups = null;
         //1.从redis中获取数据
         // 查看当前是否有相关该客服的群组  key数据格式: companyId : departmentId : userId : GROUP
        /* String serviceAccountGroupContainerKey = user.getExtras().getString("companyId")
@@ -503,15 +540,26 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         sql
                 .append(" select ")
                 .append(GROUP_PROPERTY)
-                .append(" from sw_group where group_type = 1 ")
+                //  service_account_type = 1 判断 当前的 是否是离线状态下的
+                //有可能 客服 下线 客户没下线 所以 这个地方的过滤 不用 过滤 service_account_type = 1
+                //群组 的删除 是依 客户/游客的下线 为准(并且 是在线群组 才会删除,离线群组不会删除)
+                .append(" from sw_group where 1 = 1 and group_type = 1 ")
                 .append(" and company_id = "+ user.getExtras().getString("companyId") + " ")
                 .append(" and department_id = " + user.getExtras().getString("departmentId") + " ")
                 .append(
                         " and service_account_role_department_middle_id = " + user.getId()
                 );
         List<ChatGroup> chatGroups = ChatGroup.dao.find(sql.toString());
-        groups = this.disposeChatGroupsToGroups(chatGroups);
+        List<Group> groups = this.disposeChatGroupsToGroups(chatGroups);
 
+        //修改 sw_group 字段service_account_type 状态
+        if( !CollectionUtils.isEmpty(chatGroups) ){
+            for (ChatGroup chatGroup : chatGroups) {
+                ChatGroup.dao.findById(chatGroup.getStr("group_id"))
+                        .set("service_account_type", ServiceAccountOfflineType.NO.getKey())
+                        .update();
+            }
+        }
         return groups;
     }