|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
|
|
|
import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
|
|
|
import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
|
|
|
import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
|
|
|
@@ -114,11 +115,12 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
|
|
|
addMusicSheet.setIsPlayBeat(true);
|
|
|
addMusicSheet.setIsUseSystemBeat(param.getHasBeat()!=YesOrNoEnum.YES);
|
|
|
addMusicSheet.setId(musicSheet.getCbsMusicSheetId());
|
|
|
+ addMusicSheet.setAvailableType(EMusicAvailableType.PLATFORM);
|
|
|
//修改声部和乐器为内容平台id
|
|
|
String musicalInstrumentIds = addMusicSheet.getMusicalInstrumentIds();
|
|
|
- List<Subject> subjectList = subjectService.findBySubjectByIdList(musicalInstrumentIds);
|
|
|
- addMusicSheet.setMusicalInstrumentIds(subjectList.stream().map(e->e.getCbsSubjectId().toString()).distinct().collect(Collectors.joining(",")));
|
|
|
- addMusicSheet.setSubjectIds(subjectList.stream().map(e->e.getParentSubjectId().toString()).distinct().collect(Collectors.joining(",")));
|
|
|
+ List<Instrument> instruments = instrumentService.lambdaQuery().in(Instrument::getId, musicalInstrumentIds.split(",")).list();
|
|
|
+ addMusicSheet.setMusicalInstrumentIds(musicalInstrumentIds);
|
|
|
+ addMusicSheet.setSubjectIds(instruments.stream().map(e->e.getSubjectId().toString()).distinct().collect(Collectors.joining(",")));
|
|
|
R<Long> longR = musicFeignClientService.musicSheetAdd(addMusicSheet);
|
|
|
if (!longR.getCode().equals(200)) {
|
|
|
throw new BizException("同步到内容平台失败");
|
