管乐迷曲目来源内容平台

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

@@ -54,26 +54,26 @@ public class MusicSheetApplicationExtendController {
 
     @PreAuthorize("@pcs.hasPermissions('musicSheetApplicationExtend/pageByApplication')")
     @PostMapping({"/pageByApplication"})
-    public R<com.ym.mec.common.page.PageInfo<MusicSheetWrapper.MusicSheetApplication>> musicSheetPageByApplication(@RequestBody CbsMusicSheetWrapper.MusicSheetApplicationQuery var1) {
+    public R<com.ym.mec.common.page.PageInfo<MusicSheetWrapper.MusicSheetApplication>> musicSheetPageByApplication(@RequestBody CbsMusicSheetWrapper.MusicSheetQuery var1) {
         var1.setApplicationId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
         try {
-            PageInfo<CbsMusicSheetWrapper.MusicSheetApplication> feignedData = this.musicFeignClientService.musicSheetPageByApplication(var1).feignData();
-            List<CbsMusicSheetWrapper.MusicSheetApplication> rows = feignedData.getRows();
+            PageInfo<CbsMusicSheetWrapper.MusicSheet> info = this.musicFeignClientService.musicSheetPage(var1).feignData();
+            List<CbsMusicSheetWrapper.MusicSheet> rows = info.getRows();
             if (CollectionUtils.isEmpty(rows)) {
-                return R.from(PageUtil.pageInfo(feignedData, new ArrayList<>()));
+                return R.from(PageUtil.pageInfo(info, new ArrayList<>()));
             }
-            String instrumentIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getMusicalInstrumentIds).collect(Collectors.joining(","));
+            String instrumentIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getMusicalInstrumentIds).collect(Collectors.joining(","));
             //获取乐器名称
             List<CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryDtos =
                     sysMusicScoreService.queryMusicalInstrument(Arrays.stream(instrumentIds.split(",")).map(Integer::parseInt).distinct().collect(Collectors.toList()));
             Map<Integer,CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto> musicalInstrumentQueryMap = musicalInstrumentQueryDtos.stream()
                     .collect(Collectors.toMap(CbsMusicalInstrumentWrapper.MusicalInstrumentQueryDto::getId, o -> o, (o1, o2) -> o1));
-            List<Long> cbsMusicIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getId).collect(Collectors.toList());
+            List<Long> cbsMusicIds = rows.stream().map(CbsMusicSheetWrapper.MusicSheet::getId).collect(Collectors.toList());
             List<SysMusicScore> musicSheetList = sysMusicScoreService.getDao().findByCbsId(cbsMusicIds);
             Map<String, SysMusicScore> map = musicSheetList.stream().collect(Collectors.toMap(SysMusicScore::getCbsMusicSheetId, o -> o, (o1, o2) -> o1));
 
             List<MusicSheetWrapper.MusicSheetApplication> musicSheetApplications = new ArrayList<>();
-            for (CbsMusicSheetWrapper.MusicSheetApplication row : rows) {
+            for (CbsMusicSheetWrapper.MusicSheet row : rows) {
                 MusicSheetWrapper.MusicSheetApplication musicSheetApplication = JSONObject.parseObject(JSONObject.toJSONString(row), MusicSheetWrapper.MusicSheetApplication.class);
                 musicSheetApplication.setId(row.getId().toString());
                 SysMusicScore musicSheet = map.get(musicSheetApplication.getId());
@@ -96,8 +96,7 @@ public class MusicSheetApplicationExtendController {
                 }
                 musicSheetApplications.add(musicSheetApplication);
             }
-//            feignedData.setRows(rows);
-            return R.from(PageUtil.pageInfo(feignedData, musicSheetApplications));
+            return R.from(PageUtil.pageInfo(info, musicSheetApplications));
         } catch (Exception e) {
             log.error("查询曲目应用拓展表异常", e);
             if (e instanceof BizException) {
@@ -130,27 +129,6 @@ public class MusicSheetApplicationExtendController {
     }
 
 
-    @ApiOperation(value = "启/停用", notes = "曲目应用拓展表- 传入 MusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend")
-    @PreAuthorize("@pcs.hasPermissions('musicSheetApplicationExtend/status')")
-    @PostMapping("/status")
-    public R<JSONObject> status(@Validated @RequestBody CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus status) {
-
-        // 更新数据
-        try {
-
-            musicFeignClientService.musicSheetApplicationExtendStatus(status).feignData();
-        } catch (Exception e) {
-            log.error("启/停用异常", e);
-            if (e instanceof BizException) {
-                throw e;
-            }
-            throw BizException.from("内容平台服务异常");
-        }
-
-        return R.defaultR();
-    }
-
-
     @ApiOperation(value = "批量保存扩展信息")
     @PreAuthorize("@pcs.hasPermissions('musicSheetApplicationExtend/saveBatch')")
     @PostMapping("/saveBatch")

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

@@ -256,6 +256,18 @@ public class MusicSheetWrapper {
         @ApiModelProperty("业务平台曲目ID")
         private String bizId;
 
+        @ApiModelProperty("曲目分类ID")
+        private Long musicCategoryId;
+
+        @ApiModelProperty("曲目分类名称")
+        private String musicCategoryName;
+
+        @ApiModelProperty("曲目标签")
+        private String musicTag;
+
+        @ApiModelProperty("曲目标签名称")
+        private String musicTagNames;
+
         @ApiModelProperty("曲目封面图")
         private String musicCover;
 
@@ -274,15 +286,12 @@ public class MusicSheetWrapper {
         @ApiModelProperty("曲目声部名称")
         private String subjectNames;
 
-        @ApiModelProperty("评测标准 节奏 AMPLITUDE 音准 FREQUENCY 分贝 DECIBELS")
-        private EEvaluationStandard evaluationStandard;
-
-        @ApiModelProperty("曲目声部名称")
-        private String subjectIdNames;
-
         @ApiModelProperty("曲目乐器(多个,用逗号分隔)")
         private String musicalInstrumentIds;
 
+        @ApiModelProperty("曲目乐器code")
+        private String musicalInstrumentIdCodes;
+
         @ApiModelProperty("曲目乐器名称")
         private String musicalInstrumentNames;
 
@@ -292,9 +301,12 @@ public class MusicSheetWrapper {
         @ApiModelProperty("曲目类型(SINGLE:单曲 CONCERT:合奏)")
         private EMusicSheetType musicSheetType;
 
-        @ApiModelProperty("是否使用系统节拍器(0:否;1:是)")
+        @ApiModelProperty("演奏是否使用系统节拍器(0:否;1:是)")
         private Boolean isUseSystemBeat;
 
+        @ApiModelProperty("演唱是否使用系统节拍器(0:否;1:是)")
+        private Boolean isUseSingSystemBeat;
+
         @ApiModelProperty("是否可评测(0:否;1:是)") //  midi默认1, mp3 有伴奏1
         private Boolean isEvaluated;
 
@@ -304,15 +316,24 @@ public class MusicSheetWrapper {
         @ApiModelProperty("是否展示指法(0:否;1:是)") // moren 1
         private Boolean isShowFingering;
 
-        @ApiModelProperty("是否播入节拍器(0: 否 1:是)")
+        @ApiModelProperty("是否播入演奏节拍器(0: 否 1:是)")
         private Boolean isPlayBeat;
 
+        @ApiModelProperty("是否播入演唱节拍器(0: 否 1:是)")
+        private Boolean isPlaySingBeat;
+
+        @ApiModelProperty("是否全部声部可使用(0: 否 1:是)")
+        private Boolean isAllSubject;
+
         @ApiModelProperty("多声轨选择")
         private String multiTracksSelection;
 
         @ApiModelProperty("播放速度")
         private String playSpeed;
 
+        @ApiModelProperty("音频类型，SING：演唱，PLAY：演奏")
+        private String audioPlayTypes;
+
         @ApiModelProperty("播放模式(MIDI;MP3)")
         private EMusicPlayMode playMode;
 
@@ -331,6 +352,10 @@ public class MusicSheetWrapper {
         @ApiModelProperty("曲目缓存")
         private String musicSvg;
 
+
+        @ApiModelProperty("评测标准 节奏 AMPLITUDE 音准 FREQUENCY 分贝 DECIBELS")
+        private EEvaluationStandard evaluationStandard;
+
         @ApiModelProperty("简谱缓存")
         private String musicJianSvg;
 
@@ -391,47 +416,8 @@ public class MusicSheetWrapper {
         @ApiModelProperty("创建时间")
         private Date createTime;
 
-        @ApiModelProperty("应用扩展ID")
-        private Long applicationExtendId;
-
-        @ApiModelProperty("应用ID")
-        private Long applicationId;
-
-        @ApiModelProperty("所属人ID")
-        private Long userId;
-
-        @ApiModelProperty("所属人")
-        private String userName;
-
-        @ApiModelProperty("分类ID")
-        private Long musicSheetCategoryId;
-
-        @ApiModelProperty("分类名称")
-        private String musicSheetCategoryName;
-
-        @ApiModelProperty("启用状态")
-        private Boolean clientStatus;
-
-        @ApiModelProperty("排序")
-        private Integer sortNo;
-
-        @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
-        private String paymentType;
-
-        @ApiModelProperty("是否置顶(0:否;1:是)")
-        private Boolean topFlag;
-
-        @ApiModelProperty("精品标志")
-        private Boolean exquisiteFlag;
-
-        @ApiModelProperty("曲目标签(多个标签用逗号分隔)")
-        private String musicTagIds;
-
-        @ApiModelProperty("曲目标签名称")
-        private String musicTagNames;
-
-        @ApiModelProperty("曲目价格")
-        private BigDecimal musicPrice;
+        @ApiModelProperty("评测频率,详情返回，指定应用端")
+        private String evaluationFrequency;
 
 
         @ApiModelProperty("曲目伴奏")
@@ -445,6 +431,17 @@ public class MusicSheetWrapper {
         @ApiModelProperty("所属人信息")
         private CbsMusicSheetWrapper.MusicSheetExtend musicSheetExtend;
 
+        @ApiModelProperty("乐器信息")
+        private List<CbsMusicSheetWrapper.MusicalInstrument> musicalInstruments;
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static CbsMusicSheetWrapper.MusicSheet from(String json) {
+            return JSON.parseObject(json, CbsMusicSheetWrapper.MusicSheet.class);
+        }
+
     }
 
 }