Merge branch 'courseware_search_1211' of http://git.dayaedu.com/yonge/cooleshow into develop-new

# Conflicts:
#	pom.xml

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicPracticeRecordController.java

@@ -51,7 +51,7 @@ public class MusicPracticeRecordController {
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/detail/{id}")
-    public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id) {
+    public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id,Boolean simpleFlag) {
 
         MusicPracticeRecordWrapper.Entity wrapper = musicPracticeRecordService.detail(id);
 
@@ -76,7 +76,7 @@ public class MusicPracticeRecordController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new com.yonge.toolset.base.exception.BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         if (cbsMusicSheet != null) {
             from.setRhythmFlag(cbsMusicSheet.getEvaluationStandard() != EEvaluationStandard.FREQUENCY);
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetCbsController.java

@@ -82,7 +82,7 @@ public class MusicSheetCbsController extends BaseController {
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetailAuth/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetailAuth(@PathVariable("id") String id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetailAuth(@PathVariable("id") String id,Boolean simpleFlag) {
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = null;
         MusicSheetDetailVo detail = musicSheetDao.detail(Long.parseLong(id));
@@ -111,7 +111,7 @@ public class MusicSheetCbsController extends BaseController {
         if (musicSheetDetail == null) {
             detail = musicSheetService.getCbsDetail(Long.parseLong(id),SourceTypeEnum.PLATFORM);
 
-            CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(detail.getCbsMusicSheetId());
+            CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(detail.getCbsMusicSheetId(), simpleFlag);
             cbsMusicSheet.setBizId(Long.parseLong(id));
             musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);
         }
@@ -164,7 +164,7 @@ public class MusicSheetCbsController extends BaseController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,Boolean simpleFlag,
                                                       @RequestParam(required = false) String tenantAlbumId,
                                                       @RequestParam(required = false) String providerType) {
 
@@ -180,7 +180,7 @@ public class MusicSheetCbsController extends BaseController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         cbsMusicSheet.setBizId(id);
 
         // 设置查询机构 还是平台数据

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/open/OpenMusicSheetCbsController.java

@@ -1,38 +1,21 @@
 package com.yonge.cooleshow.admin.controller.open;
 
 import com.alibaba.fastjson.JSON;
-import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.UserMusic;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.service.InstrumentService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.service.UserMusicService;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
-import com.yonge.cooleshow.biz.dal.wrapper.InstrumentWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 曲谱表 web 控制层
@@ -44,19 +27,9 @@ import java.util.stream.Collectors;
 @RequestMapping("${app-config.url.admin:}/open/musicSheet")
 @Api(tags = "曲谱表 API接口")
 public class OpenMusicSheetCbsController extends BaseController {
-    @Resource
-    private SysUserFeignService sysUserFeignService;
-
 	@Resource
 	private MusicSheetService musicSheetService;
 
-
-    @Autowired
-    private InstrumentService instrumentService;
-
-    @Autowired
-    private UserMusicService userMusicService;
-
     /**
      * 查询单条
      *
@@ -68,7 +41,7 @@ public class OpenMusicSheetCbsController extends BaseController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,Boolean simpleFlag,
                                                       @RequestParam(required = false) String tenantAlbumId,
                                                       @RequestParam(required = false) Long userMusicId) {
 
@@ -80,59 +53,10 @@ public class OpenMusicSheetCbsController extends BaseController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         cbsMusicSheet.setBizId(id);
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);
-//
-//
-//        MusicSheetDetailVo detail;
-//        if (userMusicId != null) {
-//            UserMusic userMusic = userMusicService.detail(userMusicId);
-//            if (userMusic == null) {
-//                throw new BizException("参数错误");
-//            } else {
-//                SysUser sysUser = sysUserFeignService.queryUserById(userMusic.getUserId());
-//                detail = musicSheetService.detail(id.toString(), sysUser, ClientEnum.SYSTEM, tenantAlbumId);
-//            }
-//        } else {
-//
-//            detail = musicSheetService.detail(id.toString(), null, ClientEnum.SYSTEM, tenantAlbumId);
-//        }
-//        if (detail != null) {
-//            // 设置曲目付费类型
-//            musicSheetDetail.setPaymentType(detail.getPaymentType());
-//            // 设置业务端曲目分类
-////            musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
-//            musicSheetDetail.setScoreType(detail.getScoreType());
-//            musicSheetDetail.setIsConvertibleScore(detail.getNotation() ==YesOrNoEnum.YES);
-//            musicSheetDetail.setPlay(detail.getPlay());
-//            musicSheetDetail.setBuyed(detail.getBuyed());
-//            musicSheetDetail.setMusicPrice(detail.getMusicPrice());
-//        }
-//
-//        // 如果是合奏 并且乐器ID = 2268
-//        musicSheetDetail.setSpecialPercussionFlag(false);
-//        if ("2268".equals(musicSheetDetail.getMusicalInstrumentIds()) && musicSheetDetail.getMusicSheetType() == EMusicSheetType.CONCERT) {
-//            musicSheetDetail.setSpecialPercussionFlag(true);
-//        }
-//
-//        // 设置乐器信息
-//        if (StringUtils.isNotBlank(musicSheetDetail.getMusicalInstrumentIds())) {
-//            List<Long> instrumentIds = Arrays.stream(musicSheetDetail.getMusicalInstrumentIds().split(","))
-//                .map(Long::parseLong).collect(Collectors.toList());
-//
-//            if (CollectionUtils.isNotEmpty(instrumentIds) && CollectionUtils.isNotEmpty(musicSheetDetail.getMusicalInstruments())) {
-//                Map<Long, InstrumentWrapper.Instrument> instrumentMap = instrumentService.getMapByIds(instrumentIds);
-//                for (CbsMusicSheetWrapper.MusicalInstrument musicalInstrument : musicSheetDetail.getMusicalInstruments()) {
-//                    InstrumentWrapper.Instrument instrument = instrumentMap.get(musicalInstrument.getId().longValue());
-//                    if (instrument != null) {
-//                        musicalInstrument.setOrientation(instrument.getOrientation());
-//                    }
-//
-//                }
-//            }
-//        }
         return R.from(musicSheetDetail);
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicPracticeRecordController.java

@@ -56,7 +56,7 @@ public class MusicPracticeRecordController {
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/detail/{id}")
-    public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id) {
+    public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id,Boolean simpleFlag) {
 
         MusicPracticeRecordWrapper.Entity wrapper = musicPracticeRecordService.detail(id);
 
@@ -81,7 +81,7 @@ public class MusicPracticeRecordController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new com.yonge.toolset.base.exception.BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         if (cbsMusicSheet != null) {
             from.setRhythmFlag(cbsMusicSheet.getEvaluationStandard() != EEvaluationStandard.FREQUENCY);
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetCbsController.java

@@ -69,7 +69,7 @@ public class MusicSheetCbsController extends BaseController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,Boolean simpleFlag,
                                                       @RequestParam(required = false) String tenantAlbumId) {
 
         SysUser sysUser = sysUserService.getUser();
@@ -81,7 +81,7 @@ public class MusicSheetCbsController extends BaseController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         cbsMusicSheet.setBizId(id);
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/open/OpenMusicSheetCbsController.java

@@ -1,43 +1,21 @@
 package com.yonge.cooleshow.student.controller.open;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.Student;
-import com.yonge.cooleshow.biz.dal.entity.UserMusic;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
-import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
-import com.yonge.cooleshow.biz.dal.wrapper.InstrumentWrapper;
-import com.yonge.cooleshow.biz.dal.wrapper.MusicSheetWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
-import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 曲谱表 web 控制层
@@ -49,19 +27,10 @@ import java.util.stream.Collectors;
 @RequestMapping("${app-config.url.student:}/open/musicSheet")
 @Api(tags = "曲谱表 API接口")
 public class OpenMusicSheetCbsController extends BaseController {
-    @Resource
-    private SysUserFeignService sysUserFeignService;
 
 	@Resource
 	private MusicSheetService musicSheetService;
 
-
-    @Autowired
-    private InstrumentService instrumentService;
-
-    @Autowired
-    private UserMusicService userMusicService;
-
     /**
      * 查询单条
      *
@@ -73,7 +42,7 @@ public class OpenMusicSheetCbsController extends BaseController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,Boolean simpleFlag,
                                                       @RequestParam(required = false) String tenantAlbumId,
                                                       @RequestParam(required = false) Long userMusicId) {
 
@@ -85,57 +54,10 @@ public class OpenMusicSheetCbsController extends BaseController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         cbsMusicSheet.setBizId(id);
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);
-//        MusicSheetDetailVo detail;
-//        if (userMusicId != null) {
-//            UserMusic userMusic = userMusicService.detail(userMusicId);
-//            if (userMusic == null) {
-//                throw new BizException("参数错误");
-//            } else {
-//                SysUser sysUser = sysUserFeignService.queryUserById(userMusic.getUserId());
-//                detail = musicSheetService.detail(id.toString(), sysUser, ClientEnum.STUDENT, tenantAlbumId);
-//            }
-//        } else {
-//
-//            detail = musicSheetService.detail(id.toString(), null, ClientEnum.STUDENT, tenantAlbumId);
-//        }
-//        if (detail != null) {
-//            // 设置曲目付费类型
-//            musicSheetDetail.setPaymentType(detail.getPaymentType());
-//            // 设置业务端曲目分类
-////            musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
-//            musicSheetDetail.setScoreType(detail.getScoreType());
-//            musicSheetDetail.setIsConvertibleScore(detail.getNotation() ==YesOrNoEnum.YES);
-//            musicSheetDetail.setPlay(detail.getPlay());
-//            musicSheetDetail.setBuyed(detail.getBuyed());
-//            musicSheetDetail.setMusicPrice(detail.getMusicPrice());
-//        }
-//
-//        // 如果是合奏 并且乐器ID = 2268
-//        musicSheetDetail.setSpecialPercussionFlag(false);
-//        if ("2268".equals(musicSheetDetail.getMusicalInstrumentIds()) && musicSheetDetail.getMusicSheetType() == EMusicSheetType.CONCERT) {
-//            musicSheetDetail.setSpecialPercussionFlag(true);
-//        }
-//
-//        // 设置乐器信息
-//        if (StringUtils.isNotBlank(musicSheetDetail.getMusicalInstrumentIds())) {
-//            List<Long> instrumentIds = Arrays.stream(musicSheetDetail.getMusicalInstrumentIds().split(","))
-//                .map(Long::parseLong).collect(Collectors.toList());
-//
-//            if (CollectionUtils.isNotEmpty(instrumentIds) && CollectionUtils.isNotEmpty(musicSheetDetail.getMusicalInstruments())) {
-//                Map<Long, InstrumentWrapper.Instrument> instrumentMap = instrumentService.getMapByIds(instrumentIds);
-//                for (CbsMusicSheetWrapper.MusicalInstrument musicalInstrument : musicSheetDetail.getMusicalInstruments()) {
-//                    InstrumentWrapper.Instrument instrument = instrumentMap.get(musicalInstrument.getId().longValue());
-//                    if (instrument != null) {
-//                        musicalInstrument.setOrientation(instrument.getOrientation());
-//                    }
-//
-//                }
-//            }
-//        }
         return R.from(musicSheetDetail);
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicPracticeRecordController.java

@@ -55,7 +55,7 @@ public class MusicPracticeRecordController {
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/detail/{id}")
-    public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id) {
+    public R<MusicPracticeRecordWrapper.MusicPracticeRecord> detail(@PathVariable("id") Long id,Boolean simpleFlag) {
 
         MusicPracticeRecordWrapper.Entity wrapper = musicPracticeRecordService.detail(id);
 
@@ -80,7 +80,7 @@ public class MusicPracticeRecordController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new com.yonge.toolset.base.exception.BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         if (cbsMusicSheet != null) {
             from.setRhythmFlag(cbsMusicSheet.getEvaluationStandard() != EEvaluationStandard.FREQUENCY);
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetCbsController.java

@@ -55,10 +55,6 @@ public class MusicSheetCbsController extends BaseController {
 	@Resource
 	private MusicSheetService musicSheetService;
     @Resource
-    private MusicFavoriteService musicFavoriteService;
-    @Resource
-    private CourseCoursewareService courseCoursewareService;
-    @Resource
     private AppVersionInfoService appVersionInfoService;
     @Resource
     private InstrumentService instrumentService;
@@ -78,7 +74,7 @@ public class MusicSheetCbsController extends BaseController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,Boolean simpleFlag,
                                                       @RequestParam(required = false) String tenantAlbumId,
                                                       @RequestParam(required = false) String providerType) {
 
@@ -91,7 +87,7 @@ public class MusicSheetCbsController extends BaseController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         cbsMusicSheet.setBizId(id);
 
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
 import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareWrapper;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
@@ -22,8 +20,6 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -46,16 +42,10 @@ public class TenantAlbumSheetController extends BaseController {
 
     @Resource
     private TenantAlbumMusicService tenantAlbumMusicService;
-
     @Resource
     private SysUserService sysUserService;
-
     @Resource
     private CoursewareFeignService coursewareFeignService;
-
-    @Resource
-    private SysUserFeignService sysUserFeignService;
-
     @Resource
     private TeacherService teacherService;
 
@@ -63,11 +53,6 @@ public class TenantAlbumSheetController extends BaseController {
     @ApiOperation(value = "查询条件")
     @PostMapping("/selectCondition")
     public HttpResponseResult<TenantAlbumMusicWrapper.TenantAlbumMusicSelectData> selectCondition(@RequestBody TenantAlbumMusicWrapper.TenantAlbumMusicSelect query) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-//        query.setUserId(user.getId());
         return succeed(tenantAlbumMusicService.getTenantAlbumMusicQuery(query));
     }
 
@@ -75,16 +60,17 @@ public class TenantAlbumSheetController extends BaseController {
     @ApiOperation(value = "分页查询")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantAlbumMusicWrapper.StudentTenantAlbumMusic>> page(@RequestBody @Validated TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        query.setUserId(sysUserService.getUserId());
+        query.setClientType(ClientEnum.TEACHER);
+        return succeed((PageUtil.pageInfo(tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query))));
+    }
 
-//        Teacher teacher = teacherService.getById(user.getId());
-//        query.setTenantId(Optional.ofNullable(teacher.getTenantId()).orElse(-1L));
-        query.setUserId(user.getId());
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/pageSimple")
+    public HttpResponseResult<PageInfo<TenantAlbumMusicWrapper.MusicSheetSimpleDto>> pageSimple(@RequestBody @Validated TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
+        query.setUserId(sysUserService.getUserId());
         query.setClientType(ClientEnum.TEACHER);
-        IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
+        IPage<TenantAlbumMusicWrapper.MusicSheetSimpleDto> page = tenantAlbumMusicService.selectPageSimple(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));
     }
 
@@ -93,13 +79,8 @@ public class TenantAlbumSheetController extends BaseController {
     @PostMapping("/getLessonCoursewareDetail")
     public HttpResponseResult<LessonCoursewareWrapper.LessonCourseware> getLessonCoursewareDetail(@RequestBody @Valid LessonCoursewareWrapper.LessonCourseQuery query){
         query.setClient(ClientEnum.TEACHER);
-//        SysUser sysUser = sysUserFeignService.queryUserInfo();
-//        if (sysUser == null || null == sysUser.getId()) {
-//            return failed("用户信息获取失败");
-//        }
         query.setUserId(sysUserService.getUserId());
-        LessonCoursewareWrapper.LessonCourseware lessonCourseware = tenantAlbumMusicService.getLessonCoursewareDetail(query);
-        return succeed(lessonCourseware);
+        return succeed(tenantAlbumMusicService.getLessonCoursewareDetail(query));
     }
 
 
@@ -135,17 +116,9 @@ public class TenantAlbumSheetController extends BaseController {
     @ApiOperation(value = "关联课程类型")
     @PostMapping("/refLevel")
     public HttpResponseResult<List<LessonCoursewareDetailWrapper.RefLevelDetailInfo>> refLevel(@RequestBody LessonCoursewareDetailWrapper.RefLevelQuery query) {
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
-        Teacher teacher = teacherService.getById(user.getId());
+        Teacher teacher = teacherService.getById(sysUserService.getUserId());
         query.setTenantId(Optional.ofNullable(teacher.getTenantId()).orElse(-1L));
-        List<LessonCoursewareDetailWrapper.RefLevelDetailInfo> result = tenantAlbumMusicService.refLevel(query);
-
-        return HttpResponseResult.succeed(result);
+        return HttpResponseResult.succeed(tenantAlbumMusicService.refLevel(query));
     }
 
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenMusicSheetCbsController.java

@@ -1,38 +1,21 @@
 package com.yonge.cooleshow.teacher.controller.open;
 
 import com.alibaba.fastjson.JSON;
-import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.template.R;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.UserMusic;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.service.InstrumentService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.service.UserMusicService;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
-import com.yonge.cooleshow.biz.dal.wrapper.InstrumentWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 曲谱表 web 控制层
@@ -44,19 +27,10 @@ import java.util.stream.Collectors;
 @RequestMapping("${app-config.url.teacher:}/open/musicSheet")
 @Api(tags = "曲谱表 API接口")
 public class OpenMusicSheetCbsController extends BaseController {
-    @Resource
-    private SysUserFeignService sysUserFeignService;
 
 	@Resource
 	private MusicSheetService musicSheetService;
 
-
-    @Autowired
-    private InstrumentService instrumentService;
-
-    @Autowired
-    private UserMusicService userMusicService;
-
     /**
      * 查询单条
      *
@@ -68,7 +42,7 @@ public class OpenMusicSheetCbsController extends BaseController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Long id,Boolean simpleFlag,
                                                       @RequestParam(required = false) String tenantAlbumId,
                                                       @RequestParam(required = false) Long userMusicId) {
         // 曲目信息
@@ -79,57 +53,10 @@ public class OpenMusicSheetCbsController extends BaseController {
         if (musicSheet.getCbsMusicSheetId() ==null) {
             throw new BizException("曲目信息异常");
         }
-        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId());
+        CbsMusicSheetWrapper.MusicSheet cbsMusicSheet = musicSheetService.cbsDetail(musicSheet.getCbsMusicSheetId(), simpleFlag);
         cbsMusicSheet.setBizId(id);
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);
-//        MusicSheetDetailVo detail;
-//        if (userMusicId != null) {
-//            UserMusic userMusic = userMusicService.detail(userMusicId);
-//            if (userMusic == null) {
-//                throw new BizException("参数错误");
-//            } else {
-//                SysUser sysUser = sysUserFeignService.queryUserById(userMusic.getUserId());
-//                detail = musicSheetService.detail(id.toString(), sysUser, ClientEnum.TEACHER, tenantAlbumId);
-//            }
-//        } else {
-//
-//            detail = musicSheetService.detail(id.toString(), null, ClientEnum.TEACHER, tenantAlbumId);
-//        }
-//        if (detail != null) {
-//            // 设置曲目付费类型
-//            musicSheetDetail.setPaymentType(detail.getPaymentType());
-//            // 设置业务端曲目分类
-////            musicSheetDetail.setBizMusicCategoryId(detail.getCategoriesId() == null ? null : detail.getCategoriesId().longValue());
-//            musicSheetDetail.setScoreType(detail.getScoreType());
-//            musicSheetDetail.setIsConvertibleScore(detail.getNotation() ==YesOrNoEnum.YES);
-//            musicSheetDetail.setPlay(detail.getPlay());
-//            musicSheetDetail.setBuyed(detail.getBuyed());
-//            musicSheetDetail.setMusicPrice(detail.getMusicPrice());
-//        }
-//
-//        // 如果是合奏 并且乐器ID = 2268
-//        musicSheetDetail.setSpecialPercussionFlag(false);
-//        if ("2268".equals(musicSheetDetail.getMusicalInstrumentIds()) && musicSheetDetail.getMusicSheetType() == EMusicSheetType.CONCERT) {
-//            musicSheetDetail.setSpecialPercussionFlag(true);
-//        }
-//
-//        // 设置乐器信息
-//        if (StringUtils.isNotBlank(musicSheetDetail.getMusicalInstrumentIds())) {
-//            List<Long> instrumentIds = Arrays.stream(musicSheetDetail.getMusicalInstrumentIds().split(","))
-//                .map(Long::parseLong).collect(Collectors.toList());
-//
-//            if (CollectionUtils.isNotEmpty(instrumentIds) && CollectionUtils.isNotEmpty(musicSheetDetail.getMusicalInstruments())) {
-//                Map<Long, InstrumentWrapper.Instrument> instrumentMap = instrumentService.getMapByIds(instrumentIds);
-//                for (CbsMusicSheetWrapper.MusicalInstrument musicalInstrument : musicSheetDetail.getMusicalInstruments()) {
-//                    InstrumentWrapper.Instrument instrument = instrumentMap.get(musicalInstrument.getId().longValue());
-//                    if (instrument != null) {
-//                        musicalInstrument.setOrientation(instrument.getOrientation());
-//                    }
-//
-//                }
-//            }
-//        }
         return R.from(musicSheetDetail);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantAlbumMusicMapper.java

@@ -42,4 +42,7 @@ public interface TenantAlbumMusicMapper extends BaseMapper<TenantAlbumMusic> {
     List<TenantAlbumMusic> getList(@Param("param") TenantAlbumMusicWrapper.TenantAlbumMusicSelect query, @Param("albumIds") List<Long> albumIds);
 
     List<Long> getTenantAlbumMusicIdsByIds(@Param("tenantAlbumIds") List<Long> tenantAlbumIds, @Param("subjectTypes") List<SubjectTypeEnum> subjectTypes);
+
+	List<TenantAlbumMusicWrapper.MusicSheetSimpleDto> selectPageSimple(@Param("page") IPage<TenantAlbumMusicWrapper.MusicSheetSimpleDto> page,
+																		   @Param("param") TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetService.java

@@ -422,13 +422,15 @@ public interface MusicSheetService extends IService<MusicSheet> {
 
     List<CbsMusicSheetWrapper.MusicSheetApplication> queryCbsMusicSheetApplication(CbsMusicSheetWrapper.MusicSheetApplicationQuery query);
 
+    List<CbsMusicSheetWrapper.MusicSheetApplicationSimple> queryCbsMusicSheetApplicationSimple(CbsMusicSheetWrapper.MusicSheetApplicationQuery query);
+
     IPage<MusicSheetVo> queryTenantRelatedList(IPage<Object> page, MusicSheetRelatedQueryInfo queryInfo);
 
     com.microsvc.toolkit.common.response.paging.PageInfo<MusicSheetWrapper.MusicSheetApplication> tenantPage(CbsMusicSheetWrapper.MusicSheetApplicationQuery query);
 
     void delPractice(Long musicSheetId,Long userId,ClientEnum clientEnum);
 
-    CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId);
+    CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId,Boolean simpleFlag);
 
     IPage<MusicSheetWrapper.MusicSheetCloud> cloudPage(MusicSheetWrapper.MusicSheetCloudQuery query);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantAlbumMusicService.java

@@ -32,7 +32,11 @@ public interface TenantAlbumMusicService extends IService<TenantAlbumMusic>  {
      * @return IPage<TenantAlbumMusic>
      */
     IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> selectPage(IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page, TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query);
-	
+
+
+    IPage<TenantAlbumMusicWrapper.MusicSheetSimpleDto> selectPageSimple(IPage<TenantAlbumMusicWrapper.MusicSheetSimpleDto> page, TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query);
+
+
     /**
      * 添加
      * @param tenantAlbumMusic TenantAlbumMusicWrapper.TenantAlbumMusic

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -2607,6 +2607,20 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     }
 
     @Override
+    public List<CbsMusicSheetWrapper.MusicSheetApplicationSimple> queryCbsMusicSheetApplicationSimple(CbsMusicSheetWrapper.MusicSheetApplicationQuery query) {
+        R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMusicSheetWrapper.MusicSheetApplicationSimple>> pageInfoR =
+                musicFeignClientService.musicSheetPageByApplicationSimple(query);
+        if(pageInfoR.getCode() != 200){
+            throw new BizException("获取曲目信息失败");
+        }
+        com.microsvc.toolkit.common.response.paging.PageInfo<CbsMusicSheetWrapper.MusicSheetApplicationSimple> pageInfo = pageInfoR.getData();
+        if(pageInfo != null && CollectionUtils.isNotEmpty(pageInfo.getRows())){
+            return pageInfo.getRows();
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
     public IPage<MusicSheetVo> queryTenantRelatedList(IPage<Object> page, MusicSheetRelatedQueryInfo queryInfo) {
 
         MusicSheet musicSheet = musicSheetDao.get(queryInfo.getMusicSheetId());
@@ -2664,12 +2678,18 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
      * @return CbsMusicSheetWrapper.MusicSheet
      */
     @Override
-    public CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId) {
+    public CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId,Boolean simpleFlag) {
         try {
 
             R<CbsMusicSheetWrapper.MusicSheet> musicSheetR = musicFeignClientService.musicSheetDetail(cbsMusicSheetId , applicationId);
 
-            return musicSheetR.feignData();
+            CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetR.feignData();
+            if(simpleFlag!= null && simpleFlag){
+                musicSheet.setExtConfigJson(null);
+                musicSheet.setExtStyleConfigJson(null);
+                musicSheet.setExtJianStyleConfigJson(null);
+            }
+            return musicSheet;
         } catch (Exception e) {
             log.error("调用音乐服务异常", e);
             throw new BizException("内容平台服务异常");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -250,6 +251,30 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         return page.setRecords(musicSheets);
     }
 
+    @Override
+    public IPage<TenantAlbumMusicWrapper.MusicSheetSimpleDto> selectPageSimple(IPage<TenantAlbumMusicWrapper.MusicSheetSimpleDto> page, TenantAlbumMusicWrapper.StudentTenantAlbumMusicQuery query) {
+        List<TenantAlbumMusicWrapper.MusicSheetSimpleDto> musicSheets = tenantAlbumMusicMapper.selectPageSimple(page, query);
+        if (CollectionUtils.isEmpty(musicSheets)) {
+            return page.setRecords(musicSheets);
+        }
+        CbsMusicSheetWrapper.MusicSheetApplicationQuery cbsQuery = musicSheetService.getMusicSheetApplicationQuery(SourceTypeEnum.TENANT);
+        List<Long> cbsMusicSheetIds = musicSheets.stream().map(e -> Long.parseLong(e.getCbsMusicSheetId())).collect(Collectors.toList());
+        cbsQuery.setMusicSheetIds(cbsMusicSheetIds);
+        cbsQuery.setRows(cbsMusicSheetIds.size());
+        List<CbsMusicSheetWrapper.MusicSheetApplicationSimple> applications = musicSheetService.queryCbsMusicSheetApplicationSimple(cbsQuery);
+        if(CollectionUtils.isNotEmpty(applications)){
+            Map<Long, CbsMusicSheetWrapper.MusicSheetApplicationSimple> musicSheetApplicationMap = applications
+                    .stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplicationSimple::getId, Function.identity()));
+            for (TenantAlbumMusicWrapper.MusicSheetSimpleDto record : musicSheets) {
+                CbsMusicSheetWrapper.MusicSheetApplicationSimple simple = musicSheetApplicationMap.get(Long.parseLong(record.getCbsMusicSheetId()));
+                record.setAudioFileUrl(simple.getAudioFileUrl());
+                record.setName(simple.getName());
+                record.setTitleImg(simple.getTitleImg());
+            }
+        }
+        return page.setRecords(musicSheets);
+    }
+
     /**
      * 添加
      * @param tenantAlbumMusic TenantAlbumMusicWrapper.TenantAlbumMusic

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/LessonCoursewareWrapper.java

@@ -98,6 +98,9 @@ public class LessonCoursewareWrapper {
         @ApiModelProperty("课程计划详情编号")
         private String coursewareDetailId;
 
+        @ApiModelProperty("课时目标描述")
+        private String lessonTargetDesc;
+
         // 课件名称
         @ApiModelProperty("课件详情名称")
         private String coursewareDetailName;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -209,6 +209,26 @@ public class TenantAlbumMusicWrapper {
 
     }
 
+
+    @Data
+    public static class MusicSheetSimpleDto{
+
+        @ApiModelProperty("主键")
+        private Long id;
+
+        @ApiModelProperty("内容平台曲目ID")
+        private String cbsMusicSheetId;
+
+        @ApiModelProperty("曲目封面图")
+        private String titleImg;
+
+        @ApiModelProperty("曲目名称")
+        private String name;
+
+        @ApiModelProperty("音频文件")
+        private String audioFileUrl;
+    }
+
     @Data
     @Builder
     @NoArgsConstructor

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -62,6 +62,43 @@
         </where>
         order by t.sort_number_
 	</select>
+    <select id="selectPageSimple" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper$MusicSheetSimpleDto">
+		SELECT
+        m.id_ as id,
+        m.cbs_music_sheet_id_ as cbsMusicSheetId
+		FROM music_sheet m
+        left join tenant_album_music t on t.music_sheet_id_ = m.id_
+        <where>
+            find_in_set('TENANT',m.provider_type_) and
+            m.tenant_state_ = true and m.tenant_del_flag_ = 0 and t.del_flag_ = 0 AND m.cbs_music_sheet_id_ IS NOT NULL
+            <if test="param.subjectId != null" >
+                and (find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '' OR m.is_all_subject_)
+            </if>
+            <if test="param.subjectType != null">
+                and t.subject_type_ = #{param.subjectType}
+            </if>
+            <if test="param.level != null and param.level != ''">
+                and t.level_ = #{param.level}
+            </if>
+            <if test="param.type != null and param.type != ''">
+                and t.type_ = #{param.type}
+            </if>
+            <if test="param.albumId != null">
+                and t.tenant_album_id_ = #{param.albumId}
+            </if>
+            <if test="param.categoryIds != null and param.categoryIds.size() != 0">
+                and m.tenant_category_id_ in
+                <foreach collection="param.categoryIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="param.keyword != null and param.keyword != ''">
+                and m.music_sheet_name_ LIKE CONCAT('%',#{param.keyword},'%')
+            </if>
+        </where>
+        order by t.sort_number_
+	</select>
     <select id="selectMusicSheetIds" resultType="java.lang.Long">
         select
         t.music_sheet_id_

pom.xml

@@ -23,7 +23,7 @@
 		<google.zxing.version>3.4.0</google.zxing.version>
 		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
-		<cbs.version>1.0.25</cbs.version>
+		<cbs.version>1.0.26</cbs.version>
 		<microsvc.version>1.1.4</microsvc.version>
 	</properties>