فهرست منبع

网络教室伴奏

zouxuan 4 سال پیش
والد
کامیت
b72b46388f

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

@@ -28,18 +28,16 @@ public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, Cou
     /**
      * 开启原音播放
      * @param scheduleId
-     * @param userId
      * @param musicScoreAccompanimentId
      * @return
      */
-    int openPlayStatus(@Param("scheduleId") long scheduleId, @Param("userId") int userId, @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
+    int openPlayStatus(@Param("scheduleId") long scheduleId,@Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
 
     /**
      * 开启伴奏播放
      * @param scheduleId
-     * @param userId
      * @param musicScoreAccompanimentId
      * @return
      */
-    int openAccompanimentPlayStatus(@Param("scheduleId") long scheduleId, @Param("userId") int userId, @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
+    int openAccompanimentPlayStatus(@Param("scheduleId") long scheduleId, @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
 }

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

@@ -91,11 +91,12 @@
     </update>
     <update id="openPlayStatus">
         UPDATE course_schedule_student_music_score SET play_status_ = 1,update_time_ = NOW()
-        WHERE course_schedule_id_ = #{scheduleId} AND user_id_ = #{userId} AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
+        WHERE course_schedule_id_ = #{scheduleId}
+        AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
     </update>
     <update id="openAccompanimentPlayStatus">
         UPDATE course_schedule_student_music_score SET accompaniment_play_status_ = 1,update_time_ = NOW()
-        WHERE course_schedule_id_ = #{scheduleId} AND user_id_ = #{userId} AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
+        WHERE course_schedule_id_ = #{scheduleId} AND music_score_accompaniment_id_ = #{musicScoreAccompanimentId}
     </update>
 
     <!-- 根据主键删除一条记录 -->

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

@@ -856,7 +856,7 @@ public class RoomServiceImpl implements RoomService {
                 //关闭所有曲目播放
                 courseScheduleStudentMusicScoreDao.closePlayStatus(scheduleId,Integer.parseInt(userId),null);
                 //原音
-                courseScheduleStudentMusicScoreDao.openPlayStatus(scheduleId,authUser.getId(),data.getMusicScoreAccompanimentId());
+                courseScheduleStudentMusicScoreDao.openPlayStatus(scheduleId,data.getMusicScoreAccompanimentId());
                 DeviceStateChangedMessage deviceResourceMessage = new DeviceStateChangedMessage(typeEnum.ordinal(), enable);
                 deviceResourceMessage.setMusicScoreAccompanimentId(data.getMusicScoreAccompanimentId());
                 deviceResourceMessage.setUserId(userId);
@@ -865,7 +865,7 @@ public class RoomServiceImpl implements RoomService {
                 long scheduleId = Long.parseLong(roomId.substring(1));
                 //关闭所有曲目播放
                 courseScheduleStudentMusicScoreDao.closePlayStatus(scheduleId,Integer.parseInt(userId),null);
-                courseScheduleStudentMusicScoreDao.openAccompanimentPlayStatus(scheduleId,authUser.getId(),data.getMusicScoreAccompanimentId());
+                courseScheduleStudentMusicScoreDao.openAccompanimentPlayStatus(scheduleId,data.getMusicScoreAccompanimentId());
                 DeviceStateChangedMessage deviceResourceMessage = new DeviceStateChangedMessage(typeEnum.ordinal(), enable);
                 deviceResourceMessage.setMusicScoreAccompanimentId(data.getMusicScoreAccompanimentId());
                 deviceResourceMessage.setUserId(userId);
@@ -988,15 +988,7 @@ public class RoomServiceImpl implements RoomService {
                 msg.setEnable(true);
             }
             courseScheduleStudentPaymentDao.adjustExamSong(scheduleId,authUser.getId(),JSON.toJSONString(msg));
-        }else if (taskInfo.getTypeEnum().equals(DeviceTypeEnum.MusicScore)) {
-            long scheduleId = Long.parseLong(roomId.substring(1));
-            courseScheduleStudentMusicScoreDao.closePlayStatus(scheduleId,authUser.getId(),null);
-            courseScheduleStudentMusicScoreDao.openPlayStatus(scheduleId,authUser.getId(), data.getMusicScoreAccompanimentId());
-        }else if (taskInfo.getTypeEnum().equals(DeviceTypeEnum.MusicScoreAccompaniment)) {
-            long scheduleId = Long.parseLong(roomId.substring(1));
-            courseScheduleStudentMusicScoreDao.closePlayStatus(scheduleId,authUser.getId(),null);
-            courseScheduleStudentMusicScoreDao.openAccompanimentPlayStatus(scheduleId,authUser.getId(), data.getMusicScoreAccompanimentId());
-        } else {
+        }else {
             roomMemberDao.updateMicByRidAndUid(roomId, userId, taskInfo.isOnOff());
         }
         ControlDeviceNotifyMessage msg = new ControlDeviceNotifyMessage(ActionEnum.Approve.ordinal());
@@ -1049,15 +1041,7 @@ public class RoomServiceImpl implements RoomService {
         }  else if (data.getExamSongOn() != null) {
             type = DeviceTypeEnum.ExamSong;
             enable = data.getExamSongOn();
-            //原音
-        }  else if (data.getMusicScoreOn() != null) {
-            type = DeviceTypeEnum.MusicScore;
-            enable = data.getMusicScoreOn();
-            //伴奏
-        }  else if (data.getAccompanimentOn() != null) {
-            type = DeviceTypeEnum.MusicScoreAccompaniment;
-            enable = data.getAccompanimentOn();
-        } else {
+        }else {
             throw new ApiException(ErrorEnum.ERR_REQUEST_PARA_ERR);
         }
         SysUser authUser = sysUserFeignService.queryUserInfo();
@@ -1081,18 +1065,6 @@ public class RoomServiceImpl implements RoomService {
                 msg.setEnable(enable);
             }
             courseScheduleStudentPaymentDao.adjustExamSong(scheduleId,authUser.getId(),JSON.toJSONString(msg));
-        } else if (type.equals(DeviceTypeEnum.MusicScore)){
-            long scheduleId = Long.parseLong(roomId.substring(1));
-            courseScheduleStudentMusicScoreDao.closePlayStatus(scheduleId,authUser.getId(),null);
-            if(enable){
-                courseScheduleStudentMusicScoreDao.openPlayStatus(scheduleId,authUser.getId(),data.getMusicScoreAccompanimentId());
-            }
-        } else if (type.equals(DeviceTypeEnum.MusicScoreAccompaniment)){
-            long scheduleId = Long.parseLong(roomId.substring(1));
-            courseScheduleStudentMusicScoreDao.closePlayStatus(scheduleId,authUser.getId(),null);
-            if(enable){
-                courseScheduleStudentMusicScoreDao.openAccompanimentPlayStatus(scheduleId,authUser.getId(),data.getMusicScoreAccompanimentId());
-            }
         }else {
             roomMemberDao.updateMusicByRidAndUid(roomId, userId, enable);
         }