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

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -343,7 +343,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("subject/findSubSubjects")
     public Object findSubSubjects(){
-        return succeed(subjectService.findSubSubjects(null));
+        return succeed(subjectService.findSubSubjects(null,null));
     }
 
     @ApiOperation(value = "获取用户所在分部的年级列表）")

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherSubjectController.java

@@ -44,6 +44,6 @@ public class TeacherSubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("/findSubSubjects")
     public HttpResponseResult<List<Subject>> findSubSubjects(Integer tenantId){
-        return succeed(subjectService.findSubSubjects(null));
+        return succeed(subjectService.findSubSubjects(null,null));
     }
 }

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

@@ -103,8 +103,8 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表按父Id")
     @GetMapping("/findSubSubjects")
     @PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
-    public HttpResponseResult<List<Subject>> findSubSubjects(Integer parentSubjectId){
-        return succeed(subjectService.findSubSubjects(parentSubjectId));
+    public HttpResponseResult<List<Subject>> findSubSubjects(Integer parentSubjectId,Boolean cbsFlag){
+        return succeed(subjectService.findSubSubjects(parentSubjectId,cbsFlag));
     }
 
     @ApiOperation(value = "搜索按Id和名称")

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

@@ -143,7 +143,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取乐器种类")
     @GetMapping(value = "/findSubSubjects")
     public HttpResponseResult findSubSubjects() {
-        return succeed(subjectService.findSubSubjects( null));
+        return succeed(subjectService.findSubSubjects( null,null));
     }
 
     @ApiOperation("获取学生信息")

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

@@ -24,7 +24,7 @@ public class EduSubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("/findSubSubjects")
     public Object findSubSubjects(Integer tenantId){
-        return succeed(subjectService.findSubSubjects(null));
+        return succeed(subjectService.findSubSubjects(null,null));
     }
 
     @ApiOperation(value = "根据科目编号查询科目")

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

@@ -91,7 +91,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      *
      * @return
      */
-    List<Subject> findSubSubjects(@Param("parentSubjectId") Integer parentSubjectId);
+    List<Subject> findSubSubjects(@Param("parentSubjectId") Integer parentSubjectId, @Param("cbsFlag") Boolean cbsFlag);
 
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -79,7 +79,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * 获取子级科目列表
      * @return
      */
-    List<Subject> findSubSubjects(Integer parentSubjectId);
+    List<Subject> findSubSubjects(Integer parentSubjectId,Boolean cbsFlag);
 
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 

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

@@ -210,8 +210,8 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
-    public List<Subject> findSubSubjects(Integer parentSubjectId) {
-        return subjectDao.findSubSubjects(parentSubjectId);
+    public List<Subject> findSubSubjects(Integer parentSubjectId,Boolean cbsFlag) {
+        return subjectDao.findSubSubjects(parentSubjectId,cbsFlag);
     }
 
     @Override

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

@@ -171,11 +171,14 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                         .stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
 
                 //获取乐器名称
-                String instrumentIds = applications.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getMusicalInstrumentIds).collect(Collectors.joining(","));
-                List<CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryDtos =
-                        this.queryMusicalInstrument(Arrays.stream(instrumentIds.split(",")).map(Integer::parseInt).distinct().collect(Collectors.toList()));
-                Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream()
-                        .collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
+                String instrumentIds = applications.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getMusicalInstrumentIds)
+                        .filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
+                Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = new HashMap<>();
+                if(StringUtils.isNotEmpty(instrumentIds)){
+                    List<CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryDtos =
+                            this.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));
+                }
                 //获取分类名称
                 Map<Integer, String> categoriesMap = new HashMap<>(categoriesIds.size());
                 for (Integer categoriesId : categoriesIds) {
@@ -432,7 +435,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     }
 
     //测试环境合奏分类
-    private static String categoryIds = "42,43,44,45,46,91,92,93,94,95,7,11,15,180";
+//    private static String categoryIds = "42,43,44,45,46,91,92,93,94,95,7,11,15,180";
     private static String prodCategoryIds = "42,43,44,45,46,91,92,93,94,95,185,186,7,11,15,180";
 
     private CbsMusicSheetWrapper.AddMusicSheet musicToAddMusicSheet(SysMusicScore from, List<SysMusicScoreAccompaniment> accList) {
@@ -466,7 +469,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             }
         }
         if(addMusicSheet.getMusicSheetType() == null){
-            if(Arrays.stream(categoryIds.split(",")).anyMatch(e->e.equals(from.getMusicScoreCategoriesId().toString()))){
+            if(Arrays.stream(prodCategoryIds.split(",")).anyMatch(e->e.equals(from.getMusicScoreCategoriesId().toString()))){
                 addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
             }else {
                 addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);
@@ -474,7 +477,6 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         }
         addMusicSheet.setIsEvaluated(from.isEnableEvaluation());
         addMusicSheet.setIsConvertibleScore(true);
-        addMusicSheet.setPlaySpeed(from.getSpeed());
         addMusicSheet.setPlayMode(from.getPlayMode() == SysMusicScore.PlayMode.MP3 ? EMusicPlayMode.MP3 : EMusicPlayMode.MIDI);
         addMusicSheet.setMidiFileUrl(from.getMidiUrl());
         addMusicSheet.setExtConfigJson(from.getExtConfigJson());
@@ -518,6 +520,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                         addMusicSheet.setIsUseSystemBeat(sheetAccompaniment.getIsOpenMetronome());
                         musicSheetSounds.add(musicSheetSound);
                     }
+                    addMusicSheet.setPlaySpeed(sheetAccompaniment.getSpeed());
                 }
                 tracks = musicSheetSounds.stream().map(CbsMusicSheetWrapper.MusicSheetSound::getTrack).collect(Collectors.joining(","));
                 addMusicSheet.setMusicSheetSoundList(musicSheetSounds);

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

@@ -139,6 +139,9 @@
             <if test="parentSubjectId != null and parentSubjectId != ''">
                 AND parent_subject_id_ = #{parentSubjectId}
             </if>
+            <if test="cbsFlag != null and cbsFlag == true">
+                AND cbs_subject_id_ IS NOT NULL
+            </if>
         </where>
     </select>
 
@@ -418,7 +421,7 @@
     <select id="queryCbsSubjects"
             resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsSubjectApiWrapper$Subject">
         SELECT id_ subjectId,cbs_subject_id_ cbsSubjectId,name_ subjectName,code_ code FROM `subject`
-        WHERE del_flag_ = 0
+        WHERE del_flag_ = 0 AND cbs_subject_id_ IS NOT NULL
         <if test="query.cbsSubjectIds != null and query.cbsSubjectIds.size > 0">
             AND cbs_subject_id_ IN
             <foreach collection="query.cbsSubjectIds" item="cbsSubjectId" open="(" close=")" separator=",">

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -568,7 +568,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores =
-                courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(null, courseId, null, null, null);
+                this.initCourseScheduleStudentMusicScore(courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(null, courseId, null, null, null));
         Room room = roomDao.findByRid(roomId);
         String display = "";
         if (roleEnum == RoleTeacher || roleEnum == RoleEnum.RoleAssistant) {
@@ -599,7 +599,6 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         //已下载的伴奏列表
-        scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
         if (CollectionUtils.isNotEmpty(scheduleStudentMusicScores)) {
             List<CourseScheduleStudentMusicScore> musicScores = scheduleStudentMusicScores.stream()
                     .filter(e -> e.getUserId().equals(sysUser.getId())).collect(Collectors.toList());
@@ -2236,12 +2235,12 @@ public class RoomServiceImpl implements RoomService {
             // 重置房间用户信息
             roomMemberList = Lists.newArrayList(roomMembers);
 
-            List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(null, Long.parseLong(roomId.substring(1)), null, null, null);
+            List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(
+                    courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(null, Long.parseLong(roomId.substring(1)), null, null, null));
             RoomResult roomResult = new RoomResult();
             Set<String> userIds = roomMemberList.stream().map(RoomMember::getUid).collect(Collectors.toSet());
             Map<Integer, String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds, roomId.substring(1)));
             Map<Integer, String> examSongMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryExamSongByUserIdsAndCourseId(userIds, roomId.substring(1)));
-            scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
 
             // 全员静音开启状态
@@ -2856,19 +2855,13 @@ public class RoomServiceImpl implements RoomService {
         String roomId = musicScoreData.getRoomId();
         Long scheduleId = Long.parseLong(roomId.substring(1));
         String accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
-        List<CourseScheduleStudentMusicScore> studentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(accompanimentId, scheduleId, studentId, null, null);
+        List<CourseScheduleStudentMusicScore> studentMusicScores = this.initCourseScheduleStudentMusicScore(
+                courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(accompanimentId, scheduleId, studentId, null, null));
         if (accompanimentId != null) {
             //修改下载状态
             if (CollectionUtils.isEmpty(studentMusicScores)) {
                 throw new BizException("学员不存在此下载曲目");
             }
-            CbsMusicSheetWrapper.MusicSheetAccApplication sheetApplication = this.getSheetApplication(accompanimentId);
-            for (CourseScheduleStudentMusicScore studentMusicScore : studentMusicScores) {
-                studentMusicScore.setMusicScoreName(sheetApplication.getName());
-                studentMusicScore.setMp3Url(sheetApplication.getMp3Url());
-                studentMusicScore.setUrl(sheetApplication.getUrl());
-                courseScheduleStudentMusicScoreDao.update(studentMusicScore);
-            }
             CourseScheduleStudentMusicScore studentMusicScore = studentMusicScores.get(0);
             studentMusicScore.setDownStatus(musicScoreData.getStatus());
             courseScheduleStudentMusicScoreDao.update(studentMusicScore);