Merge branch 'zx_online_network' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseCoursewareServiceImpl.java

@@ -1,17 +1,12 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.biz.dal.dao.CourseCoursewareDao;
-import com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetAccompanimentResult;
 import com.yonge.cooleshow.biz.dal.dto.search.CourseCoursewareSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseCourseware;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.yonge.cooleshow.biz.dal.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
@@ -29,7 +24,6 @@ import com.yonge.toolset.base.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -42,22 +36,14 @@ import java.util.stream.Collectors;
 public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao, CourseCourseware> implements CourseCoursewareService {
     private final static Logger log = LoggerFactory.getLogger(CourseCoursewareServiceImpl.class);
 
-
     @Resource
     private SysUserMapper userMapper;
-
     @Resource
     private MusicSheetService musicSheetService;
-
     @Resource
     private SysUserService sysUserService;
-
-    @Resource
-    private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
-
     @Resource
     private TeacherDao teacherDao;
-
     @Resource
     private TenantAlbumMusicService tenantAlbumMusicService;
 
@@ -81,7 +67,7 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
         }
         Map<Long, String> userIdUsernameMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getUsername));
         //获取内容平台曲目信息
-        List<Long> cbsMusicSheetIds = records.stream().map(e -> e.getCbsMusicSheetId()).collect(Collectors.toList());
+        List<Long> cbsMusicSheetIds = records.stream().map(e -> Long.parseLong(e.getCbsMusicSheetId())).collect(Collectors.toList());
         CbsMusicSheetWrapper.MusicSheetApplicationQuery applicationQuery = musicSheetService.getMusicSheetApplicationQuery();
         applicationQuery.setMusicSheetIds(cbsMusicSheetIds);
         applicationQuery.setRows(cbsMusicSheetIds.size());
@@ -90,7 +76,7 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
             Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> applicationMap = applications.stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, e -> e));
             for (CourseCoursewareVo record : records) {
                 record.setUsername(userIdUsernameMap.get(record.getUserId()));
-                CbsMusicSheetWrapper.MusicSheetApplication sheetApplication = applicationMap.get(record.getCbsMusicSheetId());
+                CbsMusicSheetWrapper.MusicSheetApplication sheetApplication = applicationMap.get(Long.parseLong(record.getCbsMusicSheetId()));
                 if(sheetApplication != null){
                     record.setMusicSheetName(sheetApplication.getName());
                     record.setTitleImg(sheetApplication.getMusicCover());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -457,8 +457,8 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         if(StringUtils.isNotEmpty(accompaniment.getMusicSubjectId())){
             content.setSubjectId(Integer.parseInt(accompaniment.getMusicSubjectId()));
         }
-        content.setMp3Url(accompaniment.getAudioFileUrl());
-        content.setUrl(accompaniment.getMetronomeUrl());
+        content.setMp3Url(accompaniment.getMetronomeUrl());
+        content.setUrl(accompaniment.getAudioFileUrl());
         BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);
         basicUserInfo.setImUserId(imUserId);
         CourseSchedule courseSchedule = courseScheduleService.getById(roomId);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseCoursewareVo.java

@@ -40,5 +40,5 @@ public class CourseCoursewareVo extends CourseCourseware{
 	private YesOrNoEnum musicStatus;
 
 	@ApiModelProperty("曲目编号")
-	private Long cbsMusicSheetId;
+	private String cbsMusicSheetId;
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseCoursewareMapper.xml

@@ -42,7 +42,7 @@
                 and t.client_type_ = #{param.clientType}
             </if>
             <if test="param.idAndName != null and param.idAndName != ''">
-                and  (ms.music_sheet_name_ like '%${param.idAndName}%' or ms.cbs_music_sheet_id_ = '${param.idAndName}')
+                and  (ms.music_sheet_name_ LIKE CONCAT('%',#{param.idAndName},'%') or ms.cbs_music_sheet_id_ = #{param.idAndName})
             </if>
             <if test="param.musicTagIdList != null and param.musicTagIdList.size() != 0">
                 and