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

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

@@ -1,37 +1,34 @@
 package com.ym.mec.biz.service.impl;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.entity.SysMusicScore;
-import com.ym.mec.biz.service.SysMusicScoreService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
 import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreAccompaniment> implements SysMusicScoreAccompanimentService {
@@ -86,8 +83,6 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 		if (CollectionUtils.isEmpty(applications)) {
 			throw new BizException("获取曲目信息失败");
 		}
-		List<Subject> subjects = subjectDao.queryCbsList(null);
-		Map<Long, Subject> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getCbsSubjectId, Function.identity()));
 		Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> applicationMap = applications.stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
 		for (SysMusicScoreAccompaniment accompaniment : accompaniments) {
 			if(accompaniment.getCbsMusicSheetId() == null){
@@ -104,19 +99,10 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
-				if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
-					StringBuffer sb = new StringBuffer();
-					for (String s : musicSheetApplication.getSubjectIds().split(",")) {
-						Subject subject = subjectMap.get(Long.parseLong(s));
-						if(subject != null){
-							if (sb.length() > 0) {
-								sb.append(",");
-							}
-							sb.append(subject.getName());
-						}
-					}
-					record.setSubjectName(sb.toString());
-				}
+				record.setType(accompaniment.getType());
+				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? "1" : null);
+				record.setClientType(accompaniment.getClientType());
+				record.setExamSongId(accompaniment.getExamSongId());
 				record.setCbsMusicSheetId(musicSheetApplication.getId());
 				record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
 				record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
@@ -131,11 +117,15 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
 					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
 				}
-				record.setMp3Url(musicSheetApplication.getMusicSheetSoundList().get(i).getAudioFileUrl());
+				CbsMusicSheetWrapper.MusicSheetSound sound = musicSheetApplication.getMusicSheetSoundList().get(i);
+				record.setMp3Url(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.setIsShowFingering(musicSheetApplication.getIsShowFingering());
 				childAccompaniments.add(record);
 			}
 			result.addAll(childAccompaniments);