Merge branch 'feature/1020-tencent-im' into test

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

@@ -154,6 +154,7 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
         List<ImGroupMemberWrapper.ImGroupMember> groupMembers = null;
         String imUserId = null;
         if (userInfo != null) {
+            userInfo.setGroupId(group.getId());
             imUserId = getImUserId(userInfo.getUserId().toString(), userInfo.getClientType());
             groupMembers = Lists.newArrayList(userInfo);
 
@@ -535,6 +536,7 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
                 .imUserId(getImUserId(userId.toString(),clientType))
                 .isAdmin(false)
                 .roleType(clientType)
+                .tenantId(imGroup.getTenantId())
                 .build();
         imGroupMembers.add(groupMember);
 

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

@@ -24,6 +24,7 @@ import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.enums.im.ClientEnum;
 import com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.biz.service.im.ImGroupCoreService;
 import com.ym.mec.common.page.QueryInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -64,13 +65,6 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
 import com.ym.mec.biz.dal.page.UserBasicQueryInfo;
-import com.ym.mec.biz.service.EmployeeService;
-import com.ym.mec.biz.service.ImGroupMemberService;
-import com.ym.mec.biz.service.ImUserFriendService;
-import com.ym.mec.biz.service.OaUserService;
-import com.ym.mec.biz.service.SysEmployeePositionService;
-import com.ym.mec.biz.service.SysUserTenantService;
-import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImResult;
@@ -128,6 +122,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
     @Autowired
     private ImPluginContext imPluginContext;
 
+    @Autowired
+    private SysUserService sysUserService;
+
     @Override
     public BaseDAO<Integer, Employee> getDAO() {
         return employeeDao;
@@ -737,7 +734,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
-                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, userInfo.getAvatar());
+                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, sysUserService.getImAvatar(userInfo));
             } catch (Exception e) {
                 log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
             }

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

@@ -206,6 +206,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     .avatar(sysUser.getAvatar())
                     .nickname(sysUserType == SysUserType.STUDENT?sysUser.getUsername():sysUser.getRealName())
                     .roleType(roleType)
+                    .tenantId(imGroup.getTenantId())
                     .isAdmin(true)
                     .build();
         }
@@ -266,6 +267,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 //                    .avatar(groupMember.getAvatar())
                     .nickname(groupMember.getNickname())
                     .isAdmin(groupMember.getIsAdmin())
+                    .tenantId(groupMember.getTenantId())
                     .imUserId(getImUserId(groupMember.getUserId().toString(), sysUserType.name()))
                     .roleType(groupMember.getRoleType())
                     .build());
@@ -389,7 +391,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
         // IM用户信息更新
         try {
-            imGroupCoreService.register(userId.toString(),"",nickName,sysUser.getAvatar());
+            imGroupCoreService.register(userId.toString(),"",nickName,sysUserService.getImAvatar(sysUser));
         } catch (Exception e) {
             log.error("更新用户信息失败",e);
             throw new BizException("更新用户信息失败");
@@ -550,7 +552,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setUpdateTime(new Date());
             imGroup.setTenantId(cooperationOrgan.getTenantId());
 
-            createImGroup(imGroup,userId,"");
+            createImGroup(imGroup,userId,schoolStaffType.getDescribe());
 
             initSchoolGroup(imGroup.getSchoolId());
         } else {
@@ -569,6 +571,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroupMember.setUserId(userId);
             imGroupMember.setIsAdmin(schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER));
             imGroupMember.setRoleType(schoolStaffType.getDescribe());
+            imGroupMember.setNickname(name);
             imGroupMember.setType(EFriendRoleType.getByName(schoolStaffType.getDescribe()).name());
             imGroupMember.setTenantId(imGroup.getTenantId());
             imGroupMemberDao.insert(imGroupMember);
@@ -1009,7 +1012,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 username = Optional.ofNullable(user.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
             }
             // 自动激活学生IM帐号
-            imGroupCoreService.register(userId,clientType, username, avatar);
+            imGroupCoreService.register(userId,clientType, username, sysUserService.getImAvatar(user));
         } catch (Exception e) {
             log.error("register user error", e);
         }

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

@@ -260,7 +260,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
             TenantContextHolder.setTenantId(cooperation.getTenantId());
 
             // 创建学校im群
-            imGroupService.addSchoolStaffGroup(schoolStaff.getSchoolId(), user.getId(),user.getUsername(),user.getAvatar(),schoolStaff.getUserType());
+            imGroupService.addSchoolStaffGroup(schoolStaff.getSchoolId(), user.getId(),user.getUsername(),sysUserService.getImAvatar(user),schoolStaff.getUserType());
         } catch (Exception e) {
             log.error("加入群组失败 ",e);
             throw new BizException("加入群组失败");

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

@@ -119,6 +119,9 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Autowired
     private ImGroupCoreService imGroupCoreService;
 
+    @Autowired
+    private SysUserService sysUserService;
+
     @Override
     public PageInfo<StudentManageListDto> findStudentsByOrganId(StudentManageQueryInfo queryInfo) {
         PageInfo<StudentManageListDto> pageInfo = new PageInfo<StudentManageListDto>(queryInfo.getPage(), queryInfo.getRows());
@@ -763,7 +766,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
-                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, userInfo.getAvatar());
+                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, sysUserService.getImAvatar(userInfo));
             } catch (Exception e) {
                 log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
             }

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -96,7 +96,8 @@ public class UserController {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
-                ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), clientType, username, userInfo.getAvatar());
+                ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), clientType, username,
+                    sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
 
                 // 用户注册接入Token
                 tokenResult.setToken(register.getImToken());
@@ -136,7 +137,7 @@ public class UserController {
             try {
 
                 ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), userModel.getClientType(),
-                    username, Optional.ofNullable(userInfo.getAvatar()).orElse(""));
+                    username,  sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
 
                 // 用户注册接入Token
                 tokenResult.setImToken(register.getImToken());
@@ -170,7 +171,7 @@ public class UserController {
                 try {
 
                     ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), "",
-                        username, Optional.ofNullable(userModel.getPortrait()).orElse(userInfo.getAvatar()));
+                        username,  sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
 
                     log.info("update IM_USER register: {}", JSONObject.toJSONString(register));
                 } catch (Exception e) {