管乐迷曲目来源内容平台

mec-application/src/main/java/com/ym/mec/web/controller/SysMusicScoreController.java

@@ -1,8 +1,6 @@
 package com.ym.mec.web.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.dayaedu.cbs.domain.wrapper.MusicSheetWrapper;
-import com.microsvc.toolkit.common.response.template.R;
 import com.ym.mec.biz.dal.dto.ReasonDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -345,14 +345,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetR.feignData();
             if (musicSheet == null) {
                 log.error("曲目同步失败，曲目ID：{}", record.getId());
-                return;
             }
-            MusicSheet musicSheet1 = new MusicSheet();
-            musicSheet1.setId(record.getId());
-            musicSheet1.setCbsMusicSheetId(musicSheet.getId());
-//            musicSheet1.setCbsSubjectId(musicSheet.getSubjectIds());
-            musicSheet1.setMusicSheetName(musicSheet.getName());
-            this.updateById(musicSheet1);
         } catch (Exception e){
             log.error("曲目同步失败，曲目ID：{}", record.getId(),e);
         }
@@ -388,40 +381,18 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheet.setIsConvertibleScore(true);
         addMusicSheet.setPlaySpeed(from.getSpeed());
         addMusicSheet.setPlayMode(from.getPlayMode() == SysMusicScore.PlayMode.MP3 ? EMusicPlayMode.MP3 : EMusicPlayMode.MIDI);
-
         addMusicSheet.setMidiFileUrl(from.getMidiUrl());
-        addMusicSheet.setMusicJson(from.getMusicJSON());
-        addMusicSheet.setMusicSvg(from.getMusicSvg());
-        addMusicSheet.setMusicJianSvg(from.getMusicJianSvg());
-        addMusicSheet.setMusicFirstSvg(from.getMusicFirstSvg());
-
-        addMusicSheet.setMusicFirstImg(Optional.ofNullable(from.getFirstTone()).orElse(from.getFirstTone()));
-        addMusicSheet.setMusicJianImg(Optional.ofNullable(from.getFixedTone()).orElse(from.getFixedTone()));
-        addMusicSheet.setMusicImg(from.getMusicImg());
         addMusicSheet.setExtConfigJson(from.getExtConfigJson());
         addMusicSheet.setCreateTime(from.getCreateTime());
-        addMusicSheet.setAudioType(from.getAccompanimentType() !=null && from.getAccompanimentType() == AccompanimentTypeEnum.COMMON? EAudioType.COMMON:EAudioType.HOMEMODE);
-        if (from.getSourceType() !=null) {
-            addMusicSheet.setAvailableType(from.getSourceType() == SourceTypeEnum.PLATFORM? EMusicAvailableType.PLATFORM:EMusicAvailableType.PERSON);
-            addMusicSheet.setSourceType(from.getSourceType() == SourceTypeEnum.PLATFORM? EMusicSourceType.PLATFORM:EMusicSourceType.PERSON);
-        } else {
-            addMusicSheet.setAvailableType(EMusicAvailableType.PLATFORM);
-            addMusicSheet.setSourceType(EMusicSourceType.PLATFORM);
-        }
-        addMusicSheet.setStatus(from.getState() == YesOrNoEnum.YES);
-        addMusicSheet.setReason(from.getReason());
+        addMusicSheet.setAudioType(EAudioType.HOMEMODE);
+        addMusicSheet.setAvailableType(EMusicAvailableType.ORG);
+        addMusicSheet.setSourceType(EMusicSourceType.PLATFORM);
+        addMusicSheet.setStatus(true);
 
         String tracks = "";
         // 伴奏，原音 扩展信息
         if (addMusicSheet.getPlayMode() == EMusicPlayMode.MP3) {
             CbsMusicSheetWrapper.MusicSheetAccompaniment musicSheetAccompaniment = new CbsMusicSheetWrapper.MusicSheetAccompaniment();
-            if (StringUtils.isNotBlank(from.getMetronomeUrl())) {
-                musicSheetAccompaniment.setAudioFileUrl(from.getMetronomeUrl());
-            }else if (StringUtils.isNotBlank(from.getUrl())) {
-                musicSheetAccompaniment.setAudioFileUrl(from.getUrl());
-            } else if (StringUtils.isNotBlank(from.getAudioFileUrl())) {
-                musicSheetAccompaniment.setAudioFileUrl(from.getAudioFileUrl());
-            }
             if (StringUtils.isNotBlank(musicSheetAccompaniment.getAudioFileUrl())) {
                 addMusicSheet.setMusicSheetAccompanimentList(Lists.newArrayList(musicSheetAccompaniment));
             }
@@ -454,28 +425,18 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheet.setMultiTracksSelection(tracks);
 
         CbsMusicSheetWrapper.MusicSheetExtend musicSheetExtend = new CbsMusicSheetWrapper.MusicSheetExtend();
-        musicSheetExtend.setApplicationId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
-        if (from.getSourceType() !=null) {
-            if (from.getSourceType() == SourceTypeEnum.TEACHER) {
-                musicSheetExtend.setUserId(from.getUserId());
-                musicSheetExtend.setClientType(EClientType.TEACHER.name());
-            } else {
-                musicSheetExtend.setClientType(EClientType.BACKEND.name());
-            }
-        }
+        musicSheetExtend.setApplicationId(applicationId);
+        musicSheetExtend.setClientType(EClientType.BACKEND.name());
         addMusicSheet.setMusicSheetExtend(musicSheetExtend);
 
         // 应用扩展信息
         CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend = new CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend();
-        addMusicSheetApplicationExtend.setApplicationId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
+        addMusicSheetApplicationExtend.setApplicationId(applicationId);
         addMusicSheetApplicationExtend.setStatus(addMusicSheet.getStatus());
-        addMusicSheetApplicationExtend.setSortNo(from.getSortNumber());
-        addMusicSheetApplicationExtend.setPaymentType(from.getPaymentType());
-        addMusicSheetApplicationExtend.setTopFlag(from.getTopFlag() !=null && from.getTopFlag() == YesOrNoEnum.YES);
-        addMusicSheetApplicationExtend.setExquisiteFlag(from.getExquisiteFlag() !=null && from.getExquisiteFlag() == YesOrNoEnum.YES);
-        addMusicSheetApplicationExtend.setAvailableType(from.getProviderType() !=null && from.getProviderType() == SourceTypeEnum.TENANT?EMusicAvailableType.ORG:EMusicAvailableType.PLATFORM);
-        addMusicSheetApplicationExtend.setMusicTagIds(from.getMusicTag());
-        addMusicSheetApplicationExtend.setMusicPrice(from.getMusicPrice());
+        addMusicSheetApplicationExtend.setSortNo(from.getOrder());
+        addMusicSheetApplicationExtend.setPaymentType(StringUtils.isNotEmpty(from.getRankIds()) ? "PAY" : "FREE");
+        addMusicSheetApplicationExtend.setAvailableType(EMusicAvailableType.ORG);
+        addMusicSheetApplicationExtend.setMusicSheetCategoryId(from.getCategoriesId().longValue());
         addMusicSheet.setAddMusicSheetApplicationExtend(Lists.newArrayList(addMusicSheetApplicationExtend));
         addMusicSheet.setIsConvertibleScore(true);
         return addMusicSheet;