zouxuan 2 jaren geleden
bovenliggende
commit
8b4bbdc12c

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ImNetworkDeviceControlDto.java

@@ -29,7 +29,7 @@ public class ImNetworkDeviceControlDto {
 	private Integer musicSheetId;
 
 	@ApiModelProperty(value = "伴奏",required = true)
-	private Integer accompanimentId;
+	private Integer musicScoreAccompanimentId;
 
 	@ApiModelProperty(value = "伴奏音量",required = true)
 	private Integer soundVolume = 100;

+ 2 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -455,7 +455,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             long scheduleId = Long.parseLong(roomId);
             switch (deviceControl.getDeviceType()) {
                 case MUSIC_SHEET:
-                    Integer musicSheetId = Optional.ofNullable(deviceControl.getAccompanimentId()).
+                    Integer musicSheetId = Optional.ofNullable(deviceControl.getMusicScoreAccompanimentId()).
                             orElseThrow(()-> new BizException("请选择曲目"));
                     //关闭所有曲目播放
                     courseScheduleStudentMusicSheetService.getDao().closePlayStatus(scheduleId,userId);
@@ -463,7 +463,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                     courseScheduleStudentMusicSheetService.getDao().openPlayStatus(scheduleId,musicSheetId,userId);
                     break;
                 case ACCOMPANIMENT:
-                  Integer musicSheetAccompanimentId = Optional.ofNullable(deviceControl.getAccompanimentId()).
+                  Integer musicSheetAccompanimentId = Optional.ofNullable(deviceControl.getMusicScoreAccompanimentId()).
                             orElseThrow(()-> new BizException("请选择曲目"));
                     //关闭所有曲目播放
                     courseScheduleStudentMusicSheetService.getDao().closePlayStatus(scheduleId,userId);

+ 2 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImServiceImpl.java

@@ -215,7 +215,7 @@ public class ImServiceImpl implements ImService {
                 .enable(deviceControl.getEnable())
                 .targetId(deviceControl.getUserId())
                 .targetName(teacher.getRealName())
-                .songId(Optional.ofNullable(deviceControl.getAccompanimentId()).map(String::valueOf).orElse(null))
+                .songId(Optional.ofNullable(deviceControl.getMusicScoreAccompanimentId()).map(String::valueOf).orElse(null))
                 .songVolume(deviceControl.getSoundVolume())
                 .sendUserInfo(RTCRoomMessage.MessageUser.builder()
                         .sendUserId(teacher.getImUserId())
@@ -257,7 +257,7 @@ public class ImServiceImpl implements ImService {
                     break;
                 case MUSIC_SHEET:
                 case ACCOMPANIMENT:
-                    deviceResourceMessage.setMusicSheetAccompanimentId(deviceControl.getAccompanimentId());
+                    deviceResourceMessage.setMusicSheetAccompanimentId(deviceControl.getMusicScoreAccompanimentId());
                     deviceResourceMessage.setUserId(deviceControl.getUserId());
                     deviceResourceMessage.setSoundVolume(deviceControl.getSoundVolume());
                     if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {