Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentMusicScoreDao.java

@@ -21,7 +21,7 @@ public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, Cou
      * @param scheduleId
      * @param userId
      */
-    void closePlayStatus(@Param("scheduleId") long scheduleId, @Param("userId") Integer userId, @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
+    void closePlayStatus(@Param("scheduleId") long scheduleId, @Param("userId") Integer userId, @Param("musicScoreAccompanimentId") String musicScoreAccompanimentId);
 
     /**
      * 开启原音播放
@@ -30,7 +30,7 @@ public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, Cou
      * @return
      */
     int openPlayStatus(@Param("scheduleId") long scheduleId,
-                       @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId,
+                       @Param("musicScoreAccompanimentId") String musicScoreAccompanimentId,
                        @Param("userId") Integer userId);
 
     /**
@@ -40,6 +40,6 @@ public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, Cou
      * @return
      */
     int openAccompanimentPlayStatus(@Param("scheduleId") long scheduleId,
-                                    @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId,
+                                    @Param("musicScoreAccompanimentId") String musicScoreAccompanimentId,
                                     @Param("userId") Integer userId);
 }

mec-biz/src/main/resources/config/mybatis/courseScheduleStudentMusicScoreMapper.xml

@@ -71,7 +71,7 @@
     <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 != null">
+        <if test="musicScoreAccompanimentId != null and musicScoreAccompanimentId != ''">
             AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
         </if>
         <if test="userId != null">
@@ -122,7 +122,7 @@
             <if test="courseId != null">
                 AND cssm.course_schedule_id_ = #{courseId}
             </if>
-            <if test="musicScoreAccompanimentId != null">
+            <if test="musicScoreAccompanimentId != null and musicScoreAccompanimentId != ''">
                 AND cssm.music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
             </if>
             <if test="userType != null">

mec-im/src/main/java/com/ym/mec/im/message/DeviceStateChangedMessage.java

@@ -10,7 +10,7 @@ import lombok.Setter;
 public class DeviceStateChangedMessage extends BaseMessage {
     private @Setter @Getter boolean enable;
     private @Setter @Getter int type;
-    private @Setter @Getter Integer musicScoreAccompanimentId;
+    private @Setter @Getter String musicScoreAccompanimentId;
 
     private @Setter @Getter String userId;
     private @Setter @Getter String userName;

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

@@ -22,7 +22,7 @@ public class ReqDeviceControlData {
 	private String ticket;
 	private Integer status;
 	private Integer examSongId;
-	private Integer musicScoreAccompanimentId;
+	private String musicScoreAccompanimentId;
 	//伴奏音量
 	private Integer soundVolume = 100;
 	// 服务提供方
@@ -34,11 +34,11 @@ public class ReqDeviceControlData {
 	private String sendUserName;
 	private String avatar;
 
-	public Integer getMusicScoreAccompanimentId() {
+	public String getMusicScoreAccompanimentId() {
 		return musicScoreAccompanimentId;
 	}
 
-	public void setMusicScoreAccompanimentId(Integer musicScoreAccompanimentId) {
+	public void setMusicScoreAccompanimentId(String musicScoreAccompanimentId) {
 		this.musicScoreAccompanimentId = musicScoreAccompanimentId;
 	}
 

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

@@ -1727,7 +1727,7 @@ public class RoomServiceImpl implements RoomService {
                 .enable(enable)
                 .targetId(userId)
                 .targetName(Optional.ofNullable(data.getUserName()).orElse(authUser.getUsername()))
-                .songId(Optional.ofNullable(data.getMusicScoreAccompanimentId()).map(String::valueOf).orElse(null))
+                .songId(data.getMusicScoreAccompanimentId())
                 .songVolume(data.getSoundVolume())
                 .sendUserInfo(RTCRoomMessage.MessageUser.builder()
                         .sendUserId(data.getSendUserId())
@@ -1736,18 +1736,6 @@ public class RoomServiceImpl implements RoomService {
                         .build())
                 .build();
 
-        // 消息内容
-        /*RTCRoomMessage.MessageContent messageContent = RTCRoomMessage.MessageContent
-                .builder()
-                .type(typeEnum.ordinal())
-                .enable(enable)
-                .sendUserInfo(RTCRoomMessage.MessageUser.builder()
-                        .sendUserId(userId)
-                        .sendUserName(authUser.getUsername())
-                        .avatarUrl(authUser.getAvatar())
-                        .build())
-                .build();*/
-
         // 腾讯云消息推送
         RTCRoomMessage message = RTCRoomMessage.builder()
                 .objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE)