Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -218,6 +218,14 @@ public class TenantAlbumController {
     @ApiOperation(value = "修改专辑", notes = "修改专辑")
     @PreAuthorize("@pcs.hasPermissions('tenantAlbum/update')")
     public HttpResponseResult<Boolean> update( @RequestBody TenantAlbumVo.TenantAlbum album) {
+        
+        //判断当前机构是否已经绑定机构专辑
+        Long tenantId = album.getTenantId();
+        List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
+        if (CollectionUtils.isNotEmpty(list)){
+            throw new BizException("当前机构已有专辑");
+        }
+
         TenantAlbum tenantAlbum = JSON.parseObject(album.jsonString(), TenantAlbum.class);
         List<TenantAlbumVo.MusicSheetData> musicSheetData = album.getMusicSheetData();
 

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

@@ -366,7 +366,6 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
         tenantAlbumMusicService.lambdaUpdate()
                 .set(TenantAlbumMusic::getDelFlag, true)
                 .eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbum.getId())
-                .eq(TenantAlbumMusic::getTenantId, tenantId)
                 .update();
 
         insertAlbumMusic(tenantId, tenantAlbum, musicSheetDataList);
@@ -443,6 +442,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                                   List<TenantAlbumWrapper.MusicSheetData> musicSheetDataList) {
         //曲目表赋值
         List<TenantAlbumMusic> tenantAlbumMusics = musicSheetDataList.stream().map(next -> {
+
             AtomicInteger sort = new AtomicInteger(1);
             return next.getTenantAlbumSheetList().stream().map(tenantAlbumMusic -> {
                 TenantAlbumMusic tenantAlbumMusic1 = new TenantAlbumMusic();

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserTenantAlbumRecordController.java

@@ -1,24 +1,17 @@
 package com.yonge.cooleshow.teacher.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.common.response.template.R;
-import com.yonge.cooleshow.biz.dal.entity.UserTenantAlbumRecord;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
-import com.yonge.cooleshow.biz.dal.service.UserTenantAlbumRecordService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
-import com.yonge.cooleshow.biz.dal.wrapper.UserTenantAlbumRecordWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Validated
@@ -41,7 +34,12 @@ public class UserTenantAlbumRecordController {
     }
 
 
-
+    @ApiOperation(value = "查询机构专辑详情")
+    @PostMapping("/detail")
+    public HttpResponseResult <TenantAlbumWrapper.TenantAlbum> detail(@RequestParam(defaultValue = "") String albumId) {
+        TenantAlbumWrapper.TenantAlbum tenantAlbum= musicAlbumService.detailAlbum(albumId);
+        return HttpResponseResult.succeed(tenantAlbum);
+    }
 
 
 }