混音节拍器

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

@@ -9,7 +9,6 @@ import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendCli
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetCategoryWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
-import com.dayaedu.cbs.openfeign.wrapper.musicInstrument.CbsMusicalInstrumentWrapper;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.template.R;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
@@ -20,7 +19,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +27,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -62,15 +63,6 @@ public class MusicSheetApplicationExtendController {
             if (CollectionUtils.isEmpty(rows)) {
                 return R.from(PageUtil.pageInfo(info, new ArrayList<>()));
             }
-            /*String instrumentIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getMusicalInstrumentIds).filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
-            //获取乐器名称
-            Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = new HashMap<>();
-            if(StringUtils.isNotEmpty(instrumentIds)){
-                List<CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryDtos =
-                        sysMusicScoreService.queryMusicalInstrument(Arrays.stream(instrumentIds.split(",")).map(Integer::parseInt).distinct().collect(Collectors.toList()));
-                musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream()
-                        .collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
-            }*/
             List<Long> cbsMusicIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getId).collect(Collectors.toList());
             List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds,false);
             Map<String, SysMusicScore> map = musicSheetList.stream().collect(Collectors.toMap(SysMusicScore::getCbsMusicSheetId, o -> o, (o1, o2) -> o1));
@@ -83,20 +75,6 @@ public class MusicSheetApplicationExtendController {
                 if (Objects.nonNull(musicSheet)) {
                     musicSheetApplication.setBizId(musicSheet.getId().toString());
                 }
-                /*if(StringUtils.isNotEmpty(musicSheetApplication.getMusicalInstrumentIds())){
-                    String[] split = musicSheetApplication.getMusicalInstrumentIds().split(",");
-                    for (String s : split) {
-                        StringBuffer sb = new StringBuffer();
-                        CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto musicalInstrumentQueryDto = musicalInstrumentQueryMap.get(Integer.parseInt(s));
-                        if(Objects.nonNull(musicalInstrumentQueryDto)){
-                            if(sb.length() > 0){
-                                sb.append(",");
-                            }
-                            sb.append(musicalInstrumentQueryDto.getName());
-                        }
-                        musicSheetApplication.setSubjectNames(sb.toString());
-                    }
-                }*/
                 musicSheetApplications.add(musicSheetApplication);
             }
             return R.from(PageUtil.pageInfo(info, musicSheetApplications));

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicSheetWrapper.java

@@ -420,6 +420,9 @@ public class MusicSheetWrapper {
         @ApiModelProperty("评测频率,详情返回，指定应用端")
         private String evaluationFrequency;
 
+        @ApiModelProperty("是否支持混音节拍器")
+        private Boolean isMixBeat;
+
 
         @ApiModelProperty("曲目伴奏")
         private List<CbsMusicSheetWrapper.MusicSheetAccompaniment> musicSheetAccompanimentList;