管乐迷曲目来源内容平台

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

@@ -424,7 +424,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheet.setMusicCover("https://oss.dayaedu.com/gyt/07/1690789356356.png");
         addMusicSheet.setAppAuditFlag(false);
         addMusicSheet.setRemark(from.getMuseScoreMemo());
-        addMusicSheet.setIsUseSystemBeat(true);
+        addMusicSheet.setIsPlayBeat(true);
         if(categoryIds.contains(from.getMusicScoreCategoriesId().toString())){
             addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
         }else {
@@ -460,14 +460,24 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                         musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMp3Url());
                     }
                     musicSheetSound.setTrack(sheetAccompaniment.getTrack());
+                    if (sheetAccompaniment.getSubjectId() != null) {
+                        Subject subject = subjectService.get(sheetAccompaniment.getSubjectId());
+                        if (Objects.nonNull(subject)) {
+                            //获取关联的乐器
+                            Instrument one = instrumentService.lambdaQuery().eq(Instrument::getSubjectId, subject.getId()).one();
+                            if (Objects.nonNull(one)) {
+                                musicSheetSound.setMusicalInstrumentId(one.getId().toString());
+                            }
+                        }
+                    }
                     musicSheetSound.setSortNumber(i++);
                     if (StringUtils.isNotBlank(musicSheetSound.getAudioFileUrl())) {
                         //xml
                         addMusicSheet.setXmlFileUrl(sheetAccompaniment.getXmlUrl());
                         //是否显示指法
                         addMusicSheet.setIsShowFingering(sheetAccompaniment.getIsShowFingering());
-                        //是否播放节拍器
-                        addMusicSheet.setIsPlayBeat(sheetAccompaniment.getIsOpenMetronome());
+                        //是否使用系统节拍器
+                        addMusicSheet.setIsUseSystemBeat(sheetAccompaniment.getIsOpenMetronome());
                         musicSheetSounds.add(musicSheetSound);
                     }
                 }
@@ -487,9 +497,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheetApplicationExtend.setApplicationId(applicationId);
         addMusicSheetApplicationExtend.setStatus(addMusicSheet.getStatus());
         addMusicSheetApplicationExtend.setSortNo(from.getOrder());
-        addMusicSheetApplicationExtend.setPaymentType(StringUtils.isNotEmpty(from.getRankIds()) ? "PAY" : "FREE");
+        addMusicSheetApplicationExtend.setPaymentType(StringUtils.isNotEmpty(from.getRankIds()) ? "VIP" : "FREE");
         addMusicSheetApplicationExtend.setAvailableType(EMusicAvailableType.ORG);
         addMusicSheetApplicationExtend.setMusicSheetCategoryId(from.getMusicScoreCategoriesId().longValue());
+        addMusicSheet.setMusicCategoryId(from.getMusicScoreCategoriesId().longValue());
         addMusicSheet.setAddMusicSheetApplicationExtend(Lists.newArrayList(addMusicSheetApplicationExtend));
         addMusicSheet.setIsConvertibleScore(true);
         return addMusicSheet;

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

@@ -177,7 +177,7 @@
 		</if>
 	</select>
 	<select id="selectSyncPage" resultMap="SysMusicScore">
-		select * from sys_music_score where cbs_music_sheet_id_ iS NOT NULL and del_flag_ = 0 AND client_type_ = 'SMART_PRACTICE'
+		select * from sys_music_score where cbs_music_sheet_id_ iS NOT NULL and del_flag_ = 0 AND client_type_ = 'SMART_PRACTICE' AND id_ = 12879
 	</select>
 
 	<update id="updateBatchByCbsId">