Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/dto/TenantWrapper.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.api.feign.dto;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -113,6 +114,8 @@ public class TenantWrapper implements Serializable {
         public static Staff from(String json) {
             return JSON.parseObject(json, Staff.class);
         }
+
+
     }
 
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/service/DefaultUserDetailsService.java

@@ -93,10 +93,10 @@ public class DefaultUserDetailsService implements UserDetailsService {
             if (tenantStaff == null) {
                 throw new UsernameNotFoundException("账户不存在");
             }
+            if (Boolean.FALSE.equals(tenantStaff.getTenantEnableFlag())) {
+                throw new UsernameNotFoundException("MA:5004:该机构已被冻结");
+            }
             if (UserLockFlag.LOCKED.name().equals(tenantStaff.getStatus())) {
-                if (Boolean.FALSE.equals(tenantStaff.getTenantEnableFlag())) {
-                    throw new UsernameNotFoundException("MA:5004:该机构已被冻结");
-                }
                 throw new LockedException("账户被锁定");
             }
         }

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

@@ -94,7 +94,7 @@ public class TenantAlbumController {
         //查关联表
         TenantAlbumRef one = tenantAlbumRefService.lambdaQuery().eq(TenantAlbumRef::getTenantAlbumId, id)
                 .last("limit 1").one();
-        vo.setTenantId(one.getTenantId());
+        vo.setTenantId(one.getTenantId().toString());
         //查询曲目表
 
         TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());
@@ -164,7 +164,7 @@ public class TenantAlbumController {
                         TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
                         tenantAlbumSheet.setLevel(m.getLevel());
                         tenantAlbumSheet.setType(m.getType());
-                        tenantAlbumSheet.setId(m.getId());
+                        tenantAlbumSheet.setId(m.getId().toString());
                        return tenantAlbumSheet;
                     }).collect(Collectors.toList()));
                     sheetData.setSubjectType(next.getSubjectType());
@@ -182,9 +182,21 @@ public class TenantAlbumController {
         TenantAlbum tenantAlbum = JSON.parseObject(album.jsonString(), TenantAlbum.class);
         List<TenantAlbumVo.MusicSheetData> musicSheetData = album.getMusicSheetData();
 
-        List<TenantAlbumWrapper.MusicSheetData> musicSheetDataList = musicSheetData.stream().map(next ->
-                        JSON.parseObject(JSON.toJSONString(next), TenantAlbumWrapper.MusicSheetData.class))
-                .collect(Collectors.toList());
+        List<TenantAlbumWrapper.MusicSheetData> musicSheetDataList = musicSheetData.stream().map(next ->{
+            //TenantAlbumWrapper.MusicSheetData sheetData =new TenantAlbumWrapper.MusicSheetData();
+            TenantAlbumWrapper.MusicSheetData sheetData =new TenantAlbumWrapper.MusicSheetData();
+
+            List<TenantAlbumVo.MusicObject> musicSheetList = next.getMusicSheetList();
+            sheetData.getTenantAlbumSheetList().addAll( musicSheetList.stream().map(m->{
+                TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
+                tenantAlbumSheet.setLevel(m.getLevel());
+                tenantAlbumSheet.setType(m.getType());
+                tenantAlbumSheet.setId(m.getId().toString());
+                return tenantAlbumSheet;
+            }).collect(Collectors.toList()));
+            sheetData.setSubjectType(next.getSubjectType());
+            return sheetData;
+        }).collect(Collectors.toList());
         tenantAlbumService.updateAlbum(album.getTenantId(), tenantAlbum, musicSheetDataList);
         return HttpResponseResult.succeed();
     }

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

@@ -177,6 +177,7 @@ public class AdminClient extends BaseController {
         TenantStaff staff = tenantStaffService.getByUserId(userId);
         if (Objects.nonNull(staff)) {
             ret = TenantWrapper.Staff.from(JSON.toJSONString(staff));
+            ret.setStatus(staff.getStatus().name());
             Long tenantId = staff.getTenantId();
             TenantInfo tenantInfo = tenantInfoService.getById(Optional.ofNullable(tenantId).orElse(-1L));
             ret.setTenantEnableFlag(Optional.ofNullable(tenantInfo).map(TenantInfo::getEnableFlag).orElse(false));

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

@@ -341,7 +341,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                 tenantAlbumMusic1.setTenantId(tenantId);
                 tenantAlbumMusic1.setSubjectType(next.getSubjectType());
                 tenantAlbumMusic1.setTenantAlbumId(tenantAlbum.getId());
-                tenantAlbumMusic1.setMusicSheetId(tenantAlbumMusic.getId());
+                tenantAlbumMusic1.setMusicSheetId(Long.valueOf(tenantAlbumMusic.getId()));
                 tenantAlbumMusic1.setSortNumber(sort.getAndIncrement());
                 tenantAlbumMusic1.setDelFlag(false);
                 tenantAlbumMusic1.setLevel(tenantAlbumMusic.getLevel());

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

@@ -83,7 +83,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
                 //查关联表
                 TenantAlbumRef one = tenantAlbumRefService.lambdaQuery().eq(TenantAlbumRef::getTenantAlbumId, i.getId())
                         .last("limit 1").one();
-                vo.setTenantId(one.getTenantId());
+                vo.setTenantId(one.getTenantId().toString());
 
                 //查询曲目表
                 TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());

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

@@ -71,10 +71,10 @@ public class TenantAlbumWrapper {
     public static class TenantAlbum {
 
         @ApiModelProperty("主键ID")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("机构ID")
-        private Long tenantId;
+        private String tenantId;
 
         @ApiModelProperty("专辑名称")
         private String name;
@@ -263,10 +263,10 @@ public class TenantAlbumWrapper {
     public static class TenantAlbumSheet {
 
         @ApiModelProperty("主键ID")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("机构ID")
-        private Long tenantId;
+        private String tenantId;
 
         @ApiModelProperty("声部分类(ENSEMBLE, MUSIC, SUBJECT)")
         private SubjectTypeEnum subjectType;