Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupService.java

@@ -59,4 +59,12 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * @return
 	 */
     int updateNickName(Integer userId, String nickName);
+
+	/**
+	 * 修改用户在群、通讯录的备注
+	 * @param userId
+	 * @param nickName
+	 * @return
+	 */
+	void updateNickName1(Integer userId, String nickName);
 }

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

@@ -135,4 +135,22 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 		return i;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateNickName1(Integer userId, String nickName) {
+		//修改群成员备注
+		imGroupDao.updateNickname(userId, nickName);
+		imGroupDao.updateUserFriendNickname(userId, nickName);
+		//修改sysUser名称，如果包含学员的角色，那么修改userName。否则修改realName
+		SysUser sysUser = sysUserFeignService.queryUserById(userId);
+		if(sysUser.getUserType().contains("STUDENT")){
+			sysUser.setUsername(nickName);
+		}else {
+			sysUser.setRealName(nickName);
+		}
+		sysUserFeignService.updateSysUser(sysUser);
+		//同步融云基本信息
+		imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
+	}
+
 }

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -80,7 +80,8 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("修改群成员信息")
 	@PostMapping(value = "/updateNickName")
 	public Object updateNickName(Integer userId,String nickName) {
-		return succeed(imGroupService.updateNickName(userId,nickName));
+		imGroupService.updateNickName1(userId,nickName);
+		return succeed();
 	}
 
 	@ApiOperation("查询群成员列表")