Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0906

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetApplicationExtendController.java

@@ -9,7 +9,6 @@ import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendCli
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetCategoryWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
-import com.dayaedu.cbs.openfeign.wrapper.musicInstrument.CbsMusicalInstrumentWrapper;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.template.R;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
@@ -20,7 +19,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +27,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -62,15 +63,6 @@ public class MusicSheetApplicationExtendController {
             if (CollectionUtils.isEmpty(rows)) {
                 return R.from(PageUtil.pageInfo(info, new ArrayList<>()));
             }
-            /*String instrumentIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getMusicalInstrumentIds).filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
-            //获取乐器名称
-            Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = new HashMap<>();
-            if(StringUtils.isNotEmpty(instrumentIds)){
-                List<CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryDtos =
-                        sysMusicScoreService.queryMusicalInstrument(Arrays.stream(instrumentIds.split(",")).map(Integer::parseInt).distinct().collect(Collectors.toList()));
-                musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream()
-                        .collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
-            }*/
             List<Long> cbsMusicIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getId).collect(Collectors.toList());
             List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds,false);
             Map<String, SysMusicScore> map = musicSheetList.stream().collect(Collectors.toMap(SysMusicScore::getCbsMusicSheetId, o -> o, (o1, o2) -> o1));
@@ -83,20 +75,6 @@ public class MusicSheetApplicationExtendController {
                 if (Objects.nonNull(musicSheet)) {
                     musicSheetApplication.setBizId(musicSheet.getId().toString());
                 }
-                /*if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
-                    String[] split = musicSheetApplication.getMusicalInstrumentIds().split(",");
-                    for (String s : split) {
-                        StringBuffer sb = new StringBuffer();
-                        CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto musicalInstrumentQueryDto = musicalInstrumentQueryMap.get(Integer.parseInt(s));
-                        if(Objects.nonNull(musicalInstrumentQueryDto)){
-                            if(sb.length() > 0){
-                                sb.append(",");
-                            }
-                            sb.append(musicalInstrumentQueryDto.getName());
-                        }
-                        musicSheetApplication.setSubjectNames(sb.toString());
-                    }
-                }*/
                 musicSheetApplications.add(musicSheetApplication);
             }
             return R.from(PageUtil.pageInfo(info, musicSheetApplications));

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

@@ -148,6 +148,36 @@ public class SysMusicScore {
 	@ApiModelProperty("是否节奏练习")
 	private Boolean isAllSubject;
 
+	@ApiModelProperty("是否支持混音节拍器")
+	private Boolean isMixBeat;
+
+	@ApiModelProperty("总谱五线谱PDF文件")
+	private String musicPdfUrl;
+
+	@ApiModelProperty("总谱首调PDF文件")
+	private String firstPdfUrl;
+
+	@ApiModelProperty("总谱固定调PDF文件")
+	private String jianPdfUrl;
+
+	@ApiModelProperty("原音五线谱PDF文件")
+	private String soundMusicPdfUrl;
+
+	@ApiModelProperty("原音首调PDF文件")
+	private String soundFirstPdfUrl;
+
+	@ApiModelProperty("原音固定调PDF文件")
+	private String soundJianPdfUrl;
+
+	@ApiModelProperty("伴奏五线谱PDF文件")
+	private String accMusicPdfUrl;
+
+	@ApiModelProperty("伴奏首调PDF文件")
+	private String accFirstPdfUrl;
+
+	@ApiModelProperty("伴奏固定调PDF文件")
+	private String accJianPdfUrl;
+
 	private List<SysMusicScoreAccompaniment> background;
 
 	@Override

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

@@ -113,6 +113,36 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("演奏是否默认展示总谱渲染")
 	private Boolean defaultScoreRender;
 
+	@ApiModelProperty("是否支持混音节拍器")
+	private Boolean isMixBeat;
+
+	@ApiModelProperty("总谱五线谱PDF文件")
+	private String musicPdfUrl;
+
+	@ApiModelProperty("总谱首调PDF文件")
+	private String firstPdfUrl;
+
+	@ApiModelProperty("总谱固定调PDF文件")
+	private String jianPdfUrl;
+
+	@ApiModelProperty("原音五线谱PDF文件")
+	private String soundMusicPdfUrl;
+
+	@ApiModelProperty("原音首调PDF文件")
+	private String soundFirstPdfUrl;
+
+	@ApiModelProperty("原音固定调PDF文件")
+	private String soundJianPdfUrl;
+
+	@ApiModelProperty("伴奏五线谱PDF文件")
+	private String accMusicPdfUrl;
+
+	@ApiModelProperty("伴奏首调PDF文件")
+	private String accFirstPdfUrl;
+
+	@ApiModelProperty("伴奏固定调PDF文件")
+	private String accJianPdfUrl;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicSheetWrapper.java

@@ -353,7 +353,6 @@ public class MusicSheetWrapper {
         @ApiModelProperty("曲目缓存")
         private String musicSvg;
 
-
         @ApiModelProperty("评测标准 节奏 AMPLITUDE 音准 FREQUENCY 分贝 DECIBELS")
         private EEvaluationStandard evaluationStandard;
 
@@ -420,6 +419,17 @@ public class MusicSheetWrapper {
         @ApiModelProperty("评测频率,详情返回，指定应用端")
         private String evaluationFrequency;
 
+        @ApiModelProperty("是否支持混音节拍器")
+        private Boolean isMixBeat;
+
+        @ApiModelProperty("总谱五线谱PDF文件")
+        private String musicPdfUrl;
+
+        @ApiModelProperty("总谱首调PDF文件")
+        private String firstPdfUrl;
+
+        @ApiModelProperty("总谱固定调PDF文件")
+        private String jianPdfUrl;
 
         @ApiModelProperty("曲目伴奏")
         private List<CbsMusicSheetWrapper.MusicSheetAccompaniment> musicSheetAccompanimentList;

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

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ClassGroupStudentInfoDto;
-import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.wrapper.StudentWrapper;
@@ -12,12 +11,11 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.http.HttpUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -211,19 +209,41 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         List<Integer> studentIds = studentDtos.stream().map(StudentWrapper.ClassStudentDto::getUserId).collect(Collectors.toList());
         List<StudentWrapper.ClassStudentDto> studentCourseDetails =
                 musicGroupPaymentStudentCourseDetailDao.findStudentCourseDetail(musicGroupId, studentIds,query);
-        if (CollectionUtils.isEmpty(studentCourseDetails)){
-            return new ArrayList<>();
-        }
-        Map<Integer,StudentWrapper.ClassStudentDto> studentDtoMap = studentDtos.stream()
-                .collect(Collectors.toMap(StudentWrapper.ClassStudentDto::getUserId, s -> s, (s1, s2) -> s1));
-        for (StudentWrapper.ClassStudentDto studentCourseDetail : studentCourseDetails) {
-            StudentWrapper.ClassStudentDto classStudentDto = studentDtoMap.get(studentCourseDetail.getUserId());
-            studentCourseDetail.setName(classStudentDto.getName());
-            studentCourseDetail.setGender(classStudentDto.getGender());
-            studentCourseDetail.setSubjectName(classStudentDto.getSubjectName());
-            studentCourseDetail.setParentsPhone(classStudentDto.getParentsPhone());
-        }
-        return studentCourseDetails;
+        if(StringUtils.isNotEmpty(query.getCourseType()) || StringUtils.isNotEmpty(query.getSortType()) || StringUtils.isNotEmpty(query.getSortField())){
+            if (CollectionUtils.isEmpty(studentCourseDetails)){
+                return new ArrayList<>();
+            }
+            Map<Integer,StudentWrapper.ClassStudentDto> studentDtoMap = studentDtos.stream()
+                    .collect(Collectors.toMap(StudentWrapper.ClassStudentDto::getUserId, s -> s, (s1, s2) -> s1));
+            for (StudentWrapper.ClassStudentDto studentCourseDetail : studentCourseDetails) {
+                StudentWrapper.ClassStudentDto classStudentDto = studentDtoMap.get(studentCourseDetail.getUserId());
+                studentCourseDetail.setName(classStudentDto.getName());
+                studentCourseDetail.setGender(classStudentDto.getGender());
+                studentCourseDetail.setSubjectName(classStudentDto.getSubjectName());
+                studentCourseDetail.setParentsPhone(classStudentDto.getParentsPhone());
+            }
+            return studentCourseDetails;
+        }else {
+            if (CollectionUtils.isEmpty(studentCourseDetails)){
+                return studentDtos;
+            }
+            Map<Integer,StudentWrapper.ClassStudentDto> studentDtoMap = studentCourseDetails.stream()
+                    .collect(Collectors.toMap(StudentWrapper.ClassStudentDto::getUserId, s -> s, (s1, s2) -> s1));
+            for (StudentWrapper.ClassStudentDto studentDto : studentDtos) {
+                StudentWrapper.ClassStudentDto studentCourseDetail = studentDtoMap.get(studentDto.getUserId());
+                if (studentCourseDetail != null){
+                    studentDto.setClassroom(studentCourseDetail.getClassroom());
+                    studentDto.setComprehensive(studentCourseDetail.getComprehensive());
+                    studentDto.setHigh(studentCourseDetail.getHigh());
+                    studentDto.setHighOnline(studentCourseDetail.getHighOnline());
+                    studentDto.setMix(studentCourseDetail.getMix());
+                    studentDto.setSingle(studentCourseDetail.getSingle());
+                    studentDto.setTrainingMix(studentCourseDetail.getTrainingMix());
+                    studentDto.setTrainingSingle(studentCourseDetail.getTrainingSingle());
+                }
+            }
+            return studentDtos;
+        }
     }
 
     @Override

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

@@ -46,7 +46,28 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 	public List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
-		return this.initAccompaniment(sysMusicScoreAccompanimentDao.queryPage(params));
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = sysMusicScoreAccompanimentDao.queryPage(params);
+		Map<Integer, SysMusicScoreCategories> categoriesMap = new HashMap<>();
+		if(CollectionUtils.isNotEmpty(sysMusicScoreAccompaniments)){
+			List<Integer> categoryIds = sysMusicScoreAccompaniments.stream()
+					.map(SysMusicScoreAccompaniment::getCategoriesId).distinct().collect(Collectors.toList());
+			List<SysMusicScoreCategories> categories = cbsMusicScoreCategoriesService.queryByIds(categoryIds.stream()
+					.map(String::valueOf).collect(Collectors.joining(",")));
+			categoriesMap = categories.stream().collect(Collectors.toMap(SysMusicScoreCategories::getId, Function.identity()));
+		}
+		for (SysMusicScoreAccompaniment sysMusicScoreAccompaniment : sysMusicScoreAccompaniments) {
+			SysMusicScoreCategories categories = categoriesMap.get(sysMusicScoreAccompaniment.getCategoriesId());
+			if(categories != null){
+				sysMusicScoreAccompaniment.setCategoriesName(categories.getName());
+				sysMusicScoreAccompaniment.setParentCategoriesId(categories.getParentId());
+			}
+			if (sysMusicScoreAccompaniment.getIsOpenMetronome() ==null || sysMusicScoreAccompaniment.getIsOpenMetronome()) {
+				if (StringUtils.isNotBlank(sysMusicScoreAccompaniment.getUrl())) {
+					sysMusicScoreAccompaniment.setMetronomeUrl(sysMusicScoreAccompaniment.getUrl());
+				}
+			}
+		}
+		return this.initAccompaniment(sysMusicScoreAccompaniments);
 	}
 
 
@@ -80,6 +101,10 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
+				record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
+				record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
 				record.setId(accompaniment.getExamSongId().toString());
 				record.setExamSongId(accompaniment.getExamSongId());
 				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
@@ -88,9 +113,16 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
+				record.setSoundMusicPdfUrl(sound.getMusicPdfUrl());
+				record.setSoundFirstPdfUrl(sound.getFirstPdfUrl());
+				record.setSoundJianPdfUrl(sound.getJianPdfUrl());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
-					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
+					CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment1 = accompanimentList.get(0);
+					record.setMetronomeUrl(accompaniment1.getAudioFileUrl());
+					record.setAccMusicPdfUrl(accompaniment1.getMusicPdfUrl());
+					record.setAccFirstPdfUrl(accompaniment1.getFirstPdfUrl());
+					record.setAccJianPdfUrl(accompaniment1.getJianPdfUrl());
 				}
 				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
@@ -132,10 +164,15 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
+				record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
+				record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
 				record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
 				if(musicSheetApplication.getScoreType() != null){
 					record.setScoreType(musicSheetApplication.getScoreType().getCode());
 				}
+
 				record.setId(accompaniment.getExamSongId().toString());
 				record.setType(accompaniment.getType());
 				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
@@ -155,6 +192,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
 				record.setSpeed(musicSheetApplication.getPlaySpeed());
 				CbsMusicSheetWrapper.MusicSheetSound sound = musicSheetApplication.getMusicSheetSoundList().get(i);
+				record.setSoundMusicPdfUrl(sound.getMusicPdfUrl());
+				record.setSoundFirstPdfUrl(sound.getFirstPdfUrl());
+				record.setSoundJianPdfUrl(sound.getJianPdfUrl());
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setSubjectName(sound.getTrack());
@@ -164,8 +204,12 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
-					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-					record.setUrl(accompanimentList.get(0).getAudioFileUrl());
+					CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment1 = accompanimentList.get(0);
+					record.setMetronomeUrl(accompaniment1.getAudioFileUrl());
+					record.setUrl(accompaniment1.getAudioFileUrl());
+					record.setAccMusicPdfUrl(accompaniment1.getMusicPdfUrl());
+					record.setAccFirstPdfUrl(accompaniment1.getFirstPdfUrl());
+					record.setAccJianPdfUrl(accompaniment1.getJianPdfUrl());
 				}
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setMp3Url(sound.getAudioFileUrl());

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

@@ -214,15 +214,27 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
         record.setSpeed(musicSheetApplication.getPlaySpeed());
         record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
+        record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
+        record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+        record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+        record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
-            record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-            record.setUrl(accompanimentList.get(0).getAudioFileUrl());
+            CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment = accompanimentList.get(0);
+            record.setMetronomeUrl(accompaniment.getAudioFileUrl());
+            record.setUrl(accompaniment.getAudioFileUrl());
+            record.setAccMusicPdfUrl(accompaniment.getMusicPdfUrl());
+            record.setAccFirstPdfUrl(accompaniment.getFirstPdfUrl());
+            record.setAccJianPdfUrl(accompaniment.getJianPdfUrl());
         }
         List<CbsMusicSheetWrapper.MusicSheetSound> soundList = musicSheetApplication.getMusicSheetSoundList();
         if (CollectionUtils.isNotEmpty(soundList)) {
-            record.setAccompanimentMetronomeUrl(soundList.get(0).getAudioFileUrl());
-            record.setAccompanimentUrl(soundList.get(0).getAudioFileUrl());
+            CbsMusicSheetWrapper.MusicSheetSound sheetSound = soundList.get(0);
+            record.setAccompanimentMetronomeUrl(sheetSound.getAudioFileUrl());
+            record.setAccompanimentUrl(sheetSound.getAudioFileUrl());
+            record.setSoundMusicPdfUrl(sheetSound.getMusicPdfUrl());
+            record.setSoundFirstPdfUrl(sheetSound.getFirstPdfUrl());
+            record.setSoundJianPdfUrl(sheetSound.getJianPdfUrl());
         }
         record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());

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.8-RC1</com.microsvc.toolkit.version>
-		<cbs.version>1.0.15</cbs.version>
+		<cbs.version>1.0.16</cbs.version>
 	</properties>
 
 	<dependencyManagement>