Merge remote-tracking branch 'origin/master'

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

@@ -146,19 +146,18 @@ 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());
+		}else {
+			imFeignService.update(new ImUserModel(sysUser.getId().toString(),username,sysUser.getAvatar()));
 		}
-		webFeignService.updateNickName(sysUser.getId(),username,userType,sysUser.getAvatar());
+		webFeignService.updateNickName(sysUser.getId(),username);
 		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,9 +56,7 @@ public interface ImGroupService extends BaseService<Long, ImGroup> {
 	 * 修改用户在群、通讯录的备注
 	 * @param userId
 	 * @param nickName
-	 * @param userType
-	 * @param avatar
 	 * @return
 	 */
-    int updateNickName(Integer userId, String nickName,String userType,String avatar);
+    int updateNickName(Integer userId, String nickName);
 }

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

@@ -61,7 +61,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Autowired
 	private OrganizationDao organizationDao;
 	@Autowired
-	private ImGroupService imGroupService;
+	private ImGroupDao imGroupDao;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
@@ -124,7 +124,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//新增用户角色
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		teacherDao.updateUser(employee);
-		imGroupService.updateNickName(employee.getUserId(),employee.getRealName(),"SYSTEM",sysUser.getAvatar());
+		imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
+		imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());
+		imFeignService.update(new ImUserModel(employee.getUserId().toString(),employee.getRealName(),sysUser.getAvatar()));
 	}
 
 	@Override

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

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

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

@@ -675,7 +675,8 @@ 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",sysUser1.getAvatar());
+        webFeignService.updateNickName(userId,student.getUsername());
+        imFeignService.update(new ImUserModel(userId.toString(),student.getUsername(),sysUser1.getAvatar()));
         return userId;
     }
 

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

@@ -17,19 +17,12 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javax.annotation.Resource;
-
-import com.ym.mec.biz.event.source.GroupEventSource;
-import org.apache.commons.lang3.ArrayUtils;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.event.source.GroupEventSource;
 import com.ym.mec.biz.service.*;
-import com.ym.mec.im.WebFeignService;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,13 +32,11 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
-import com.ym.mec.biz.dal.dto.CourseFormDto;
 import com.ym.mec.biz.dal.dto.StudentAddDto;
 import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
@@ -144,11 +135,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private StudentInstrumentService studentInstrumentService;
     @Autowired
     private OrganizationDao organizationDao;
-
-    @Autowired
-    private GroupEventSource groupEventSource;
-    @Autowired
-    private WebFeignService webFeignService;
     @Autowired
     private StudentService studentService;
     @Autowired
@@ -351,7 +337,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         imGroupDao.updateNickname(userId, studentRegistration.getName());
         imGroupDao.updateUserFriendNickname(userId, studentRegistration.getName());
         imFeignService.update(new ImUserModel(userId.toString(),studentRegistration.getName(),sysUser.getAvatar()));
-//        webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT",sysUser.getAvatar());
         // 增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         // 报名成功后，发送短信
@@ -692,7 +677,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         studentDao.update(student);
                     }
                 }
-                webFeignService.updateNickName(userId,sysUser.getUsername(),"STUDENT",sysUser.getAvatar());
+                imGroupDao.updateNickname(userId,sysUser.getUsername());
+                imGroupDao.updateUserFriendNickname(userId,sysUser.getUsername());
             }
             MusicGroupStudentFee studentFeeDaoByUser = musicGroupStudentFeeDao.findByUser(userId, musicGroupId);
             if (studentFeeDaoByUser != null) {
@@ -770,7 +756,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             student.setCurrentClass(studentRegistration.getCurrentClass());
             studentDao.update(student);
             //studentRegistrationDao.updateCurrentClass(studentRegistration);
-
+            imFeignService.update(new ImUserModel(userId.toString(),sysUser.getUsername(),sysUser.getAvatar()));
             return userId;
         }
     }
@@ -815,7 +801,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }
             Boolean orderFlag = true;
             //用户是否在主乐团
-            StudentRegistration registration = studentRegistrationDao.getByPhoneAndMusicGroupId(newMusicGroupId, studentRegistration.getParentsPhone());
+            StudentRegistration registration = studentRegistrationDao.getStudentRegister(newMusicGroupId, studentRegistration.getUserId());
             if (registration != null) {
                 if (registration.getMusicGroupStatus() == StudentMusicGroupStatusEnum.NORMAL) {
                     orderFlag = false;

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

@@ -70,7 +70,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
-	private WebFeignService webFeignService;
+	private ImGroupDao imGroupDao ;
 	@Autowired
 	private StudentExtracurricularExercisesSituationDao studentExtracurricularExercisesSituationDao;
 	@Autowired
@@ -157,8 +157,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		teacherDao.update(teacher);
 		teacher.setOrganId(null);
 		teacherDao.updateUser(teacher);
-		webFeignService.updateNickName(teacher.getId(),teacher.getRealName(),"TEACHER",teacher.getAvatar());
-//		imFeignService.update(new ImUserModel(teacher.getId().toString(),teacher.getRealName(),teacher.getAvatar()));
+		imGroupDao.updateNickname(teacher.getId(),teacher.getRealName());
+		imGroupDao.updateUserFriendNickname(teacher.getId(),teacher.getRealName());
+		imFeignService.update(new ImUserModel(teacher.getId().toString(),teacher.getRealName(),teacher.getAvatar()));
 	}
 
 	@Override

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

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

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,String avatar) {
+	public int updateNickName(Integer userId, String nickName) {
 		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,String avatar) {
-		return imGroupService.updateNickName(userId,nickName,userType,avatar);
+	public int updateNickName(Integer userId,String nickName) {
+		return imGroupService.updateNickName(userId,nickName);
 	}
 
 }

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,String avatar) {
-		return succeed(imGroupService.updateNickName(userId,nickName,userType,avatar));
+	public Object updateNickName(Integer userId,String nickName) {
+		return succeed(imGroupService.updateNickName(userId,nickName));
 	}
 
 	@ApiOperation("查询群成员列表")