Merge remote-tracking branch 'origin/online1' into online1

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-biz/src/main/resources/config/mybatis/courseScheduleStudentMusicScoreMapper.xml

@@ -72,20 +72,20 @@
         UPDATE course_schedule_student_music_score
         SET down_status_ = #{downStatus},play_status_ = #{playStatus},speed_ = #{speed},update_time_ = NOW()
         WHERE course_schedule_id_ = #{courseScheduleId}
-        <if test="userId">
+        <if test="userId != null">
             AND user_id_ = #{userId}
         </if>
-        <if test="musicScoreAccompanimentId">
+        <if test="musicScoreAccompanimentId != null">
             AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
         </if>
     </update>
     <update id="closePlayStatus">
         UPDATE course_schedule_student_music_score SET play_status_ = 0,accompaniment_play_status_ = 0,update_time_ = NOW()
         WHERE course_schedule_id_ = #{scheduleId}
-        <if test="musicScoreAccompanimentId">
+        <if test="musicScoreAccompanimentId != null">
             AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
         </if>
-        <if test="musicScoreAccompanimentId">
+        <if test="userId != null">
             AND user_id_ = #{userId}
         </if>
     </update>

mec-im/src/main/java/com/ym/pojo/MusicScoreMessage.java

@@ -14,13 +14,13 @@ public class MusicScoreMessage {
     private String subjectName;
 
     /**  */
-    private String mp3Url;
+    private String mp3Url = "";
 
     /** 速度 */
     private Integer speed;
 
     /**  */
-    private String xmlUrl;
+    private String xmlUrl = "";
 
     /**  */
     private String examSongName;
@@ -35,7 +35,7 @@ public class MusicScoreMessage {
     private String type;
 
     /**  */
-    private String url;
+    private String url = "";
 
     public Integer getId() {
         return id;

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -942,7 +942,7 @@ public class RoomServiceImpl implements RoomService {
         if(roomMembers.size() == 0){
             return false;
         }
-        if (data.getExamSongOn() != null) {
+        if (data.getExamSongOn() != null || data.getMusicScoreOn() != null || data.getAccompanimentOn() != null) {
             if(StringUtils.isNotEmpty(data.getUserId())){
                 for (RoomMember e:roomMembers) {
                     data.setUserId(e.getUid());

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("查询群成员列表")