fix调整IM功能封装，删除冗余代码

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -346,6 +346,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 						} else {
 							item.setNickname(realNameMap.get(item.getUserId().intValue()));
 						}
+						item.setImUserId(item.getUserId().toString());
 
 						BasicUserInfo userInfo = teacherDao.getBasicUserInfo(item.getUserId().intValue());
 						// 用户头像

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -324,28 +324,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroupMemberDto.setType(EFriendRoleType.getByName(imGroupMemberDto.getRoleType()).name());
             imGroupMemberDto.getUser().setUsername(imGroupMemberDto.getGroupNickname());
             imGroupMemberDto.setNickname(imGroupMemberDto.getGroupNickname());
-            String roleType = imGroupMemberDto.getRoleType();
-            /*if (StringUtils.isEmpty(roleType)){
-                throw new BizException("roleType为空");
-            }*/
-            //根据角色不同 配置imUserId
-            if (EFriendRoleType.SCHOOLMASTER.getMsg().equals(roleType) ||
-                    EFriendRoleType.ORCHESTRA_LEADER.getMsg().equals(roleType) ||
-                    EFriendRoleType.SCHOOL_LEADER.getMsg().equals(roleType) ||
-                    EFriendRoleType.SCHOOL_TEACHER.getMsg().equals(roleType)) {
-                imGroupMemberDto.setImUserId(
-                        imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()), SysUserType.SCHOOL.getCode()
-                        )
-                );
-            } else if (EFriendRoleType.ORCHESTRA_TEACHER.getMsg().equals(roleType)){
-                imGroupMemberDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()),SysUserType.TEACHER.getCode()));
-            } else if (EFriendRoleType.ORCHESTRA_MANAGER.getMsg().equals(roleType) || EFriendRoleType.MAINTENANCE_TECHNICIAN.getMsg().equals(roleType)){
-                imGroupMemberDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()),SysUserType.EDUCATION.getCode()));
-            } else if (EFriendRoleType.STUDENT.getMsg().equals(roleType)){
-                imGroupMemberDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()),SysUserType.STUDENT.getCode()));
-            } else {
-                imGroupMemberDto.setImUserId("");
-            }
         }
         return imGroupMemberDtos;
     }
@@ -359,29 +337,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 imGroupMemberDto.setRoleType(null);
             }
         }
-        String roleType = imGroupMemberDto.getRoleType();
-        /*if (StringUtils.isEmpty(roleType)){
-            throw new BizException("roleType为空");
-        }*/
-
-        //根据角色不同 配置imUserId
-        if (EFriendRoleType.SCHOOLMASTER.getMsg().equals(roleType) ||
-                EFriendRoleType.ORCHESTRA_LEADER.getMsg().equals(roleType) ||
-                EFriendRoleType.SCHOOL_LEADER.getMsg().equals(roleType) ||
-                EFriendRoleType.SCHOOL_TEACHER.getMsg().equals(roleType)) {
-            imGroupMemberDto.setImUserId(
-                    imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()), SysUserType.SCHOOL.getCode()
-                    )
-            );
-        } else if (EFriendRoleType.ORCHESTRA_TEACHER.getMsg().equals(roleType)){
-            imGroupMemberDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()),SysUserType.TEACHER.getCode()));
-        } else if (EFriendRoleType.ORCHESTRA_MANAGER.getMsg().equals(roleType) || EFriendRoleType.MAINTENANCE_TECHNICIAN.getMsg().equals(roleType)){
-            imGroupMemberDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()),SysUserType.EDUCATION.getCode()));
-        } else if (EFriendRoleType.STUDENT.getMsg().equals(roleType)){
-            imGroupMemberDto.setImUserId(imGroupCoreService.getImUserId(String.valueOf(imGroupMemberDto.getUserId()),SysUserType.STUDENT.getCode()));
-        } else{
-            imGroupMemberDto.setImUserId("");
-        }
         return imGroupMemberDto;
     }
 
@@ -637,8 +592,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     /**
      * 加入学校群聊
      *
-     * @param schoolId
-     * @param imGroupMembers
+     * @param schoolId 学校ID
+     * @param imGroupMembers List<GroupMemberWrapper.ImGroupMember>
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -690,12 +645,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             return;
         }
 
-
-
-        List<Integer> userIds = new ArrayList<>();
+        //List<Integer> userIds = new ArrayList<>();
         for (GroupMemberWrapper.ImGroupMember imGroupMember : imGroupMembers) {
-            imGroupMember.setImUserIdFormat(false);
-            userIds.add(imGroupMember.getUserId().intValue());
+            imGroupMember.setImUserId(String.valueOf(imGroupMember.getUserId()));
+            //userIds.add(imGroupMember.getUserId().intValue());
         }
         try {
             imGroupCoreService.groupQuit(imGroupMembers,imGroup.getId());
@@ -1226,7 +1179,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     }
 
                     //设置body
-                    TencentRequest.MessageBody body = new TencentRequest.MessageBody();
+                    //TencentRequest.MessageBody body = new TencentRequest.MessageBody();
                     List<TencentRequest.MessageBody> list = new ArrayList<>();
 
                     JSONObject jsonObject = JSONObject.parseObject(i.getContent());
@@ -1331,7 +1284,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     List<MessageWrapper.GroupImportMessageData> list = new ArrayList<>();
                     MessageWrapper.GroupImportMessageData data1 = new MessageWrapper.GroupImportMessageData();
                     List<TencentRequest.MessageBody> bodyList = new ArrayList<>();
-                    TencentRequest.MessageBody body = new TencentRequest.MessageBody();
+                    //TencentRequest.MessageBody body = new TencentRequest.MessageBody();
                     //设置群组Id
                     groupImportMessage.setGroupId(i.getGroupId());
                     //设置发送人
@@ -1361,7 +1314,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         dateTime = dateTime / (1000);
                         data1.setSendTime(dateTime);
                     } catch (ParseException e) {
-                        e.printStackTrace();
+                        log.error("时间转换失败", e);
                     }
                 /*bodyList.stream().forEach(item->{
                             item.setMsgContent(i.getContent());
@@ -1410,7 +1363,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         try {
                             body1 = getTimVideoFileElem(sightUrl, size, duration, content);
                         } catch (IOException e) {
-                            e.printStackTrace();
+                            log.error("视频转换失败", e);
                         }
                         bodyList.add(body1);
                     } else if (i.getClassname().equals("RC:LBSMsg")) {
@@ -1512,7 +1465,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
     /**
      * 更新已修改数据的状态
-     * @param info
+     * @param info HistoryMessage
      */
     public void updateStatus(HistoryMessage info,int status) {
         historyMessageService.updateStatus(info.getMsgUID(), status);