完成游客信息列表中 点击对话中按钮功能

jim-common/src/main/java/org/jim/common/cache/redis/RedisCache.java

@@ -260,7 +260,7 @@ public class RedisCache implements ICache {
 			return null;
 		}
 		try {
-			return JedisTemplate.me().expire(key, expire);
+			return JedisTemplate.me().expire(cacheKey(cacheName,key), expire);
 		} catch (Exception e) {
 			log.error(e.toString(),e);
 		}

jim-server/src/main/java/org/jim/server/command/handler/LoginReqHandler.java

@@ -129,12 +129,17 @@ public class LoginReqHandler extends AbstractCmdHandler {
 				List<Group> intoChatGroups = user.getIntoChatGroups();
 				//把客服绑定到群组中
 				this.bindUnbindGroup(channelContext, user, intoChatGroups);
-				//如果客户在线 >> 把客户通道 绑定到群组
-				String customerDepartmentId = user.getExtras().getString("customerDepartmentId");
-				SetWithLock<ChannelContext> channelContexts = ImAio.getChannelContextsByUserId(customerDepartmentId);
+				String consumerId;
+				if( VisitTypeEnum.CUSTOMER.getKey().equals(user.getExtras().get("type")) ){
+					consumerId = user.getExtras().getString("customerDepartmentId");
+				}else{
+					consumerId = user.getExtras().getString("visitorDepartmentId");
+				}
+				//如果客户/游客 在线 >> 把客户/游客通道 绑定到群组
+				SetWithLock<ChannelContext> channelContexts = ImAio.getChannelContextsByUserId(consumerId);
 				if( null != channelContexts && channelContexts.size() > 0 ){
-					User customerUser = ImAio.getUser(customerDepartmentId);
-					if( null != customerUser ){
+					User consumerUser = ImAio.getUser(consumerId);
+					if( null != consumerUser ){
 						//获取锁
 						ReadLock readLock = channelContexts.getLock().readLock();
 						//加锁
@@ -142,8 +147,8 @@ public class LoginReqHandler extends AbstractCmdHandler {
 						try {
 							Set<ChannelContext> channels = channelContexts.getObj();
 							for (ChannelContext channel : channels) {
-								//为客户 绑定 群组
-								this.bindUnbindGroup(channel, customerUser, intoChatGroups);
+								//为客户/游客 绑定 群组
+								this.bindUnbindGroup(channel, consumerUser, intoChatGroups);
 							}
 						} catch (Exception e) {
 							log.error(e.toString(),e);

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

@@ -145,15 +145,15 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
     private User createVisitorData(Map<String, String> map) {
         User user = new User();
         user.setId(map.get("visitorDepartmentId"));
-        String headImg = map.get("headImg");
+        String headImg = map.get("headImg").replace("\"","");
         user.setAvatar(headImg);
-        String nickname = map.get("nickname");
+        String nickname = map.get("nickname").replace("\"","");
         user.setNick(nickname);
         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"));
+        visitorMap.put("phone",map.get("phone").replace("\"",""));
         user.setExtras(new JSONObject(visitorMap));
         //访问类型 (SERVICEACCOUNT 客服 / CUSTOMER 客户 / VISITOR 游客)
         user.setVisitType(VisitTypeEnum.VISITOR.getKey());
@@ -291,9 +291,9 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
     private User createCustomerData(Map<String, String> map) {
         User user = new User();
         user.setId(map.get("customerDepartmentId"));
-        String headImg = map.get("headImg");
+        String headImg = map.get("headImg").replace("\"","");
         user.setAvatar(headImg);
-        String nickname = map.get("nickname");
+        String nickname = map.get("nickname").replace("\"","");
         user.setNick(nickname);
         Map<String, Object> customerMap = new HashMap<>();
         customerMap.put("isBlack",map.get("isBlack"));
@@ -302,7 +302,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("phone",map.get("phone").replace("\"",""));
         customerMap.put("serviceAccountRoleDepartmentId",map.get("serviceAccountRoleDepartmentId"));
         user.setExtras(new JSONObject(customerMap));
         //访问类型 (SERVICEACCOUNT 客服 / CUSTOMER 客户 / VISITOR 游客)
@@ -561,9 +561,9 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         //当前访问人为客服
         user.setId(map.get("serviceAccountRoleDepartmentId"));
         //用户头像
-        user.setAvatar(map.get("headImg"));
+        user.setAvatar(map.get("headImg").replace("\"","") );
         //user nick
-        user.setNick( map.get("nickname"));
+        user.setNick( map.get("nickname").replace("\"","") );
         //扩展预留字段;
         Map<String, Object> serviceAccountMap = new HashMap<>();
         serviceAccountMap.put("companyId", map.get("companyId"));
@@ -573,11 +573,24 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         serviceAccountMap.put("serviceAccountId", map.get("id"));
         serviceAccountMap.put("intoChat", map.get("intoChat"));
         if(Boolean.valueOf(map.get("intoChat"))){
-            serviceAccountMap.put("customerDepartmentId", map.get("customerDepartmentId"));
-            serviceAccountMap.put("customerNickname", map.get("customerNickname"));
-            serviceAccountMap.put("customerHeadImg", map.get("customerHeadImg"));
-            serviceAccountMap.put("customerPhone", map.get("customerPhone"));
-            serviceAccountMap.put("customerId", map.get("customerId"));
+            String type = map.get("type").replace("\"","");
+            if(VisitTypeEnum.CUSTOMER.getKey().equals(type)){
+                serviceAccountMap.put("customerDepartmentId", map.get("customerDepartmentId"));
+                serviceAccountMap.put("customerNickname", map.get("customerNickname").replace("\"",""));
+                serviceAccountMap.put("customerHeadImg", map.get("customerHeadImg").replace("\"",""));
+                serviceAccountMap.put("customerPhone", map.get("customerPhone").replace("\"",""));
+                serviceAccountMap.put("customerId", map.get("customerId"));
+                serviceAccountMap.put("type", type);
+            }
+            if(VisitTypeEnum.VISITOR.getKey().equals(type)){
+                serviceAccountMap.put("visitorDepartmentId", map.get("visitorDepartmentId"));
+                serviceAccountMap.put("visitorNickname", map.get("visitorNickname").replace("\"",""));
+                serviceAccountMap.put("visitorHeadImg", map.get("visitorHeadImg").replace("\"",""));
+                serviceAccountMap.put("visitorPhone", map.get("visitorPhone").replace("\"",""));
+                serviceAccountMap.put("visitorId", map.get("visitorId"));
+                serviceAccountMap.put("groupId", map.get("groupId").replace("\"",""));
+                serviceAccountMap.put("type", type);
+            }
         }
         user.setExtras(new JSONObject(serviceAccountMap));
         //访问类型 (SERVICEACCOUNT 客服 / CUSTOMER 客户 / VISITOR 游客)
@@ -599,79 +612,112 @@ public class IMChatLoginServiceProcessor implements LoginCmdProcessor {
         List<Group> groups = new ArrayList<>();
         //是否创建 会话
         user.getExtras().put("isCreateConversation",true);
+        String type = user.getExtras().getString("type");
         if( user.getExtras().getBoolean("intoChat") ){
-            String customerDepartmentId = user.getExtras().getString("customerDepartmentId");
-            StringBuilder sql = new StringBuilder();
-            sql.append(" select ")
-                    .append(GROUP_PROPERTY)
-                    .append(" from sw_group where 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()
-                    )
-                    .append(" and consumer_id = " + customerDepartmentId )
-                    .append(" order by create_time desc");
-            ChatGroup chatGroup = ChatGroup.dao.findFirst(sql.toString());
-            //customer 是否在线 如果不在线就是 留言群组
-            boolean isOnline = isOnline(customerDepartmentId);
-            if(null != chatGroup){
-                //说明 当前存在 群组
-                if(
-                        MessageStateEnum.YES.getKey() == chatGroup.getInt("message_state") ||
-                                GroupStateEnum.ON_LINE.getKey() == chatGroup.getInt("group_state")
-                ){
-                    // 群组 是留言群组 或 群组为在线状态 则不重新创建会话
-                    user.getExtras().put("isCreateConversation",false);
-                }
+            if(VisitTypeEnum.CUSTOMER.getKey().equals(type)){
+                groups.add(this.disposeCustomerIntoChatGroupData(user));
+            }else{
+                groups.add(this.disposeVisitorIntoChatGroupData(user));
+            }
+            if( user.getExtras().getBoolean("isCreateConversation")){
+                this.createIntoChatConversation(groups.get(0),user);
+            }
+        }
+        return groups;
+    }
+
+    /**
+     * 处理客服 向游客 发起聊天
+     * @param user
+     * @return {@link {@link Group}}
+     * @author Darren
+     * @date 2020/2/18 15:04
+     */
+    private Group disposeVisitorIntoChatGroupData(User user){
+        // 群组 是留言群组 或 群组为在线状态 则不重新创建会话
+        user.getExtras().put("isCreateConversation",false);
+        ChatGroup chatGroup = ChatGroup.dao.findById(user.getExtras().get("groupId"));
+        chatGroup
+                // 更改 sw_group 表中 service_account_type 字段为 在线 (客服离线状态 1: 离线 0: 在线)
+                .set("service_account_type",ServiceAccountOfflineTypeEnum.ON_LINE.getKey())
+                .update();
+        return disposeChatGroupToGroup(chatGroup);
+    }
+
+    /**
+     * 处理客服 向客户 发起聊天
+     * @param user
+     * @return {@link {@link Group}}
+     * @author Darren
+     * @date 2020/2/18 15:04
+     */
+    private Group disposeCustomerIntoChatGroupData(User user) {
+        String customerDepartmentId = user.getExtras().getString("customerDepartmentId");
+        StringBuilder sql = new StringBuilder();
+        sql.append(" select ")
+                .append(GROUP_PROPERTY)
+                .append(" from sw_group where 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()
+                )
+                .append(" and consumer_id = " + customerDepartmentId )
+                .append(" order by create_time desc");
+        ChatGroup chatGroup = ChatGroup.dao.findFirst(sql.toString());
+        //customer 是否在线 如果不在线就是 留言群组
+        boolean isOnline = isOnline(customerDepartmentId);
+        if(null != chatGroup){
+            //说明 当前存在 群组
+            if(
+                    MessageStateEnum.YES.getKey() == chatGroup.getInt("message_state") ||
+                            GroupStateEnum.ON_LINE.getKey() == chatGroup.getInt("group_state")
+            ){
+                // 群组 是留言群组 或 群组为在线状态 则不重新创建会话
+                user.getExtras().put("isCreateConversation",false);
+            }
+            chatGroup
+                    // 更改 sw_group 表中 service_account_type 字段为 在线 (客服离线状态 1: 离线 0: 在线)
+                    .set("service_account_type",ServiceAccountOfflineTypeEnum.ON_LINE.getKey())
+                    .update();
+            if(isOnline){
                 chatGroup
-                        // 更改 sw_group 表中 service_account_type 字段为 在线 (客服离线状态 1: 离线 0: 在线)
-                        .set("service_account_type",ServiceAccountOfflineTypeEnum.ON_LINE.getKey())
+                        // 更改 sw_group 表中 group_state 字段为在线 (群组离线状态 1: 离线 0: 在线)
+                        .set("group_state",GroupStateEnum.ON_LINE.getKey())
+                        // 更改 sw_group 表中 consumer_type 字段为在线 (客户/游客 离线状态 1:离线 0:在线)
+                        .set("consumer_type",ConsumerTypeEnum.ON_LINE.getKey())
+                        // 更改 sw_group 表中 message_state 字段为 非留言 (群组留言状态 1:留言 0:非留言)
+                        .set("message_state",MessageStateEnum.NO.getKey())
                         .update();
-                if(isOnline){
-                    chatGroup
-                            // 更改 sw_group 表中 group_state 字段为在线 (群组离线状态 1: 离线 0: 在线)
-                            .set("group_state",GroupStateEnum.ON_LINE.getKey())
-                            // 更改 sw_group 表中 consumer_type 字段为在线 (客户/游客 离线状态 1:离线 0:在线)
-                            .set("consumer_type",ConsumerTypeEnum.ON_LINE.getKey())
-                            // 更改 sw_group 表中 message_state 字段为 非留言 (群组留言状态 1:留言 0:非留言)
-                            .set("message_state",MessageStateEnum.NO.getKey())
-                            .update();
-                }else{
-                    chatGroup
-                            // 更改 sw_group 表中 group_state 字段为在线 (群组离线状态 1: 离线 0: 在线)
-                            .set("group_state",GroupStateEnum.OFF_LINE.getKey())
-                            // 更改 sw_group 表中 consumer_type 字段为在线 (客户/游客 离线状态 1:离线 0:在线)
-                            .set("consumer_type",ConsumerTypeEnum.OFF_LINE.getKey())
-                            // 更改 sw_group 表中 message_state 字段为 非留言 (群组留言状态 1:留言 0:非留言)
-                            .set("message_state",MessageStateEnum.YES.getKey())
-                            .update();
-                }
-                Group group = disposeChatGroupToGroup(chatGroup);
-                groups.add(group);
             }else{
-                //创建新的群组
-                Group group = this.createIntoChatGroup(user);
-                Map<String, Object> groupAttrs = this.groupToMap(group);
-                groupAttrs.put("service_account_type", ServiceAccountOfflineTypeEnum.ON_LINE.getKey());
-                if(isOnline){
-                    groupAttrs.put("group_state", GroupStateEnum.ON_LINE.getKey());
-                    groupAttrs.put("consumer_type", ConsumerTypeEnum.ON_LINE.getKey());
-                    groupAttrs.put("message_state", MessageStateEnum.NO.getKey());
-                }else{
-                    groupAttrs.put("group_state", GroupStateEnum.OFF_LINE.getKey());
-                    groupAttrs.put("consumer_type", ConsumerTypeEnum.OFF_LINE.getKey());
-                    groupAttrs.put("message_state", MessageStateEnum.YES.getKey());
-                }
-                //jfianl框架的 保存
-                ChatGroup.dao._setAttrs(groupAttrs).save();
-                groups.add(group);
+                chatGroup
+                        // 更改 sw_group 表中 group_state 字段为在线 (群组离线状态 1: 离线 0: 在线)
+                        .set("group_state",GroupStateEnum.OFF_LINE.getKey())
+                        // 更改 sw_group 表中 consumer_type 字段为在线 (客户/游客 离线状态 1:离线 0:在线)
+                        .set("consumer_type",ConsumerTypeEnum.OFF_LINE.getKey())
+                        // 更改 sw_group 表中 message_state 字段为 非留言 (群组留言状态 1:留言 0:非留言)
+                        .set("message_state",MessageStateEnum.YES.getKey())
+                        .update();
             }
+            return disposeChatGroupToGroup(chatGroup);
+        }else{
+            //创建新的群组
+            Group group = this.createIntoChatGroup(user);
+            Map<String, Object> groupAttrs = this.groupToMap(group);
+            groupAttrs.put("service_account_type", ServiceAccountOfflineTypeEnum.ON_LINE.getKey());
+            if(isOnline){
+                groupAttrs.put("group_state", GroupStateEnum.ON_LINE.getKey());
+                groupAttrs.put("consumer_type", ConsumerTypeEnum.ON_LINE.getKey());
+                groupAttrs.put("message_state", MessageStateEnum.NO.getKey());
+            }else{
+                groupAttrs.put("group_state", GroupStateEnum.OFF_LINE.getKey());
+                groupAttrs.put("consumer_type", ConsumerTypeEnum.OFF_LINE.getKey());
+                groupAttrs.put("message_state", MessageStateEnum.YES.getKey());
+            }
+            //jfianl框架的 保存
+            ChatGroup.dao._setAttrs(groupAttrs).save();
+            return group;
         }
-        if( user.getExtras().getBoolean("isCreateConversation")){
-            this.createIntoChatConversation(groups.get(0),user);
-        }
-        return groups;
     }
 
     /**