曲目详情新增字段代码还原

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

@@ -6,45 +6,32 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.AppMusicSheetVo;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
-import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.entity.CourseCourseware;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.UserTenantAlbumRecord;
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.MusicSortType;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.vo.*;
+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.biz.dal.wrapper.MusicSheetWrapper;
-import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
-import com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper;
 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.base.page.QueryInfo;
-import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
-import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
-import io.swagger.annotations.*;
+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 javax.validation.Valid;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -62,8 +49,6 @@ public class MusicSheetCbsController extends BaseController {
     private SysUserService sysUserService;
 	@Resource
 	private MusicSheetService musicSheetService;
-	@Resource
-	private MusicFavoriteService musicFavoriteService;
     @Resource
     private AppVersionInfoService appVersionInfoService;
     @Resource
@@ -112,14 +97,6 @@ public class MusicSheetCbsController extends BaseController {
             musicSheetDetail.setBuyed(detail.getBuyed());
             musicSheetDetail.setMusicPrice(detail.getMusicPrice());
         }
-        musicSheetDetail.setFavoriteCount(musicSheet.getFavoriteCount());
-        //获取曲目专辑数量
-        musicSheetDetail.setAlbumNums(musicSheetService.getDao().selectMusicAlbumNum(id));
-        musicSheetDetail.setExquisiteFlag(musicSheet.getExquisiteFlag());
-        musicSheetDetail.setMusicSubject(musicSheet.getMusicSubject());
-        musicSheetDetail.setUserId(musicSheet.getCreateBy());
-        musicSheetDetail.setAuditStatus(musicSheet.getAuditStatus());
-        musicSheetDetail.setFavorite(musicFavoriteService.checkFavorite(id,sysUser.getId(),ClientEnum.STUDENT,null));
         // 如果是合奏 并且乐器ID = 2268
         musicSheetDetail.setSpecialPercussionFlag(false);
         if ("2268".equals(musicSheetDetail.getMusicalInstrumentIds()) && musicSheetDetail.getMusicSheetType() == EMusicSheetType.CONCERT) {

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

@@ -7,7 +7,6 @@ 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.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.CourseCourseware;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
@@ -106,22 +105,6 @@ public class MusicSheetCbsController extends BaseController {
             musicSheetDetail.setBuyed(detail.getBuyed());
             musicSheetDetail.setMusicPrice(detail.getMusicPrice());
         }
-        //获取曲目专辑数量
-        musicSheetDetail.setAlbumNums(musicSheetService.getDao().selectMusicAlbumNum(id));
-        musicSheetDetail.setExquisiteFlag(musicSheet.getExquisiteFlag());
-        musicSheetDetail.setMusicSubject(musicSheet.getMusicSubject());
-        musicSheetDetail.setUserId(musicSheet.getCreateBy());
-        musicSheetDetail.setAuditStatus(musicSheet.getAuditStatus());
-        musicSheetDetail.setFavorite(musicFavoriteService.checkFavorite(id,sysUser.getId(),ClientEnum.STUDENT,null));
-        CourseCourseware one = courseCoursewareService.lambdaQuery()
-                .eq(CourseCourseware::getMusicSheetId, id)
-                .eq(CourseCourseware::getClientType, ClientEnum.TEACHER)
-                .eq(CourseCourseware::getUserId, sysUser.getId())
-                .eq(CourseCourseware::getDelFlag, false).last("limit 1").one();
-        if (one != null) {
-            musicSheetDetail.setCoursewareStatus(YesOrNoEnum.YES);
-            musicSheetDetail.setCoursewareId(one.getId());
-        }
 
         // 如果是合奏 并且乐器ID = 2268
         musicSheetDetail.setSpecialPercussionFlag(false);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetVo.java

@@ -2,8 +2,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -84,33 +82,6 @@ public class MusicSheetVo extends MusicSheet {
         @ApiModelProperty(value = "曲谱价格")
         private java.math.BigDecimal musicPrice;  //曲谱价格
 
-        @ApiModelProperty(value = "收藏数")
-        private Integer favoriteCount;
-
-        @ApiModelProperty("单曲专辑数")
-        private Long albumNums;
-
-        @ApiModelProperty(value = "精品标志(0:否;1:是)")
-        private YesOrNoEnum exquisiteFlag;
-
-        @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
-        private String musicSubject;
-
-        @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
-        private Long userId;
-
-        @ApiModelProperty(value = "是否收藏")
-        private YesOrNoEnum favorite;
-
-        @ApiModelProperty(value = "是否添加课件")
-        private YesOrNoEnum coursewareStatus = YesOrNoEnum.NO;
-
-        @ApiModelProperty(value = "课件编号")
-        private Long coursewareId;
-
-        @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
-        private AuthStatusEnum auditStatus;
-
     }
 
 }