云教练关联查询

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetCbsController.java

@@ -76,7 +76,8 @@ public class MusicSheetCbsController extends BaseController {
     })
     @GetMapping("/cbsDetail/{id}")
     public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
-                                                      @RequestParam(required = false) String tenantAlbumId) {
+                                                      @RequestParam(required = false) String tenantAlbumId,
+                                                      @RequestParam(required = false) String providerType) {
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
@@ -85,15 +86,20 @@ public class MusicSheetCbsController extends BaseController {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(id);
 
+        // 设置查询机构 还是平台数据
+        if (StringUtils.isNotBlank(providerType) && SourceTypeEnum.PLATFORM.name().equals(providerType)) {
+            tenantAlbumId = null;
+        } else {
+            tenantAlbumId = StringUtils.isBlank(tenantAlbumId) ? null : "1";
+        }
+
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(musicSheet), MusicSheetVo.MusicSheetDetail.class);
         MusicSheetDetailVo detail = musicSheetService.detail(id.toString(), sysUser, ClientEnum.SYSTEM, tenantAlbumId);
         if (detail == null) {
-//            musicSheetDetail.setBizMusicCategoryId(null);
         } else {
             // 设置曲目付费类型
             musicSheetDetail.setPaymentType(detail.getPaymentType());
             // 设置业务端曲目分类
-//            musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
             musicSheetDetail.setScoreType(detail.getScoreType());
             musicSheetDetail.setIsConvertibleScore(detail.getNotation() ==YesOrNoEnum.YES);
             musicSheetDetail.setPlay(detail.getPlay());

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

@@ -6,6 +6,7 @@ import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.response.template.R;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
+import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.UserMusic;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
@@ -41,6 +42,9 @@ public class MusicPracticeRecordController {
     @Autowired
     private SysUserService sysUserService;
 
+    @Autowired
+    private StudentService studentService;
+
     /**
      * 查询单条
      * @param id 详情ID
@@ -89,6 +93,11 @@ public class MusicPracticeRecordController {
 
         Long userId = sysUserService.getUserId();
         record.userId(String.valueOf(userId)).clientType(ClientEnum.STUDENT.getCode());
+        Student student = studentService.getById(userId);
+        if (student == null) {
+            throw BizException.from("学生不存在");
+        }
+        record.setProviderType(student.getTenantId() !=null && student.getTenantId()>0?"TENANT":"PLATFORM");
 
         // 新增数据
         MusicPracticeRecordWrapper.MusicPracticeRecord from = MusicPracticeRecordWrapper.MusicPracticeRecord.from(record.jsonString());

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.student.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
@@ -14,6 +15,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.entity.UserTenantAlbumRecord;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MusicSortType;
@@ -69,6 +71,8 @@ public class MusicSheetCbsController extends BaseController {
     @Autowired
     private InstrumentService instrumentService;
 
+    @Autowired
+    private UserTenantAlbumRecordService userTenantAlbumRecordService;
 
     /**
      * 查询单条
@@ -164,8 +168,23 @@ public class MusicSheetCbsController extends BaseController {
         // 如果是机构学生
         if (student.getTenantId() !=null && student.getTenantId()>0) {
             query.setProviderType(SourceTypeEnum.TENANT);
-
             query.setSubjectId(Long.parseLong(student.getSubjectId()));
+
+            // 学生可用专辑
+
+            List<UserTenantAlbumRecord> record = userTenantAlbumRecordService.lambdaQuery()
+                    .eq(UserTenantAlbumRecord::getUserId, student.getUserId())
+                    .eq(UserTenantAlbumRecord::getClientType, ClientEnum.STUDENT)
+                    .gt(UserTenantAlbumRecord::getEndTime,new Date())
+                    .orderByAsc(UserTenantAlbumRecord::getEndTime)
+                    .list();
+            if (CollectionUtils.isNotEmpty(record)) {
+                List<Long> albumIds = record.stream().map(UserTenantAlbumRecord::getTenantAlbumId).distinct().collect(Collectors.toList());
+                query.setTenantAlbumIds(albumIds);
+            } else {
+                return HttpResponseResult.succeed(PageUtil.pageInfo(new Page<>()));
+            }
+
         } else {
             query.setProviderType(SourceTypeEnum.PLATFORM);
             if (musicSheet !=null) {

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

@@ -224,8 +224,14 @@ public class MusicSheetController extends BaseController {
         if (ClientEnum.invalid(clientType)) {
             return failed("无效的客户端类型");
         }
+        Student student = studentService.getById(sysUser.getId());
+        if (student == null) {
+            throw com.microsvc.toolkit.common.webportal.exception.BizException.from("学生不存在");
+        }
 
-        return succeed(musicSheetService.setFavorite(sysUser.getId(),id, ClientEnum.valueOf(clientType)));
+
+        return succeed(musicSheetService
+                .setFavorite(sysUser.getId(),id, ClientEnum.valueOf(clientType),student.getTenantId() !=null && student.getTenantId()>0?"TENANT":"PLATFORM"));
     }
 
 
@@ -494,92 +500,4 @@ public class MusicSheetController extends BaseController {
         return succeed(musicSheetService.searchTenant(queryInfo));
     }
 
-
-
-    /**
-     * 查询单条
-     *
-     * @param id 详情ID
-     * @return R<MusicSheetVo.MusicSheet>
-     */
-    @ApiOperation(value = "查询内容平台数据")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "id", value = "id", dataType = "long")
-    })
-    @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id) {
-
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            sysUser = null;
-        }
-        CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
-        musicSheet.setBizId(id);
-
-        MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(musicSheet), MusicSheetVo.MusicSheetDetail.class);
-        MusicSheetDetailVo detail = musicSheetService.detail(id.toString(), sysUser, ClientEnum.STUDENT, null);
-        if (detail == null) {
-//            musicSheetDetail.setBizMusicCategoryId(null);
-        } else {
-            // 设置曲目付费类型
-            musicSheetDetail.setPaymentType(detail.getPaymentType());
-            // 设置业务端曲目分类
-//            musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
-            musicSheetDetail.setScoreType(detail.getScoreType());
-            musicSheetDetail.setIsConvertibleScore(detail.getNotation() ==YesOrNoEnum.YES);
-            musicSheetDetail.setPlay(detail.getPlay());
-            musicSheetDetail.setBuyed(detail.getBuyed());
-        }
-
-        // 如果是合奏 并且乐器ID = 2268
-        musicSheetDetail.setSpecialPercussionFlag(false);
-
-        // 设置乐器信息
-        if (StringUtils.isNotBlank(musicSheetDetail.getMusicalInstrumentIds())) {
-            List<Long> instrumentIds = Arrays.stream(musicSheetDetail.getMusicalInstrumentIds().split(","))
-                .map(Long::parseLong).collect(Collectors.toList());
-
-            if (CollectionUtils.isNotEmpty(instrumentIds) && CollectionUtils.isNotEmpty(musicSheetDetail.getMusicalInstruments())) {
-                Map<Long, InstrumentWrapper.Instrument> instrumentMap = instrumentService.getMapByIds(instrumentIds);
-                for (CbsMusicSheetWrapper.MusicalInstrument musicalInstrument : musicSheetDetail.getMusicalInstruments()) {
-                    InstrumentWrapper.Instrument instrument = instrumentMap.get(musicalInstrument.getId().longValue());
-                    if (instrument != null) {
-                        musicalInstrument.setOrientation(instrument.getOrientation());
-                    }
-
-                }
-            }
-        }
-        return R.from(musicSheetDetail);
-    }
-
-    @ApiOperation(value = "查询分页", notes = "曲谱表- 传入 MusicSheetVo.MusicSheetQuery")
-    @PostMapping("/page")
-    public HttpResponseResult<PageInfo<MusicSheetWrapper.MusicSheetCloud>> cloudPage(@RequestBody MusicSheetWrapper.MusicSheetCloudQuery query) {
-
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        Student student = studentService.getById(sysUser.getId());
-        if (student == null) {
-            return failed("用户信息获取失败");
-        }
-
-        // 检查app版本
-        YesOrNoEnum appAuditVersion = appVersionInfoService.getAppAuditVersion(query.getPlatform(), query.getVersion());
-        // 学生 只能看通过审核 并且 启用的 曲目
-        query.setDelFlag(false);
-        query.setVersionFlag(appAuditVersion == YesOrNoEnum.YES);
-        query.setStatus(true);
-
-        // 如果是机构学生
-        if (student.getTenantId() !=null && student.getTenantId()>0) {
-            query.setProviderType(SourceTypeEnum.TENANT);
-        } else {
-            query.setProviderType(SourceTypeEnum.PLATFORM);
-        }
-        IPage<MusicSheetWrapper.MusicSheetCloud> musicSheetCloudIPage = musicSheetService.cloudPage(query);
-        return HttpResponseResult.succeed(PageUtil.pageInfo(musicSheetCloudIPage));
-    }
 }

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.teacher.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
@@ -12,11 +13,13 @@ import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
+import com.yonge.cooleshow.biz.dal.mapper.TenantGroupAlbumMapper;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.biz.dal.wrapper.InstrumentWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.MusicSheetWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantGroupAlbumWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -64,6 +67,8 @@ public class MusicSheetCbsController extends BaseController {
     @Autowired
     private TeacherService teacherService;
 
+    @Autowired
+    private TenantGroupAlbumMapper tenantGroupAlbumMapper;
 
     /**
      * 查询单条
@@ -148,14 +153,33 @@ public class MusicSheetCbsController extends BaseController {
         query.setStatus(true);
         query.setUserId(teacher.getUserId());
         query.setClientType(ClientEnum.TEACHER.name());
-        query.setProviderType(SourceTypeEnum.PLATFORM);
+        MusicSheet musicSheet =null;
         if (query.getExcludeMusicId() !=null) {
-            MusicSheet musicSheet = musicSheetService.getById(query.getExcludeMusicId());
+            musicSheet = musicSheetService.getById(query.getExcludeMusicId());
             if (musicSheet == null) {
                 return failed("曲目不存在");
             }
             query.setMusicSheetType(musicSheet.getMusicSheetType());
-            query.setMusicTagIds(musicSheet.getMusicTag());
+        }
+        // 如果是机构老师
+        if (query.getProviderType() != null && query.getProviderType() == SourceTypeEnum.TENANT) {
+            // 查询机构老师可用的专辑ID集合
+            List<TenantGroupAlbumWrapper.BuyTenantAlbum> buyAlbumInfo = tenantGroupAlbumMapper.getBuyAlbumInfo(TenantGroupAlbumWrapper.BuyTenantAlbumQuery.builder().tenantId(teacher.getTenantId()).build());
+            if (CollectionUtils.isEmpty(buyAlbumInfo)) {
+                return HttpResponseResult.succeed(PageUtil.pageInfo(new Page<>()));
+            }
+            query.setTenantAlbumIds(buyAlbumInfo.stream().map(TenantGroupAlbumWrapper.BuyTenantAlbum::getId).collect(Collectors.toList()));
+
+        } else {
+            query.setProviderType(SourceTypeEnum.PLATFORM);
+            if (musicSheet !=null) {
+                query.setMusicTagIds(musicSheet.getMusicTag());
+                if (StringUtils.isNotBlank(musicSheet.getMusicSubject())) {
+                    List<Long> subjectIds = Arrays.stream(musicSheet.getMusicSubject().split(","))
+                            .filter(StringUtils::isNotBlank).map(Long::parseLong).collect(Collectors.toList());
+                    query.setMustMatchSubjectIds(subjectIds);
+                }
+            }
         }
         IPage<MusicSheetWrapper.MusicSheetCloud> musicSheetCloudIPage = musicSheetService.cloudPage(query);
         return HttpResponseResult.succeed(PageUtil.pageInfo(musicSheetCloudIPage));

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

@@ -191,13 +191,14 @@ public class MusicSheetController extends BaseController {
     @PostMapping("/favorite/{id}")
     @ApiOperation(value = "曲目收藏/取消收藏")
     public HttpResponseResult<Boolean> favorite(@ApiParam(value = "曲目编号", required = true) @PathVariable("id") Long id,
-                                                @ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "TEACHER") String clientType) {
+                                                @ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "TEACHER") String clientType,
+                                                @RequestParam("providerType") String providerType) {
         SysUser sysUser = sysUserService.getUser();
         if (ClientEnum.invalid(clientType)) {
             return failed("无效的客户端类型");
         }
 
-        return succeed(musicSheetService.setFavorite(sysUser.getId(),id, ClientEnum.valueOf(clientType)));
+        return succeed(musicSheetService.setFavorite(sysUser.getId(),id, ClientEnum.valueOf(clientType),providerType));
     }
 
     /**

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -63,7 +63,7 @@ public class MusicSheetController extends BaseController {
             return failed("无效的客户端类型");
         }
 
-        return succeed(musicSheetService.setFavorite(sysUser.getId(), id, ClientEnum.valueOf(clientType)));
+        return succeed(musicSheetService.setFavorite(sysUser.getId(), id, ClientEnum.valueOf(clientType),"PLATFORM"));
     }
 
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicFavorite.java

@@ -43,6 +43,17 @@ public class MusicFavorite extends BaseEntity {
     @ApiModelProperty(value = "是否收藏(1:收藏;0:取消收藏)")
     private Integer favoriteFlag;  //是否收藏(1:收藏;0:取消收藏)
 
+	@TableField("provider_type_")
+	@ApiModelProperty("曲目评测来源 TENANT 机构 PLATFORM 平台")
+	private String providerType;
+
+	public String getProviderType() {
+		return providerType;
+	}
+
+	public void setProviderType(String providerType) {
+		this.providerType = providerType;
+	}
 
 	public MusicFavorite setId(Long id) {
 	    this.id = id;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMusicCompareRecord.java

@@ -108,6 +108,8 @@ public class SysMusicCompareRecord extends BaseEntity {
     private Boolean delFlag;
 
     private Float playRate;
+	@ApiModelProperty("曲目评测来源 TENANT 机构 PLATFORM 平台")
+    private String providerType;
 	public SysMusicCompareRecord(FeatureType feature) {
 		this.feature = feature;
 	}

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

@@ -23,7 +23,7 @@ public interface MusicFavoriteService extends IService<MusicFavorite> {
      * @param clientType 客户端类型
      * @return list
      */
-    List<MusicFavorite> getFavorite(Long userId, Long musicSheetId, ClientEnum clientType);
+    List<MusicFavorite> getFavorite(Long userId, Long musicSheetId, ClientEnum clientType,String providerType);
 
 
     /**
@@ -33,5 +33,5 @@ public interface MusicFavoriteService extends IService<MusicFavorite> {
      * @param userId 用户id
      * @param userType 用户类型 老师 学生
      */
-    YesOrNoEnum checkFavorite(Long musicSheetId, Long userId, ClientEnum userType);
+    YesOrNoEnum checkFavorite(Long musicSheetId, Long userId, ClientEnum userType,String providerType);
 }

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

@@ -123,7 +123,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param clientType 客户端类型
      * @return boolean
      */
-    boolean setFavorite(Long userId, Long musicSheetId, ClientEnum clientType);
+    boolean setFavorite(Long userId, Long musicSheetId, ClientEnum clientType,String providerType);
 
     /**
      * 我的单曲

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

@@ -33,22 +33,24 @@ public class MusicFavoriteServiceImpl extends ServiceImpl<MusicFavoriteDao,Music
     }
 
     @Override
-    public List<MusicFavorite> getFavorite(Long userId, Long musicSheetId, ClientEnum clientType) {
+    public List<MusicFavorite> getFavorite(Long userId, Long musicSheetId, ClientEnum clientType,String providerType) {
         return this.lambdaQuery()
                    .eq(MusicFavorite::getMusicSheetId, musicSheetId)
                    .eq(MusicFavorite::getUserId, userId)
                    .eq(MusicFavorite::getClientType, clientType)
+                   .eq(MusicFavorite::getProviderType, providerType)
                    .list();
 
     }
 
 
     @Override
-    public YesOrNoEnum checkFavorite(Long musicSheetId, Long userId, ClientEnum userType) {
+    public YesOrNoEnum checkFavorite(Long musicSheetId, Long userId, ClientEnum userType,String providerType) {
         return this.lambdaQuery()
                 .eq(MusicFavorite::getUserId,userId)
                 .eq(MusicFavorite::getMusicSheetId,musicSheetId)
                 .eq(MusicFavorite::getClientType,userType)
+                .eq(MusicFavorite::getProviderType, providerType)
                 .count() >0?YesOrNoEnum.YES:YesOrNoEnum.NO;
 
     }

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

@@ -633,13 +633,18 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 throw new BizException("未找到曲目信息");
             }
         }
+        boolean tenantFlag =false;
         MusicSheetDetailVo detail ;
         if (sysUser == null || userType == ClientEnum.SYSTEM) {
 
             try {
-                detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.PLATFORM);
+                if (StringUtil.isEmpty(tenantAlbumId)) {
+                    detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.PLATFORM);
+                } else {
+                    detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.TENANT);
+                }
             } catch (Exception e) {
-                detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.TENANT);
+                throw new BizException("未找到曲目信息");
             }
         } else
         if (StringUtil.isEmpty(tenantAlbumId)) {
@@ -652,12 +657,14 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             if (tenantId >0L) {
                 if (userType == ClientEnum.STUDENT) {
                     detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.TENANT);
+                    tenantFlag = true;
                 } else {
                     if (detailVo.getProviderType().contains(SourceTypeEnum.PLATFORM.getCode())) {
                         detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.PLATFORM);
 
                     } else {
                         detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.TENANT);
+                        tenantFlag = true;
                     }
                 }
 
@@ -667,6 +674,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         } else {
 
             detail = this.getCbsDetail(Long.parseLong(id),SourceTypeEnum.TENANT);
+            tenantFlag = true;
         }
         detail.setPlay(YesOrNoEnum.NO);
         detail.setTenantFlag(false);
@@ -696,7 +704,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
 
         // 收藏
-        YesOrNoEnum favorite = musicFavoriteService.checkFavorite(Long.parseLong(id),sysUser.getId(),userType);
+        YesOrNoEnum favorite = musicFavoriteService.checkFavorite(Long.parseLong(id),sysUser.getId(),userType,tenantFlag?"TENANT":"PLATFORM");
         detail.setFavorite(favorite);
 
         // 播放状态
@@ -758,7 +766,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 return detail;
             }
             // 机构专辑购买
-//            detail.setPlay(YesOrNoEnum.NO);
             List<Long> collected = Arrays.stream(tenantAlbumId.split(",")).map(Long::parseLong).collect(Collectors.toList());
 
             // 学生生效中的机构专辑
@@ -1035,14 +1042,15 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean setFavorite(Long userId, Long musicSheetId, ClientEnum clientType) {
-        List<MusicFavorite> musicFavorites = musicFavoriteService.getFavorite(userId, musicSheetId, clientType);
+    public boolean setFavorite(Long userId, Long musicSheetId, ClientEnum clientType,String providerType) {
+        List<MusicFavorite> musicFavorites = musicFavoriteService.getFavorite(userId, musicSheetId, clientType,providerType);
         if (CollectionUtils.isEmpty(musicFavorites)) {
             MusicFavorite musicFavorite = new MusicFavorite();
             musicFavorite.setMusicSheetId(musicSheetId);
             musicFavorite.setClientType(clientType);
             musicFavorite.setUserId(userId);
             musicFavorite.setFavoriteTime(new Date());
+            musicFavorite.setProviderType(providerType);
             musicSheetDao.updateFavoriteCount(musicSheetId,YesOrNoEnum.YES);
             return musicFavoriteService.save(musicFavorite);
         } else {
@@ -1534,7 +1542,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             }
 
             // 曲目收藏
-            List<MusicFavorite> favorite = musicFavoriteService.getFavorite(sysUser.getId(), detail.getId(), clientType);
+            List<MusicFavorite> favorite = musicFavoriteService.getFavorite(sysUser.getId(), detail.getId(), clientType,"PLATFORM");
             if (!CollectionUtils.isEmpty(favorite)) {
                 musicSheetWebsiteDetailVo.setFavorite(YesOrNoEnum.YES);
             }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/MusicPracticeRecordWrapper.java

@@ -313,6 +313,8 @@ public class MusicPracticeRecordWrapper {
         @ApiModelProperty("假删除标识 0：未删除 1：已删除")
         private Boolean delFlag;
 
+        @ApiModelProperty("曲目评测来源 TENANT 机构 PLATFORM 平台")
+        private String providerType;
 
         @ApiModelProperty("是否隐藏评测记录 0：不隐藏 1：隐藏")
         private Boolean hiddenFlag;
@@ -480,6 +482,10 @@ public class MusicPracticeRecordWrapper {
         @ApiModelProperty("假删除标识 0：未删除 1：已删除")
         private Boolean delFlag;
 
+
+        @ApiModelProperty("曲目评测来源 TENANT 机构 PLATFORM 平台")
+        private String providerType;
+
         public static Entity toEntity(SysMusicCompareRecord record) {
             if (record ==null) {
                 return null;
@@ -515,6 +521,7 @@ public class MusicPracticeRecordWrapper {
                 .updateTime(record.getCreateTime())
                 .createTime(record.getCreateTime())
                 .delFlag(record.getDelFlag())
+                .providerType(record.getProviderType())
                 .build();
         }
 
@@ -550,6 +557,7 @@ public class MusicPracticeRecordWrapper {
             sysMusicCompareRecord.setInstrumentId(this.instrumentId!=null?Long.parseLong(this.instrumentId):null);
             sysMusicCompareRecord.setDelFlag(this.delFlag);
             sysMusicCompareRecord.setPlayRate(this.playRate);
+            sysMusicCompareRecord.setProviderType(this.providerType ==null?"PLATFORM":this.providerType);
 
             return sysMusicCompareRecord;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/MusicSheetWrapper.java

@@ -988,7 +988,6 @@ public class MusicSheetWrapper {
         @ApiModelProperty("关键字匹配")
         private String keyword;
         private Long musicSheetId;
-
         @ApiModelProperty("仅匹配资源名称")
         private String name;
 
@@ -1035,6 +1034,15 @@ public class MusicSheetWrapper {
 
         private Long subjectId;
 
+        @ApiModelProperty("可用机构专辑ID集合")
+        private List<Long> tenantAlbumIds;
+
+        private MusicSheetTypeEnum musicSheetType;
+
+        // 是否为机构学生用户
+        @ApiModelProperty(value = "提供方 TENANT 机构 PLATFORM 平台")
+        private SourceTypeEnum providerType;
+
         @ApiModelProperty("标签id（多个逗号隔开）")
         private String musicTagIds;
 
@@ -1047,11 +1055,6 @@ public class MusicSheetWrapper {
                 this.musicTagIdList = StringUtil.toLongList(musicTagIds);
             }
         }
-
-        private MusicSheetTypeEnum musicSheetType;
-
-        // 是否为机构学生用户
-        private SourceTypeEnum providerType;
         public String jsonString() {
             return JSON.toJSONString(this);
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantGroupAlbumWrapper.java

@@ -180,6 +180,9 @@ public class TenantGroupAlbumWrapper {
 
     }
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     @ApiModel(" BuyTenantAlbumQuery-可购买机构专辑信息查询")
     public static class BuyTenantAlbumQuery {
 

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

@@ -1347,121 +1347,138 @@
 
     <select id="cloudPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.MusicSheetWrapper$MusicSheetCloud">
         select t.id_, t.music_sheet_name_,t.title_img_,t.composer_,t.cbs_music_sheet_id_ ,t.payment_type_,t.music_price_ as musicPrice
-        from music_sheet t
-        <if test="param.recentFlag != null and param.recentFlag == 1">
-            left join sys_music_compare_record msar on t.id_ = msar.music_sheet_id_
-        </if>
-        <if test="param.albumId != null and param.providerType.code == 'TENANT'">
-            left join tenant_album_music tam on t.id_ = tam.music_sheet_id_ and tam.del_flag_ = 0  and tam.tenant_album_id_ = #{param.albumId}
-        </if>
-
-        <if test="param.albumId != null and param.providerType.code == 'PLATFORM'">
-            left join album_music_relate amr on t.id_ = amr.music_sheet_id_ and amr.album_id_ = #{param.albumId}
-        </if>
-        <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
-            left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mf.user_id_ = #{param.userId} and mf.client_type_ = #{param.clientType}
+        from (
+        select a.* from
+        music_sheet a
+        <if test="param.providerType != null and param.providerType.code == 'TENANT'">
+            left join tenant_album_music tam on a.id_ = tam.music_sheet_id_ and tam.del_flag_ = 0 and tam.tenant_album_id_ in 
+            <foreach collection="param.tenantAlbumIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <where>
-            t.cbs_music_sheet_id_ is not null
-            <if test="param.name != null and param.name != ''">
-                and t.music_sheet_name_ like concat('%',#{param.name},'%')
+            a.cbs_music_sheet_id_ is not null
+            <if test="param.providerType != null and param.providerType.code == 'TENANT'">
+               and tam.id_ is not null
             </if>
-            <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
-                and mf.id_ is not null
+            <if test="param.name != null and param.name != ''">
+                and a.music_sheet_name_ like concat('%',#{param.name},'%')
             </if>
             <if test="param.status != null">
 
                 <if test="param.providerType != null">
                     <if test="param.providerType.code == 'TENANT'">
-                        and t.tenant_state_ = #{param.status}
+                        and a.tenant_state_ = #{param.status}
                     </if>
 
                     <if test="param.providerType.code == 'PLATFORM'">
-                        and t.state_ = #{param.status}
+                        and a.state_ = #{param.status}
                     </if>
                 </if>
 
                 <if test="param.providerType == null">
-                    and t.state_ = #{param.status}
+                    and a.state_ = #{param.status}
                 </if>
             </if>
             <if test="param.delFlag != null">
                 <if test="param.providerType != null">
                     <if test="param.providerType.code == 'TENANT'">
-                        and t.tenant_del_flag_ = #{param.delFlag}
+                        and a.tenant_del_flag_ = #{param.delFlag}
                     </if>
 
                     <if test="param.providerType.code == 'PLATFORM'">
-                        and t.del_flag_ = #{param.delFlag}
+                        and a.del_flag_ = #{param.delFlag}
                     </if>
                 </if>
 
                 <if test="param.providerType == null">
-                    and t.del_flag_ = #{param.delFlag}
+                    and a.del_flag_ = #{param.delFlag}
                 </if>
 
             </if>
             <if test="param.versionFlag != null">
-                and t.audit_version_ = #{param.versionFlag}
+                and a.audit_version_ = #{param.versionFlag}
             </if>
 
             <if test="param.mustMatchSubjectIds != null and param.mustMatchSubjectIds.size() != 0">
                 and
                 <foreach collection="param.mustMatchSubjectIds" separator="and" item="item" open="(" close=")">
-                    find_in_set(#{item},t.music_subject_)
+                    find_in_set(#{item},a.music_subject_)
                 </foreach>
             </if>
-            <if test="param.recentFlag != null and param.recentFlag == 1">
-                <if test="param.userId != null">
-                    and msar.user_id_ = #{param.userId}
-                </if>
-                <if test="param.clientType != null and param.clientType != ''">
-                    and msar.client_id_ = #{param.clientType}
-                </if>
-            </if>
             <if test="param.excludeMusicId != null">
-                and t.id_ != #{param.excludeMusicId}
+                and a.id_ != #{param.excludeMusicId}
             </if>
             <if test="param.ids != null and param.ids.size() != 0">
-                and t.id_ in
+                and a.id_ in
                 <foreach collection="param.ids" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
 
+
             <if test="param.providerType != null and param.providerType.code == 'TENANT'">
                 <if test="param.albumId != null">
                     and tam.tenant_album_id_ = #{param.albumId}
                     and tam.subject_type_ in ('ENSEMBLE', 'MUSIC', 'SUBJECT')
                 </if>
-                <if test="param.albumId == null">
+                <if test="param.albumId == null and param.recentFlag == null and param.favoriteFlag == null">
                     and 1=2
                 </if>
             </if>
-
-            <if test="param.providerType != null and param.providerType.code == 'PLATFORM'">
-                <if test="param.albumId != null">
-                    and amr.id_ is not null
-                </if>
-
-            </if>
-
             <if test="param.providerType != null">
-                and find_in_set(#{param.providerType},t.provider_type_)
+                and find_in_set(#{param.providerType},a.provider_type_)
             </if>
             <if test="param.musicSheetType != null">
-                and t.music_sheet_type_ = #{param.musicSheetType}
+                and a.music_sheet_type_ = #{param.musicSheetType}
             </if>
             <if test="param.subjectId != null">
-                and (find_in_set(#{param.subjectId},t.music_subject_)or t.music_subject_ is null or t.music_subject_ = '' OR t.is_all_subject_)
+                and (find_in_set(#{param.subjectId},a.music_subject_)or a.music_subject_ is null or a.music_subject_ = '' OR a.is_all_subject_)
             </if>
             <if test="param.musicTagIdList != null and param.musicTagIdList.size() >0">
                 and
                 <foreach collection="param.musicTagIdList" open="(" close=")" separator="or" item="item">
-                    find_in_set(#{item},t.music_tag_)
+                    find_in_set(#{item},a.music_tag_)
                 </foreach>
             </if>
         </where>
+        ) t
+        <if test="param.recentFlag != null and param.recentFlag == 1">
+            left join sys_music_compare_record msar on t.id_ = msar.music_sheet_id_ and t.provider_type_ = #{param.providerType}
+        </if>
+        <if test="param.albumId != null and param.providerType.code == 'TENANT'">
+            left join tenant_album_music tam on t.id_ = tam.music_sheet_id_ and tam.del_flag_ = 0  and tam.tenant_album_id_ = #{param.albumId}
+        </if>
+
+        <if test="param.albumId != null and param.providerType.code == 'PLATFORM'">
+            left join album_music_relate amr on t.id_ = amr.music_sheet_id_ and amr.album_id_ = #{param.albumId}
+        </if>
+        <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
+            left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mf.user_id_ = #{param.userId} and mf.client_type_ = #{param.clientType} and t.provider_type_ = #{param.providerType}
+        </if>
+        <where>
+            
+            <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
+                and mf.id_ is not null
+            </if>
+
+            <if test="param.recentFlag != null and param.recentFlag == 1">
+                <if test="param.userId != null">
+                    and msar.user_id_ = #{param.userId}
+                </if>
+                <if test="param.clientType != null and param.clientType != ''">
+                    and msar.client_id_ = #{param.clientType}
+                </if>
+            </if>
+
+            <if test="param.providerType != null and param.providerType.code == 'PLATFORM'">
+                <if test="param.albumId != null">
+                    and amr.id_ is not null
+                </if>
+
+            </if>
+            
+        </where>
 
         GROUP BY t.id_
         order by

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

@@ -40,6 +40,7 @@
         <result column="hidden_flag_" property="hiddenFlag"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="play_rate_" property="playRate"/>
+        <result column="provider_type_" property="providerType"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -57,12 +58,12 @@
 		INSERT INTO sys_music_compare_record (id_,user_id_,music_sheet_id_,heard_level_,behavior_id_,score_data_,score_,intonation_,cadence_,integrity_,
 		                                      record_file_path_,video_file_path_,device_type_,client_id_,play_time_,speed_,monday_,
 												source_time_,feature_,create_time_,update_time_,part_index_,custom_configuration_,tenant_id_,
-        practice_time_,practice_source_,result_analyze_,headphone_flag_,instrument_id_,hidden_flag_,del_flag_,play_rate_)
+        practice_time_,practice_source_,result_analyze_,headphone_flag_,instrument_id_,hidden_flag_,del_flag_,play_rate_,provider_type_)
 		VALUES(#{id},#{userId},#{musicSheetId},#{heardLevel,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},#{behaviorId},#{scoreData},
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
 		       #{sourceTime},#{feature,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{partIndex},#{customConfiguration},#{tenantId},
-        #{practiceTime},#{practiceSource},#{resultAnalyze},#{headphoneFlag},#{instrumentId},#{hiddenFlag},#{delFlag},#{playRate})
+        #{practiceTime},#{practiceSource},#{resultAnalyze},#{headphoneFlag},#{instrumentId},#{hiddenFlag},#{delFlag},#{playRate},#{providerType})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->