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

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

@@ -109,22 +109,25 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				if(musicSheetApplication.getMusicSheetCategoryId() != null){
 					record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 				}
+				record.setParentCategoriesId(accompaniment.getParentCategoriesId());
 				record.setExamSongName(musicSheetApplication.getName());
 				record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
 				record.setSpeed(musicSheetApplication.getPlaySpeed());
-				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
-				if (CollectionUtils.isNotEmpty(accompanimentList)) {
-					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-				}
 				CbsMusicSheetWrapper.MusicSheetSound sound = musicSheetApplication.getMusicSheetSoundList().get(i);
-				record.setMp3Url(sound.getAudioFileUrl());
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setSubjectName(sound.getTrack());
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
 				record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
 				record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
-				record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
+				record.setIsOpenMetronome(!musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
+				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
+				if (CollectionUtils.isNotEmpty(accompanimentList)) {
+					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
+					record.setUrl(accompanimentList.get(0).getAudioFileUrl());
+				}
+				record.setMetronomeMp3Url(sound.getAudioFileUrl());
+				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
 				childAccompaniments.add(record);
 			}

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

@@ -191,6 +191,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             record.setCategoriesName(categoriesMap.get(musicSheetApplication.getMusicSheetCategoryId().intValue()));
         }
         record.setSpeed(musicSheetApplication.getPlaySpeed());
+        record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
@@ -205,19 +206,22 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
         record.setOrder(musicSheetApplication.getSortNo());
         record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
-        record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
         if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
             record.setSubjectName("");
         }else {
             if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
-                if(record.getSubjectId() != null){
-                    Instrument instrument = instrumentMap.get(record.getSubjectId());
-                    if(instrument != null){
-                        CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto musicalInstrumentQueryDto = musicalInstrumentQueryMap.get(instrument.getId());
-                        if(Objects.nonNull(musicalInstrumentQueryDto)) {
-                            record.setSubjectName(musicalInstrumentQueryDto.getName());
+                if(StringUtils.isNotEmpty(record.getSubjectIds())){
+                    Set<String> subjectNames = new HashSet<>();
+                    for (String subjectId : record.getSubjectIds().split(",")) {
+                        Instrument instrument = instrumentMap.get(Integer.parseInt(subjectId));
+                        if(instrument != null){
+                            CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto musicalInstrumentQueryDto = musicalInstrumentQueryMap.get(instrument.getId());
+                            if(Objects.nonNull(musicalInstrumentQueryDto)) {
+                                subjectNames.add(musicalInstrumentQueryDto.getName());
+                            }
                         }
                     }
+                    record.setSubjectName(String.join(",",subjectNames));
                 }
             }
         }
@@ -446,19 +450,15 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         String tracks = "";
         // 伴奏，原音 扩展信息
         if (addMusicSheet.getPlayMode() == EMusicPlayMode.MP3) {
-            CbsMusicSheetWrapper.MusicSheetAccompaniment musicSheetAccompaniment = new CbsMusicSheetWrapper.MusicSheetAccompaniment();
-            if (StringUtils.isNotBlank(musicSheetAccompaniment.getAudioFileUrl())) {
-                addMusicSheet.setMusicSheetAccompanimentList(Lists.newArrayList(musicSheetAccompaniment));
-            }
             if (CollectionUtils.isNotEmpty(accList)) {
                 List<CbsMusicSheetWrapper.MusicSheetSound> musicSheetSounds = new ArrayList<>();
                 int i = 0;
                 for (SysMusicScoreAccompaniment sheetAccompaniment : accList) {
                     CbsMusicSheetWrapper.MusicSheetSound musicSheetSound = new CbsMusicSheetWrapper.MusicSheetSound();
-                    if (StringUtils.isNotBlank(sheetAccompaniment.getMetronomeMp3Url())){
-                        musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMetronomeMp3Url());
-                    } else {
+                    if (sheetAccompaniment.getIsOpenMetronome()){
                         musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMp3Url());
+                    } else {
+                        musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMetronomeMp3Url());
                     }
                     musicSheetSound.setTrack(sheetAccompaniment.getTrack());
                     if (sheetAccompaniment.getSubjectId() != null) {
@@ -485,6 +485,15 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                 tracks = musicSheetSounds.stream().map(CbsMusicSheetWrapper.MusicSheetSound::getTrack).collect(Collectors.joining(","));
                 addMusicSheet.setMusicSheetSoundList(musicSheetSounds);
             }
+            CbsMusicSheetWrapper.MusicSheetAccompaniment musicSheetAccompaniment = new CbsMusicSheetWrapper.MusicSheetAccompaniment();
+            if (addMusicSheet.getIsUseSystemBeat() != null && addMusicSheet.getIsUseSystemBeat()) {
+                musicSheetAccompaniment.setAudioFileUrl(from.getUrl());
+            }else {
+                musicSheetAccompaniment.setAudioFileUrl(from.getMetronomeUrl());
+            }
+            if (StringUtils.isNotBlank(musicSheetAccompaniment.getAudioFileUrl())) {
+                addMusicSheet.setMusicSheetAccompanimentList(Lists.newArrayList(musicSheetAccompaniment));
+            }
         }
         addMusicSheet.setMultiTracksSelection(tracks);
 

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

@@ -183,13 +183,12 @@
 		</where>
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
 		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_,
 		ses.ext_style_config_json_,ses.rank_ids_,ses.cbs_music_sheet_id_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
-		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
 		ORDER BY ses.order_,ses.name_
 	</select>
@@ -202,18 +201,17 @@
 		<include refid="queryPageSql"/>
 	</select>
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
-		SELECT s.* FROM sys_music_score_accompaniment sesa
-		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
-		LEFT JOIN sys_music_score sms ON sms.id_ = sesa.exam_song_id_
+		SELECT s.* FROM sys_music_score sms
+		LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,sms.subject_ids_)
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = sms.music_score_categories_id_
-		WHERE sesa.del_flag_ = 0 AND sesa.subject_id_ IS NOT NULL
+		WHERE sms.del_flag_ = 0 AND s.id_ IS NOT NULL
 		<if test="categoriesIdList != null and categoriesIdList.size > 0">
 			AND sesc.id_ IN
 			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
 				#{item}
 			</foreach>
 		</if>
-		GROUP BY sesa.subject_id_
+		GROUP BY s.id_
 	</select>
     <select id="findByMusicScoreId" resultMap="SysMusicScoreAccompaniment">
 		SELECT * FROM sys_music_score_accompaniment WHERE exam_song_id_ = #{recordId} AND del_flag_ = 0
@@ -232,7 +230,7 @@
 				AND INTE_ARRAY(#{organId},sesc.organ_id_)
 			</if> -->
 			<if test="search != null and search != ''">
-				AND (sesa.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
+				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="sysMusicScoreId != null">
 				AND sesa.exam_song_id_ = #{sysMusicScoreId}
@@ -256,10 +254,7 @@
 				AND sesc.parent_id_ = #{parentId}
 			</if>
 			<if test="subjectId != null">
-				AND (sesa.subject_id_ = #{subjectId} OR sesa.subject_id_ IS NULL)
-			</if>
-			<if test="isShowFingering != null">
-				AND sesa.is_show_fingering_ = #{isShowFingering}
+				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '')
 			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}

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

@@ -165,7 +165,8 @@
 	</select>
 	<select id="findByParentId" resultMap="SysMusicScoreCategories">
 		SELECT sm.*,
-		(select count(1) from sys_music_score sms where sms.del_flag_ = 0 and sm.id_ = sms.music_score_categories_id_) as music_score_num_sum_
+		(select count(1) from sys_music_score sms where sms.del_flag_ = 0 AND sms.client_type_ = 'SMART_PRACTICE'
+		and sms.cbs_music_sheet_id_ IS NOT NULL and sm.id_ = sms.music_score_categories_id_) as music_score_num_sum_
         FROM sys_music_score_categories sm
 		<include refid="queryTree"/>
  		ORDER BY sm.order_

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' AND update_time_ > NOW()
+		select * from sys_music_score where cbs_music_sheet_id_ iS NOT NULL and del_flag_ = 0 AND client_type_ = 'SMART_PRACTICE'
 	</select>
 
 	<update id="updateBatchByCbsId">