酷乐秀曲目来源改为内容平台

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicImgDto;
@@ -395,7 +396,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
      */
     MusicCompareWrapper.SearchData searchTenant(MusicCompareWrapper.MusicSearch queryInfo);
 
-    MusicSheet initMusicSheet(String musicSheetJson);
+    MusicSheet initMusicSheet(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet);
 
     void sync();
 }

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

@@ -164,10 +164,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             return "";
         }
         return one.getReason();
-
     }
 
-    private void checkRecord(MusicSheetAuthRecord musicSheetAuthRecord){
+    private CbsMusicSheetWrapper.AddMusicSheet checkRecord(MusicSheetAuthRecord musicSheetAuthRecord){
         if(StringUtils.isEmpty(musicSheetAuthRecord.getMusicSheetJson())){
             throw new BizException("曲目信息不能为空");
         }
@@ -176,13 +175,20 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if(org.apache.commons.collections.CollectionUtils.isEmpty(addMusicSheetApplicationExtend)){
             throw new BizException("曲目应用不能为空");
         }
+        for (CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend applicationExtend : addMusicSheetApplicationExtend) {
+            if(applicationExtend.getExquisiteFlag() == null){
+                applicationExtend.setExquisiteFlag(false);
+            }
+        }
+        return addMusicSheet;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addRecord(MusicSheetAuthRecord musicSheetAuthRecord) {
+        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
         //保存曲目信息
-        MusicSheet musicSheet = musicSheetService.initMusicSheet(musicSheetAuthRecord.getMusicSheetJson());
+        MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
         Long userId = sysUserService.getUserId();
         musicSheet.setUserId(userId);
         musicSheet.setCreateBy(userId);
@@ -194,13 +200,14 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheetAuthRecord.setBatchNo(batchNo);
         musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
         musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());
+        musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
         return baseMapper.insert(musicSheetAuthRecord);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateRecord(MusicSheetAuthRecord musicSheetAuthRecord) {
-        this.checkRecord(musicSheetAuthRecord);
+        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
         if(musicSheetAuthRecord.getId() == null){
             throw new BizException("先选择要修改的曲目");
         }
@@ -208,12 +215,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if (record == null){
             throw new BizException("曲目信息不存在");
         }
-        MusicSheet musicSheet = musicSheetService.initMusicSheet(musicSheetAuthRecord.getMusicSheetJson());
+        MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
         MusicSheet musicSheet1 = musicSheetService.getById(record.getMusicSheetId());
         musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());
-        musicSheet.setUserId(musicSheet1.getUserId());
-        musicSheet.setCreateBy(musicSheet1.getCreateBy());
-        musicSheet.setUpdateBy(musicSheet1.getUpdateBy());
         if(record.getAuditState() == AuthStatusEnum.DOING){
             musicSheetService.removeById(record.getMusicSheetId());
             musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
@@ -232,6 +236,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());
             musicSheetAuthRecord.setBatchNo(record.getBatchNo());
             musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
+            musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
             baseMapper.insert(musicSheetAuthRecord);
         }
     }

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

@@ -1950,16 +1950,29 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     }
 
     @Override
-    public MusicSheet initMusicSheet(String musicSheetJson) {
-        if(org.springframework.util.StringUtils.isEmpty(musicSheetJson)){
-            throw new BizException("曲目信息不能为空");
+    public MusicSheet initMusicSheet(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet) {
+        Long userId = sysUserFeignService.queryUserInfo().getId();
+        addMusicSheet.setCreateBy(userId);
+        addMusicSheet.setUpdateBy(userId);
+        if (addMusicSheet.getSourceType() == null) {
+            addMusicSheet.setSourceType(EMusicSourceType.PERSON);
         }
-        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetJson, CbsMusicSheetWrapper.AddMusicSheet.class);
-        List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> addMusicSheetApplicationExtend = addMusicSheet.getAddMusicSheetApplicationExtend();
-        if(org.apache.commons.collections.CollectionUtils.isEmpty(addMusicSheetApplicationExtend)){
-            throw new BizException("曲目应用不能为空");
+        if (addMusicSheet.getAppAuditFlag() == null) {
+            addMusicSheet.setAppAuditFlag(false);
+        }
+        if (addMusicSheet.getIsPlayBeat() == null) {
+            addMusicSheet.setIsPlayBeat(true);
+        }
+        if (addMusicSheet.getIsUseSystemBeat() == null) {
+            addMusicSheet.setIsUseSystemBeat(true);
+        }
+        if (addMusicSheet.getIsShowFingering() == null) {
+            addMusicSheet.setIsShowFingering(true);
         }
         MusicSheet musicSheetAudit = new MusicSheet();
+        musicSheetAudit.setUserId(userId);
+        musicSheetAudit.setCreateBy(userId);
+        musicSheetAudit.setUpdateBy(userId);
         musicSheetAudit.setSubmitAuditTime(new Date());
         musicSheetAudit.setProviderType(SourceTypeEnum.TEACHER);
         musicSheetAudit.setSourceType(SourceTypeEnum.TEACHER);