修改用户群昵称优化

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -146,16 +146,19 @@ public class UserController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}
+		String userType;
 		if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
+			userType = "TEACHER";
 			sysUser.setRealName(username);
 		}else {
+			userType = "STUDENT";
 			sysUser.setUsername(username);
 		}
 		if(StringUtils.isEmpty(sysUser.getImToken())){
 			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 			sysUser.setImToken(register.getToken());
 		}
-		webFeignService.updateNickName(sysUser.getId(),username,null);
+		webFeignService.updateNickName(sysUser.getId(),username,userType,sysUser.getAvatar());
 		password = new BCryptPasswordEncoder().encode(password);
 		sysUser.setPassword(password);
 		sysUser.setUpdateTime(new Date());

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

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

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

@@ -112,8 +112,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			throw new BizException("员工信息不存在");
 		}
 		employee.setUserId(employee.getId());
+		SysUser sysUser = sysUserFeignService.queryUserByMobile(employee.getPhone());
 		if(StringUtils.isNotEmpty(employee.getPhone())){
-			SysUser sysUser = sysUserFeignService.queryUserByMobile(employee.getPhone());
 			if(sysUser != null && !sysUser.getId().equals(employee.getUserId())){
 				throw new BizException("手机号已存在");
 			}
@@ -124,7 +124,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//新增用户角色
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		teacherDao.updateUser(employee);
-		imGroupService.updateNickName(employee.getUserId(),employee.getRealName(),"SYSTEM");
+		imGroupService.updateNickName(employee.getUserId(),employee.getRealName(),"SYSTEM",sysUser.getAvatar());
 	}
 
 	@Override

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

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

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

@@ -673,7 +673,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
             studentExtracurricularExercisesSituationDao.deleteByStudent(student.getId(), monDayDate.toString());
         }
-        webFeignService.updateNickName(userId,student.getUsername(),"STUDENT");
+        webFeignService.updateNickName(userId,student.getUsername(),"STUDENT",sysUser1.getAvatar());
         return userId;
     }
 

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

@@ -358,7 +358,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(student);
 
-        webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT");
+        webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT",sysUser.getAvatar());
         // 增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         // 报名成功后，发送短信
@@ -699,7 +699,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         studentDao.update(student);
                     }
                 }
-                webFeignService.updateNickName(userId,sysUser.getUsername(),"STUDENT");
+                webFeignService.updateNickName(userId,sysUser.getUsername(),"STUDENT",sysUser.getAvatar());
             }
             MusicGroupStudentFee studentFeeDaoByUser = musicGroupStudentFeeDao.findByUser(userId, musicGroupId);
             if (studentFeeDaoByUser != null) {

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

@@ -157,7 +157,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		teacherDao.update(teacher);
 		teacher.setOrganId(null);
 		teacherDao.updateUser(teacher);
-		webFeignService.updateNickName(teacher.getId(),teacher.getRealName(),"TEACHER");
+		webFeignService.updateNickName(teacher.getId(),teacher.getRealName(),"TEACHER",teacher.getAvatar());
 //		imFeignService.update(new ImUserModel(teacher.getId().toString(),teacher.getRealName(),teacher.getAvatar()));
 	}
 

mec-client-api/src/main/java/com/ym/mec/im/WebFeignService.java

@@ -20,5 +20,8 @@ public interface WebFeignService {
 	Boolean isPurchasedPracticeCourse(@RequestParam("userId") Integer userId);
 
 	@RequestMapping(value = "api/updateNickName")
-	int updateNickName(@RequestParam("userId") Integer userId,@RequestParam("nickName") String nickName,@RequestParam("userType") String userType);
+	int updateNickName(@RequestParam("userId") Integer userId,
+					   @RequestParam("nickName") String nickName,
+					   @RequestParam("userType") String userType,
+					   @RequestParam("avatar") String avatar);
 }

mec-client-api/src/main/java/com/ym/mec/im/fallback/WebFeignServiceFallback.java

@@ -24,7 +24,7 @@ public class WebFeignServiceFallback implements WebFeignService {
 	}
 
 	@Override
-	public int updateNickName(Integer userId, String nickName,String userType) {
+	public int updateNickName(Integer userId, String nickName,String userType,String avatar) {
 		return 0;
 	}
 }

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

@@ -63,8 +63,8 @@ public class APIController extends BaseController {
 	}
 
 	@GetMapping("/updateNickName")
-	public int updateNickName(Integer userId,String nickName,String userType) {
-		return imGroupService.updateNickName(userId,nickName,userType);
+	public int updateNickName(Integer userId,String nickName,String userType,String avatar) {
+		return imGroupService.updateNickName(userId,nickName,userType,avatar);
 	}
 
 }

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

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