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

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

@@ -1,63 +1,61 @@
 package com.ym.mec.teacher.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.TenantConfig;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.biz.service.TenantConfigService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @RequestMapping("${app-config.url.teacher:}/sysMusicScoreAccompaniment")
 @Api(tags = "曲库伴奏服务")
 @RestController
 public class SysMusicScoreAccompanimentController extends BaseController {
 
-    @Autowired
+    @Resource
     private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
+    @Resource
+    private SysUserService sysUserService;
+    @Resource
     private TeacherService teacherService;
-    
-    @Autowired
+    @Resource
     private TenantConfigService tenantConfigService;
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds(Integer categoriesId) {
+    public HttpResponseResult<List<Subject>> querySubjectIds(Integer categoriesId) {
         return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+    public HttpResponseResult<List<SysMusicScoreAccompaniment>> queryPage(SysExamSongQueryInfo queryInfo) {
         String type = queryInfo.getType();
         if(StringUtils.isEmpty(type)){
             queryInfo.setType("ALL");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
-        queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setCreateUserId(sysUserService.getUserId());
         queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
@@ -69,11 +67,8 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(StringUtils.isEmpty(type)){
             queryInfo.setType("ALL");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
-        Teacher teacher = teacherService.get(sysUser.getId());
+        SysUser user = sysUserService.getUser();
+        Teacher teacher = teacherService.get(user.getId());
         if (StringUtils.isEmpty(queryInfo.getOrganId())) {
             queryInfo.setOrganId(teacher.getTeacherOrganId() + "");
         }
@@ -83,11 +78,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         }
-        queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setCreateUserId(user.getId());
         queryInfo.setShowFlag(1);
         queryInfo.setEnable(true);
         
-        TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", sysUser.getTenantId()));
+        TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", user.getTenantId()));
         
         queryInfo.setCategoriesIds(tenantConfig.getTeachingMaterialId());
         

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

@@ -72,7 +72,7 @@ public class MusicSheetApplicationExtendController {
                         .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);
+            List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds,false);
             Map<String, SysMusicScore> map = musicSheetList.stream().collect(Collectors.toMap(SysMusicScore::getCbsMusicSheetId, o -> o, (o1, o2) -> o1));
 
             List<MusicSheetWrapper.MusicSheetApplication> musicSheetApplications = new ArrayList<>();

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

@@ -16,7 +16,7 @@ public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
 
     int countBuyCategoriesIds(@Param("categoriesIds") String delCategoriesIds);
 
-    List<SysMusicScore> findByCbsId(@Param("cbsMusicSheetIds") List<Long> cbsMusicSheetIds);
+    List<SysMusicScore> findByCbsId(@Param("cbsMusicSheetIds") List<Long> cbsMusicSheetIds, @Param("delFlag") Boolean delFlag);
 
     void updateBatchByCbsId(@Param("vos") List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> updateMusicScore);
 

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

@@ -128,6 +128,9 @@ public class SysMusicScore {
 	private PlayMode playMode;
 
 	private String organName;
+
+	//独奏、合奏
+	private String musicSheetType;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -62,7 +62,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
             }
         }
         //需要修改的曲目
-        List<SysMusicScore> musicSheets = sysMusicScoreService.getDao().findByCbsId(cbsMusicSheetIds);
+        List<SysMusicScore> musicSheets = sysMusicScoreService.getDao().findByCbsId(cbsMusicSheetIds,null);
         if (CollectionUtils.isNotEmpty(musicSheets)){
             List<String> collect = musicSheets.stream().map(SysMusicScore::getCbsMusicSheetId).collect(Collectors.toList());
             //获取需要修改的曲目
@@ -75,7 +75,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
         if(CollectionUtils.isNotEmpty(addMusicSheet)){
             sysMusicScoreService.getDao().batchInsert(addMusicSheet);
             List<Long> cbsIds = addMusicSheet.stream().map(CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend::getMusicSheetId).collect(Collectors.toList());
-            List<SysMusicScore> sysMusicScores = sysMusicScoreService.getDao().findByCbsId(cbsIds);
+            List<SysMusicScore> sysMusicScores = sysMusicScoreService.getDao().findByCbsId(cbsIds,false);
             List<Integer> collect = sysMusicScores.stream().map(SysMusicScore::getId).collect(Collectors.toList());
             sysMusicScoreService.getDao().batchInsertAccompaniment(collect);
         }

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

@@ -154,7 +154,7 @@
 		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 sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL
+		WHERE sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL AND sms.music_sheet_type_ = 'SINGLE'
 		<if test="categoriesIdList != null and categoriesIdList.size > 0">
 			AND sesc.id_ IN
 			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">

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

@@ -163,7 +163,10 @@
 		SELECT COUNT(0) FROM sys_music_score WHERE FIND_IN_SET(music_score_categories_id_,#{categoriesIds}) AND del_flag_ = 0
 	</select>
 	<select id="findByCbsId" resultMap="SysMusicScore">
-		SELECT * FROM sys_music_score WHERE del_flag_ = 0
+		SELECT * FROM sys_music_score WHERE 1 = 1
+		<if test="delFlag != null">
+			AND del_flag_ = #{delFlag}
+		</if>
 		<if test="cbsMusicSheetIds != null">
 			AND cbs_music_sheet_id_ IN
 			<foreach collection="cbsMusicSheetIds" separator="," item="item" open="(" close=")">
@@ -186,7 +189,8 @@
 				subject_ids_ = #{item.musicSheetUpdate.subjectIds},
 				speed_ = #{item.musicSheetUpdate.playSpeed},
 				enable_evaluation_ = #{item.musicSheetUpdate.canEvaluate},
-				play_mode_ = #{item.musicSheetUpdate.playMode}
+				play_mode_ = #{item.musicSheetUpdate.playMode},
+				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType}
 			</if>
 			where cbs_music_sheet_id_ = #{item.musicSheetId}
 		</foreach>
@@ -206,14 +210,15 @@
 		subject_ids_ = #{param.subjectIds},
 		speed_ = #{param.playSpeed},
 		enable_evaluation_ = #{param.canEvaluate},
-		play_mode_ = #{param.playMode}
+		play_mode_ = #{param.playMode},
+		music_sheet_type_ = #{param.musicSheetType}
 		where cbs_music_sheet_id_ = #{param.id}
 	</update>
 
 	<insert id="batchInsert">
 		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_)
+		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_,music_sheet_type_)
 		values
 		<foreach collection="vos" item="item" separator=",">
 			(#{item.musicSheetCategoryId},
@@ -225,7 +230,7 @@
 			#{item.musicSheetUpdate.playSpeed},
 			#{item.musicSheetUpdate.canEvaluate},
 			#{item.musicSheetUpdate.playMode},0,
-			#{item.musicSheetId}
+			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType}
 			)
 		</foreach>
 	</insert>

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

@@ -599,7 +599,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         //已下载的伴奏列表
-        this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
+        scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
         if (CollectionUtils.isNotEmpty(scheduleStudentMusicScores)) {
             List<CourseScheduleStudentMusicScore> musicScores = scheduleStudentMusicScores.stream()
                     .filter(e -> e.getUserId().equals(sysUser.getId())).collect(Collectors.toList());
@@ -642,7 +642,7 @@ public class RoomServiceImpl implements RoomService {
             Set<String> userIds = roomMemberList.stream().map(RoomMember::getUid).collect(Collectors.toSet());
             Map<Integer, String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds, courseId.toString()));
             Map<Integer, String> examSongMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryExamSongByUserIdsAndCourseId(userIds, courseId.toString()));
-            this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
+            scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
         }
         roomResult.setWhiteboards(whiteboardDao.findByRid(roomId));
@@ -665,11 +665,13 @@ public class RoomServiceImpl implements RoomService {
         businessLogger.info("join room: roomId = {}, userId = {}, userName={}, role = {}", roomId, userId, userName, roleEnum);
     }
 
-    private void initCourseScheduleStudentMusicScore(List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores) {
+    private List<CourseScheduleStudentMusicScore> initCourseScheduleStudentMusicScore(List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores) {
+        List<CourseScheduleStudentMusicScore> result = new ArrayList<>();
         if(CollectionUtils.isEmpty(scheduleStudentMusicScores)){
-            return;
+            return result;
         }
-        List<Long> musicSheetSoundIds = scheduleStudentMusicScores.stream().map(e->Long.parseLong(e.getMusicScoreAccompanimentId())).distinct().collect(Collectors.toList());
+        List<Long> musicSheetSoundIds = scheduleStudentMusicScores.stream().map(e->Long.parseLong(e.getMusicScoreAccompanimentId()))
+                .distinct().collect(Collectors.toList());
         List<CbsMusicSheetWrapper.MusicSheetAccApplication> sheetApplications = this.getSheetApplications(musicSheetSoundIds);
         Map<Long, CbsMusicSheetWrapper.MusicSheetAccApplication> sheetApplicationMap = sheetApplications.stream()
                 .collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetAccApplication::getMusicSheetSoundId, Function.identity()));
@@ -683,8 +685,9 @@ public class RoomServiceImpl implements RoomService {
             //管乐迷的历史问题，原音和伴奏反过来
             studentMusicScore.setMp3Url(sheetApplication.getUrl());
             studentMusicScore.setUrl(sheetApplication.getMp3Url());
-            courseScheduleStudentMusicScoreDao.update(studentMusicScore);
+            result.add(studentMusicScore);
         }
+        return result;
     }
 
     private void joinImGroup(String roomId, Integer actualTeacherId, CourseSchedule courseSchedule) throws Exception {
@@ -2238,7 +2241,7 @@ public class RoomServiceImpl implements RoomService {
             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)));
-            this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
+            scheduleStudentMusicScores = this.initCourseScheduleStudentMusicScore(scheduleStudentMusicScores);
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
 
             // 全员静音开启状态