Merge branch 'feature/1108_audio' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicPracticeRecordController.java

@@ -74,7 +74,7 @@ public class MusicPracticeRecordController {
         }
         MusicPracticeRecordWrapper.MusicPracticeRecord from = MusicPracticeRecordWrapper.MusicPracticeRecord.from(JSON.toJSONString(wrapper));
         // 曲目信息
-        MusicSheet musicSheet = musicSheetService.getDao().get(id);
+        MusicSheet musicSheet = musicSheetService.getDao().get(Long.parseLong(wrapper.getMusicSheetId()));
         if (Objects.isNull(musicSheet)) {
             throw new com.yonge.toolset.base.exception.BizException("曲目信息不存在");
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -83,13 +83,14 @@ public class TenantAlbumSheetController extends BaseController {
     @ApiOperation(value = "分页查询")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantAlbumMusicWrapper.StudentTenantAlbumMusic>> page(@RequestBody @Validated TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
-//        SysUser user = sysUserFeignService.queryUserInfo();
-//        if (user == null || null == user.getId()) {
-//            return failed(HttpStatus.FORBIDDEN, "请登录");
-//        }
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
 
 //        Teacher teacher = teacherService.getById(user.getId());
 //        query.setTenantId(Optional.ofNullable(teacher.getTenantId()).orElse(-1L));
+        query.setUserId(user.getId());
         query.setClientType(ClientEnum.TEACHER);
         IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));

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

@@ -103,6 +103,9 @@ public class StudentHomeVo extends Student {
     @ApiModelProperty("客服数量")
     private Integer customerServiceNum;
 
+    @ApiModelProperty(value = "总控乐器ID")
+    private String instrumentId;
+
     public YesOrNoEnum getTenantAlbumFlag() {
         return tenantAlbumFlag;
     }

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

@@ -591,7 +591,7 @@
     </select>
 
     <select id="selectFavoriteMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
-        select <include refid="Base_Column_List"/>
+        select distinct <include refid="Base_Column_List"/>
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt