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

# Conflicts:
#	pom.xml

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

@@ -4,7 +4,6 @@ package com.ym.mec.biz.dal.dao;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApiWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendWrapper;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
-import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -137,6 +137,10 @@ public class SysMusicScore {
 
 	@ApiModelProperty("谱面类型")
 	private String scoreType;
+
+	@ApiModelProperty("是否节奏练习")
+	private Boolean isAllSubject;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -101,6 +101,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         query.setDetailFlag(true);
         query.setDelFlag(true);
         query.setPage(1);
+        query.setAudioPlayTypeFlag(false);
         query.setApplicationId(applicationId);
         return query;
     }
@@ -427,17 +428,10 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         if (musicSheet == null) {
             throw new BizException("曲目不存在");
         }
-        CbsMusicSheetWrapper.MusicSheetApplicationQuery query = new CbsMusicSheetWrapper.MusicSheetApplicationQuery();
-        query.setApplicationId(applicationId);
+        CbsMusicSheetWrapper.MusicSheetApplicationQuery query = this.getMusicSheetApplicationQuery();
         query.setMusicSheetIds(Collections.singletonList(Long.parseLong(musicSheet.getCbsMusicSheetId())));
-        query.setDelFlag(true);
-        query.setPage(1);
         query.setRows(1);
-        R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> pageInfoR = musicFeignClientService.musicSheetPageByApplication(query);
-        if (pageInfoR.getCode() != 200) {
-            throw new BizException("获取曲目信息异常,{}", pageInfoR.getMessage());
-        }
-        List<CbsMusicSheetWrapper.MusicSheetApplication> rows = pageInfoR.feignData().getRows();
+        List<CbsMusicSheetWrapper.MusicSheetApplication> rows = this.queryCbsMusicSheetApplication(query);
         if (CollectionUtils.isEmpty(rows)) {
             throw new BizException("获取曲目信息失败");
         }

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

@@ -201,7 +201,7 @@
 				AND sesc.parent_id_ = #{parentId}
 			</if>
 			<if test="subjectId != null">
-				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '')
+				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT' OR ses.is_all_subject_)
 			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}

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

@@ -195,7 +195,8 @@
 				speed_ = #{item.musicSheetUpdate.playSpeed},
 				enable_evaluation_ = #{item.musicSheetUpdate.canEvaluate},
 				play_mode_ = #{item.musicSheetUpdate.playMode},
-				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType}
+				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType},
+				is_all_subject_ = #{item.musicSheetUpdate.isAllSubject}
 			</if>
 			where cbs_music_sheet_id_ = #{item.musicSheetId}
 		</foreach>
@@ -216,7 +217,8 @@
 		speed_ = #{param.playSpeed},
 		enable_evaluation_ = #{param.canEvaluate},
 		play_mode_ = #{param.playMode},
-		music_sheet_type_ = #{param.musicSheetType}
+		music_sheet_type_ = #{param.musicSheetType},
+		is_all_subject_ = #{param.isAllSubject}
 		where cbs_music_sheet_id_ = #{param.id}
 	</update>
 
@@ -224,7 +226,7 @@
 		insert into sys_music_score
 		(music_score_categories_id_,client_type_,type_,rank_ids_,order_
 		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_,music_sheet_type_,
-		score_type_,is_convertible_score_)
+		score_type_,is_convertible_score_,is_all_subject_)
 		values
 		<foreach collection="vos" item="item" separator=",">
 			(#{item.musicSheetCategoryId},
@@ -237,7 +239,7 @@
 			#{item.musicSheetUpdate.canEvaluate},
 			#{item.musicSheetUpdate.playMode},0,
 			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType},
-			#{item.scoreType},#{item.isConvertibleScore}
+			#{item.scoreType},#{item.isConvertibleScore},#{item.musicSheetUpdate.isAllSubject}
 			)
 		</foreach>
 	</insert>
@@ -271,10 +273,10 @@
 				AND ses.score_type_ = #{scoreType}
 			</if>
 			<if test="subjectId != null">
-				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT')
+				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT' OR ses.is_all_subject_)
 			</if>
 			<if test="subjectIds != null and subjectIds != ''">
-				AND (FIND_IN_SET(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT')
+				AND (FIND_IN_SET(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT' OR ses.is_all_subject_)
 			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}

pom.xml

@@ -26,7 +26,7 @@
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.7</com.microsvc.toolkit.version>
-        <cbs.version>1.0.12</cbs.version>
+		<cbs.version>1.0.13</cbs.version>
 	</properties>
 
 	<dependencyManagement>