关联曲目

mec-application/src/main/java/com/ym/mec/student/controller/MusicPracticeRecordController.java

@@ -55,7 +55,6 @@ public class MusicPracticeRecordController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
-    @PreAuthorize("@auditsvc.hasPermissions('musicPracticeRecord/detail', {'BACKEND'})")
     @GetMapping("/detail/{id}")
     public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id) {
 

mec-application/src/main/java/com/ym/mec/student/controller/MusicSheetController.java

@@ -3,10 +3,17 @@ package com.ym.mec.student.controller;
 import com.alibaba.fastjson.JSON;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
+import com.ym.mec.biz.dal.entity.Instrument;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.dal.wrapper.InstrumentWrapper;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.InstrumentService;
 import com.ym.mec.biz.service.SysMusicScoreService;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.vo.MusicSheetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,11 +23,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
@@ -40,6 +45,7 @@ public class MusicSheetController {
     @Autowired
     private InstrumentService instrumentService;
 
+
     /**
      * 查询单条
      *
@@ -83,4 +89,42 @@ public class MusicSheetController {
         return R.from(musicSheetDetail);
     }
 
+    @ApiOperation(value = "查询分页", notes = "曲谱表- 传入 MusicSheetVo.MusicSheetQuery")
+    @PostMapping("/page")
+    public R<PageInfo<MusicSheetWrapper.MusicSheet>> page(@RequestBody MusicSheetVo.MusicSheetQuery query) {
+
+        SysExamSongQueryInfo queryInfo = new SysExamSongQueryInfo();
+
+        if(query.getMusicSheetCategoriesId() != null) {
+            queryInfo.setCategoriesId(query.getMusicSheetCategoriesId().toString());
+        }
+        if (query.getMusicalInstrumentId() != null) {
+            // 乐器转换为声部
+            Instrument instrument = instrumentService.getById(query.getMusicalInstrumentId());
+            if (instrument != null) {
+                queryInfo.setSubjectId(instrument.getSubjectId());
+            }
+        }
+        queryInfo.setType("COMMON");
+        queryInfo.setClientFlag(true);
+        queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
+        PageInfo<SysMusicScore> sysMusicScorePageInfo1 = musicSheetService.queryMusicScorePageInfo(queryInfo);
+        PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo1.convert(o -> {
+            MusicSheetWrapper.MusicSheet musicSheet = new MusicSheetWrapper.MusicSheet();
+            musicSheet.setId(o.getId().toString());
+            musicSheet.setMusicSheetCategoriesId(o.getCategoriesId());
+            musicSheet.setMusicSheetName(o.getName());
+            musicSheet.setTitleImg(o.getTitleImg());
+            musicSheet.setComposer(o.getComposer());
+            musicSheet.setCbsMusicSheetId(o.getCbsMusicSheetId());
+            musicSheet.setUsedNum(0L);
+            musicSheet.setPaymentType(StringUtils.isNotBlank(o.getRankIds()) && o.getRankIds().contains("1") ? "VIP" : "FREE");
+            musicSheet.setAudioPlayTypes(o.getAudioPlayTypes());
+
+            return musicSheet;
+        });
+
+
+        return R.from(convert);
+    }
 }

mec-application/src/main/java/com/ym/mec/teacher/controller/MusicPracticeRecordController.java

@@ -56,7 +56,6 @@ public class MusicPracticeRecordController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
-    @PreAuthorize("@auditsvc.hasPermissions('musicPracticeRecord/detail', {'BACKEND'})")
     @GetMapping("/detail/{id}")
     public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id) {
 

mec-application/src/main/java/com/ym/mec/teacher/controller/MusicSheetController.java

@@ -3,10 +3,19 @@ package com.ym.mec.teacher.controller;
 import com.alibaba.fastjson.JSON;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.Instrument;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.dal.wrapper.InstrumentWrapper;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.InstrumentService;
 import com.ym.mec.biz.service.SysMusicScoreService;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.vo.MusicSheetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -17,11 +26,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +47,11 @@ public class MusicSheetController {
     @Autowired
     private InstrumentService instrumentService;
 
+    @Resource
+    private TeacherDao teacherDao;
+    @Resource
+    private SysUserService sysUserService;
+
     /**
      * 查询单条
      *
@@ -83,4 +95,53 @@ public class MusicSheetController {
         return R.from(musicSheetDetail);
     }
 
+
+    @ApiOperation(value = "查询分页", notes = "曲谱表- 传入 MusicSheetVo.MusicSheetQuery")
+    @PostMapping("/page")
+    public R<PageInfo<MusicSheetWrapper.MusicSheet>> page(@RequestBody MusicSheetVo.MusicSheetQuery query) {
+
+        //判断用户是否可以访问云练习
+        Integer userId = sysUserService.getUserId();
+        Teacher teacher = teacherDao.get(userId);
+        if (teacher == null) {
+            throw new BizException("老师信息不存在");
+        }
+        //是否限制用户使用云教练
+        if(teacher.getCoursewareLimit()){
+            throw new BizException("您没有权限使用云练习");
+        }
+        SysExamSongQueryInfo queryInfo = new SysExamSongQueryInfo();
+
+        if(query.getMusicSheetCategoriesId() != null) {
+            queryInfo.setCategoriesId(query.getMusicSheetCategoriesId().toString());
+        }
+        if (query.getMusicalInstrumentId() != null) {
+            // 乐器转换为声部
+            Instrument instrument = instrumentService.getById(query.getMusicalInstrumentId());
+            if (instrument != null) {
+                queryInfo.setSubjectId(instrument.getSubjectId());
+            }
+        }
+        queryInfo.setType("COMMON");
+        queryInfo.setClientFlag(true);
+        queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
+        PageInfo<SysMusicScore> sysMusicScorePageInfo1 = musicSheetService.queryMusicScorePageInfo(queryInfo);
+        PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo1.convert(o -> {
+            MusicSheetWrapper.MusicSheet musicSheet = new MusicSheetWrapper.MusicSheet();
+            musicSheet.setId(o.getId().toString());
+            musicSheet.setMusicSheetCategoriesId(o.getCategoriesId());
+            musicSheet.setMusicSheetName(o.getName());
+            musicSheet.setTitleImg(o.getTitleImg());
+            musicSheet.setComposer(o.getComposer());
+            musicSheet.setCbsMusicSheetId(o.getCbsMusicSheetId());
+            musicSheet.setUsedNum(0L);
+            musicSheet.setPaymentType(StringUtils.isNotBlank(o.getRankIds()) && o.getRankIds().contains("1") ? "VIP" : "FREE");
+            musicSheet.setAudioPlayTypes(o.getAudioPlayTypes());
+
+            return musicSheet;
+        });
+
+
+        return R.from(convert);
+    }
 }

mec-application/src/main/java/com/ym/mec/vo/MusicSheetVo.java

@@ -39,6 +39,80 @@ public class MusicSheetVo {
         @ApiModelProperty("分页行数")
         private Integer rows;
 
+        @ApiModelProperty("关键字匹配")
+        private String keyword;
+
+        @ApiModelProperty("仅匹配资源名称")
+        private String name;
+
+        @ApiModelProperty("声部Id")
+        private String musicSubject;
+
+        @ApiModelProperty("曲目乐器Id")
+        private Long musicalInstrumentId;
+
+        @ApiModelProperty("曲谱分类编号")
+        private Integer musicSheetCategoriesId;
+
+        private List<Integer> musicSheetCategoriesIdList;
+
+        @ApiModelProperty(value = "删除标识", hidden = true)
+        private Boolean delFlag;
+
+        @ApiModelProperty(value = "启用停用标识，曲目状态（0：停用，1：启用）")
+        private Boolean status;
+
+        @ApiModelProperty(value = "排序 0:默认 1:首页热门，2热门列表")
+        private Integer sortType = 0;
+
+        @ApiModelProperty(value = "是否审核数据")
+        private Boolean versionFlag = false;
+
+        @ApiModelProperty(value = "用户ID",hidden = true)
+        private Long userId;
+
+        @ApiModelProperty(value = "用户类型",hidden = true)
+        private String clientType;
+
+        @ApiModelProperty("是否最近练习")
+        private Boolean recentFlag = false;
+
+        @ApiModelProperty("最近练习 当前曲目ID")
+        private Long excludeMusicId;
+
+        @ApiModelProperty("app版本")
+        private String version;
+
+        @ApiModelProperty("platform")
+        private String platform;
+
+        @ApiModelProperty("id集合")
+        private List<Long> ids;
+
+        @ApiModelProperty("曲目教程id集合")
+        private String musicTutorialIds;
+
+        @ApiModelProperty("曲目标签id集合")
+        private String musicTagIds;
+
+        @ApiModelProperty("内容平台ID为null")
+        private Boolean cbsIdIsNull;
+
+        @ApiModelProperty("是否转换")
+        private Boolean convertFlag;
+
+        @ApiModelProperty("教材版本ID/ 曲目标签ID")
+        private Long bookVersionId;
+
+        @ApiModelProperty("音频类型，SING：演唱，PLAY：演奏")
+        private List<String> audioPlayTypes;
+
+        @ApiModelProperty("标签分类搜索 HOT 热门，NEW 最新，RECOMMEND 推荐")
+        private String searchType;
+
+        @ApiModelProperty("是否只查询基础信息")
+        private Boolean basicFlag = false;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

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

@@ -3,10 +3,15 @@ package com.ym.mec.web.controller;
 import com.alibaba.fastjson.JSON;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
+import com.ym.mec.biz.dal.entity.Instrument;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.dal.wrapper.InstrumentWrapper;
+import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
 import com.ym.mec.biz.service.InstrumentService;
 import com.ym.mec.biz.service.SysMusicScoreService;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.vo.MusicSheetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -17,10 +22,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
@@ -83,4 +85,42 @@ public class MusicSheetController {
         return R.from(musicSheetDetail);
     }
 
+    @ApiOperation(value = "查询分页", notes = "曲谱表- 传入 MusicSheetVo.MusicSheetQuery")
+    @PostMapping("/page")
+    public R<PageInfo<MusicSheetWrapper.MusicSheet>> page(@RequestBody MusicSheetVo.MusicSheetQuery query) {
+
+        SysExamSongQueryInfo queryInfo = new SysExamSongQueryInfo();
+
+        if(query.getMusicSheetCategoriesId() != null) {
+            queryInfo.setCategoriesId(query.getMusicSheetCategoriesId().toString());
+        }
+        if (query.getMusicalInstrumentId() != null) {
+            // 乐器转换为声部
+            Instrument instrument = instrumentService.getById(query.getMusicalInstrumentId());
+            if (instrument != null) {
+                queryInfo.setSubjectId(instrument.getSubjectId());
+            }
+        }
+        queryInfo.setType("COMMON");
+        queryInfo.setClientFlag(true);
+        queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
+        PageInfo<SysMusicScore> sysMusicScorePageInfo = musicSheetService.queryMusicScorePage(queryInfo);
+        PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo.convert(o -> {
+            MusicSheetWrapper.MusicSheet musicSheet = new MusicSheetWrapper.MusicSheet();
+            musicSheet.setId(o.getId().toString());
+            musicSheet.setMusicSheetCategoriesId(o.getCategoriesId());
+            musicSheet.setMusicSheetName(o.getName());
+            musicSheet.setTitleImg(o.getTitleImg());
+            musicSheet.setComposer(o.getComposer());
+            musicSheet.setCbsMusicSheetId(o.getCbsMusicSheetId());
+            musicSheet.setUsedNum(0L);
+            musicSheet.setPaymentType(StringUtils.isNotBlank(o.getRankIds()) && o.getRankIds().contains("1") ? "VIP" : "FREE");
+            musicSheet.setAudioPlayTypes(o.getAudioPlayTypes());
+
+            return musicSheet;
+        });
+
+
+        return R.from(convert);
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -180,6 +180,13 @@ public class SysMusicScore {
 
 	private List<SysMusicScoreAccompaniment> background;
 
+    private String titleImg;
+
+    private String composer;
+
+
+    @ApiModelProperty("音频类型，SING：演唱，PLAY：演奏")
+    private String audioPlayTypes;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/FeatureType.java

@@ -45,4 +45,16 @@ public enum FeatureType implements BaseEnum<String, FeatureType> {
 		return desc;
 	}
 
+    public String toCbs() {
+        switch (this) {
+            case CLOUD_STUDY_TRAIN:
+                return "PRACTICE";
+            case FOLLOW_UP_TRAINING:
+                return "FOLLOW_UP_TRAINING";
+            case CLOUD_STUDY_EVALUATION:
+                return "EVALUATION";
+            default:
+                return "PRACTICE";
+        }
+    }
 }

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

@@ -505,7 +505,7 @@ public class MusicPracticeRecordWrapper {
                 .playRate(record.getPlayRate())
                 .speed(String.valueOf(OptionalInt.of(record.getSpeed()).orElse(0)))
                 .monday(record.getMonday())
-                .feature(record.getFeature()!=null?record.getFeature().name():null)
+                .feature(record.getFeature()!=null?record.getFeature().toCbs():null)
                 .heardLevel(record.getHeardLevel() !=null?record.getHeardLevel().getCode():null)
                 .instrumentId(record.getInstrumentId()!=null?record.getInstrumentId().toString():null)
                 .resultAnalyze(record.getResultAnalyze())

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

@@ -60,14 +60,11 @@ public class MusicSheetWrapper {
     public static class MusicSheet {
 
         @ApiModelProperty("主键")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("曲谱分类")
         private Integer musicSheetCategoriesId;
 
-//        @ApiModelProperty(value = "曲谱类型(SINGLE:单曲，CONCERT:合奏)")
-//        private EMusicSheetType musicSheetType;
-
         @ApiModelProperty("曲谱名称")
         private String musicSheetName;
 
@@ -76,192 +73,15 @@ public class MusicSheetWrapper {
         private String titleImg;
 
 
-        @ApiModelProperty("曲谱来源id")
-        private Long userId;
-
-
-        @ApiModelProperty("是否支持混音节拍器")
-        private Boolean isMixBeat;
-
-        @ApiModelProperty("多声轨选择")
-        private String multiTracksSelection;
-
-//        @ApiModelProperty("曲目来源类型 TEACHER 老师 PLATFORM 平台")
-//        private ESourceFrom sourceType;
-
-
-        @ApiModelProperty("是否公开")
-        private Boolean openFlag;
-
 
         @ApiModelProperty("作曲人")
         private String composer;
 
 
-        @ApiModelProperty("曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
-        private String musicSubject;
-
-
-        @ApiModelProperty("mp3曲谱类型  MP3;MP3_METRONOME")
-        private String mp3Type;
-
-
-        @ApiModelProperty("曲目图片")
-        private String musicImg;
-
-
-        @ApiModelProperty("曲谱音频文件类型(midi;mp3)")
-        private EAudioType audioType;
-
-
-        @ApiModelProperty("是否可以转简谱（0:否，1：是）")
-        private Integer notation;
-
-
-        @ApiModelProperty("曲谱标签(多个标签用逗号分隔)")
-        private String musicTag;
-
-
-        @ApiModelProperty("默认播放速度")
-        private String  playSpeed;
-
-
-        @ApiModelProperty("是否可以评测(0:否;1:是)")
-        private Boolean canEvaluate;
-
-
-        @ApiModelProperty("伴奏类型  HOMEMODE：自制 COMMON：普通")
-        private String accompanimentType;
-
-
-        @ApiModelProperty("是否展示指法(0:否;1:是)")
-        private Boolean showFingering;
-
-
-        @ApiModelProperty("曲目状态（0：停用，1：启用）")
-        private Boolean status;
-
-
-        @ApiModelProperty("曲目停用原因")
-        private String reason;
-
-
-        @ApiModelProperty("排序号")
-        private Integer sortNumber;
-
-
-        @ApiModelProperty("midi路径")
-        private String midiUrl;
-
-
-        @ApiModelProperty("伴奏含节拍器路径")
-        private String metronomeUrl;
-
-
-        @ApiModelProperty("伴奏（不含节拍器）路径")
-        private String url;
-
-
-        @ApiModelProperty("音频文件存储路径")
-        private String audioFileUrl;
-
-
-        @ApiModelProperty("XML文件存储路径")
-        private String xmlFileUrl;
-
-
-        @ApiModelProperty("是否自带节拍器(0:否;1:是)")
-        private Boolean hasBeat;
-
-
-        @ApiModelProperty("曲目配置")
-        private String extConfigJson;
-
-
-        @ApiModelProperty("是否节奏音乐")
-        private Boolean rhythmFlag;
-
-        @ApiModelProperty("创建时间")
-        private Date createTime;
-
-        @ApiModelProperty("创建人(老师或者是后台平台用户)")
-        private Long createBy;
-
-        @ApiModelProperty("创建用户")
-        private String createUser;
-
-        @ApiModelProperty("更新时间")
-        private Date updateTime;
-
-        @ApiModelProperty("更新人(老师或者是后台平台用户)")
-        private Long updateBy;
-
-        @ApiModelProperty("更新用户")
-        private String updateUser;
-
-        @ApiModelProperty("备注")
-        private String remark;
-
-        @ApiModelProperty("假删除标识 0：未删除 1：已删除")
-        private Boolean delFlag;
-
-        @ApiModelProperty("伴奏")
-        private List<MusicSheetAccompanimentWrapper.MusicSheetAccompaniment> background;
-
-        @ApiModelProperty("曲目缓存")
-        private String musicJSON;
-
-        @ApiModelProperty("曲目缓存svg")
-        private String musicSvg;
-
-        @ApiModelProperty("曲目缓存简谱svg")
-        private String musicJianSvg;
-
-        @ApiModelProperty("曲目缓存首调svg")
-        private String musicFirstSvg;
-
-
-
-        @ApiModelProperty("曲目赏析")
-        private String appreciationUrl;
-
         @ApiModelProperty("内容平台曲目ID")
-        private Long cbsMusicSheetId;
+        private String cbsMusicSheetId;
 
 
-        @ApiModelProperty("内容平台声部ID")
-        private String cbsSubjectId;
-
-
-        @ApiModelProperty(" 可用乐器(多个,用逗号分隔)")
-        private String cbsMusicalInstrumentIds;
-
-
-
-        @ApiModelProperty(" 可用乐器(多个,用逗号分隔)")
-        private String cbsMusicalInstrumentIdNames;
-
-        @ApiModelProperty("是否审核数据")
-        private Boolean versionFlag;
-
-        @ApiModelProperty("首调图片")
-        private String musicFirstImg;
-        @ApiModelProperty("固定调图片")
-        private String musicJianImg;
-
-        @ApiModelProperty("五线谱PDF文件")
-        private String musicPdfUrl;
-
-
-        @ApiModelProperty("首调PDF文件")
-        private String firstPdfUrl;
-
-
-        @ApiModelProperty("固定调PDF文件")
-        private String jianPdfUrl;
-
-        @ApiModelProperty("曲目类型(SINGLE:单曲 CONCERT:合奏)")
-        private String musicSheetType;
 
         @ApiModelProperty("被使用次数")
         private Long usedNum;
@@ -269,28 +89,10 @@ public class MusicSheetWrapper {
         @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
         private String paymentType;
 
-        @ApiModelProperty("是否包含伴奏")
-        private Boolean containAccompaniment = false;
-
-        @ApiModelProperty("是否总谱渲染")
-        private Boolean isScoreRender;
-
-        @ApiModelProperty("演奏是否默认展示总谱渲染")
-        private Boolean defaultScoreRender;
 
         @ApiModelProperty("音频类型，SING：演唱，PLAY：演奏")
         private String audioPlayTypes;
 
-        @ApiModelProperty("是否可转谱(0:否; 1:是)")
-        private Boolean isConvertibleScore;
-
-        @ApiModelProperty("谱面类型")
-        private String scoreType;
-
-
-        @ApiModelProperty("是否节奏练习曲目，节奏练习曲目不设置声部和乐器，所有声部和乐器都能被查询出来")
-        private Boolean isAllSubject;
-
         public String jsonString() {
             return JSON.toJSONString(this);
         }

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

@@ -210,6 +210,9 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 //            record.setMusicScoreCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 //            record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 //        }
+        record.setAudioPlayTypes(musicSheetApplication.getAudioPlayTypes());
+        record.setTitleImg(musicSheetApplication.getMusicCover());
+        record.setComposer(musicSheetApplication.getComposer());
         record.setName(musicSheetApplication.getName());
         record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
         record.setSpeed(musicSheetApplication.getPlaySpeed());