add:曲目和专辑

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicFavoriteDao.java

@@ -2,13 +2,22 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * MusicFavoriteDao数据库访问类
+ *
  * @author yzp
- * @date 2022-03-25 23:46:28
  * @version v1.0
+ * @date 2022-03-25 23:46:28
  **/
 public interface MusicFavoriteDao extends BaseMapper<MusicFavorite> {
 
+    /**
+     * 曲目收藏数
+     *
+     * @param musicSheetId 曲目id
+     * @return
+     */
+    long selectMusicSheetFavoriteNum(@Param("musicSheetId") Long musicSheetId);
 }

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

@@ -21,4 +21,12 @@ public interface MusicFavoriteService extends IService<MusicFavorite> {
      * @return list
      */
     List<MusicFavorite> getFavorite(Long userId, Long musicSheetId);
+
+    /**
+     * 获取曲目收藏数量
+     *
+     * @param musicSheetId 曲目id
+     * @return
+     */
+    long getMusicSheetFavoriteNum(Long musicSheetId);
 }

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

@@ -234,4 +234,13 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param userId 导入人id
      */
     void importExcel(List<ExcelDataReaderProperty<MusicSheetExport>> dataList, Long userId);
+
+    /**
+     * 官网曲目详情
+     *
+     * @param musicSheetId 曲目id
+     * @param sysUser
+     * @return
+     */
+    MusicSheetWebsiteDetailVo websiteDetail(Long musicSheetId, SysUser sysUser);
 }

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

@@ -38,4 +38,10 @@ public class MusicFavoriteServiceImpl extends ServiceImpl<MusicFavoriteDao,Music
                    .list();
 
     }
+
+    @Override
+    public long getMusicSheetFavoriteNum(Long musicSheetId) {
+        return  baseMapper.selectMusicSheetFavoriteNum(musicSheetId);
+
+    }
 }

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

@@ -95,6 +95,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     @Autowired
     private SubjectService subjectService;
 
+    @Autowired
+    private TeacherService teacherService;
+
+    @Autowired
+    private StudentStarService studentStarService;
+
     public MusicSheetDao getDao() {
         return musicSheetDao;
     }
@@ -176,6 +182,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (detail == null) {
             throw new BizException("未找到曲目信息");
         }
+        if (sysUser == null) {
+            return detail;
+        }
         if (ChargeTypeEnum.FREE.getCode().equals(detail.getChargeType().getCode())) {
             detail.setPlay(YesOrNoEnum.YES);
         }  else if (SysUserType.STUDENT.getCode().equals(userType.getCode())) {
@@ -201,8 +210,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         } else {
             detail.setPlay(YesOrNoEnum.YES);
         }
-        // 学生进入云教练练习，添加一条练习记录
-        musicSheetPracticeRecordService.addRecord(id,sysUser.getId());
+        if (SysUserType.STUDENT.getCode().equals(userType.getCode())) {
+            // 学生进入云教练练习，添加一条练习记录
+            musicSheetPracticeRecordService.addRecord(id, sysUser.getId());
+        }
         return detail;
     }
 
@@ -719,6 +730,53 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
 
     }
 
+    @Override
+    public MusicSheetWebsiteDetailVo websiteDetail(Long musicSheetId, SysUser sysUser) {
+        MusicSheetDetailVo detail = detail(musicSheetId, null, null);
+        MusicSheetWebsiteDetailVo musicSheetWebsiteDetailVo = new MusicSheetWebsiteDetailVo();
+        BeanUtils.copyProperties(detail,musicSheetWebsiteDetailVo);
+
+        // 曲目收藏数
+        long musicSheetFavoriteNum = musicFavoriteService.getMusicSheetFavoriteNum(musicSheetId);
+        musicSheetWebsiteDetailVo.setFavoriteNum(musicSheetFavoriteNum);
+
+        // 老师信息
+        TeacherVo teacherVo = teacherService.detail(detail.getUserId());
+        TeacherMusicSheetListVo teacherMusicSheetListVo = new TeacherMusicSheetListVo();
+        teacherMusicSheetListVo.setUserAvatar(teacherVo.getAvatar());
+        teacherMusicSheetListVo.setUserName(teacherVo.getUsername());
+        teacherMusicSheetListVo.setUserId(teacherVo.getUserId());
+        teacherMusicSheetListVo.setEntryFlag(teacherVo.getEntryFlag());
+        teacherMusicSheetListVo.setMusicianFlag(teacherVo.getMusicianFlag());
+
+        if (sysUser != null) {
+            // 老师关注
+            StudentStar studentStar = studentStarService.getByStudentIdAndTeacherId(sysUser.getId(), teacherVo.getUserId());
+            if (studentStar != null) {
+                teacherMusicSheetListVo.setStar(YesOrNoEnum.YES);
+            }
+
+            // 曲目收藏
+            List<MusicFavorite> favorite = musicFavoriteService.getFavorite(sysUser.getId(), detail.getId());
+            if (!CollectionUtils.isEmpty(favorite)) {
+                musicSheetWebsiteDetailVo.setFavorite(YesOrNoEnum.YES);
+            }
+        }
+
+        // 老师的曲目
+        MusicSheetSearch musicSheetSearch = new MusicSheetSearch();
+        musicSheetSearch.setCreateBy(teacherVo.getUserId());
+        musicSheetSearch.setState(YesOrNoEnum.YES);
+        musicSheetSearch.setAuditStatus(AuthStatusEnum.PASS);
+        musicSheetSearch.setPage(1);
+        musicSheetSearch.setRows(5);
+        List<MusicSheetVo> musicSheetVos = baseMapper.selectPage(PageUtil.getPage(musicSheetSearch), musicSheetSearch);
+        teacherMusicSheetListVo.setMusicSheetList(musicSheetVos);
+
+        musicSheetWebsiteDetailVo.setTeacher(teacherMusicSheetListVo);
+        return musicSheetWebsiteDetailVo;
+    }
+
     private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
                        .map(sysUserFeignService::queryUserById)

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

@@ -4,6 +4,8 @@ import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 /**
  * Description 专辑详情展示信息
  *
@@ -42,6 +44,27 @@ public class AlbumDetailVo {
     @ApiModelProperty("收藏数量")
     private Integer albumFavoriteCount;
 
+    @ApiModelProperty("热门专辑")
+    private List<MusicAlbumVo> hotMusicAlbum;
+
+    @ApiModelProperty("相关专辑")
+    private List<MusicAlbumVo> relatedMusicAlbum;
+
+    public List<MusicAlbumVo> getHotMusicAlbum() {
+        return hotMusicAlbum;
+    }
+
+    public void setHotMusicAlbum(List<MusicAlbumVo> hotMusicAlbum) {
+        this.hotMusicAlbum = hotMusicAlbum;
+    }
+
+    public List<MusicAlbumVo> getRelatedMusicAlbum() {
+        return relatedMusicAlbum;
+    }
+
+    public void setRelatedMusicAlbum(List<MusicAlbumVo> relatedMusicAlbum) {
+        this.relatedMusicAlbum = relatedMusicAlbum;
+    }
 
     public Integer getMusicSheetCount() {
         return musicSheetCount;

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

@@ -0,0 +1,47 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-04-01
+ */
+public class MusicSheetWebsiteDetailVo extends MusicSheetDetailVo {
+
+    @ApiModelProperty("收藏数")
+    private Long favoriteNum;
+
+    @ApiModelProperty("是否已收藏  0：否 1：是")
+    private YesOrNoEnum favorite = YesOrNoEnum.NO;
+
+    @ApiModelProperty("老师信息")
+    private TeacherMusicSheetListVo teacher;
+
+    public YesOrNoEnum getFavorite() {
+        return favorite;
+    }
+
+    public void setFavorite(YesOrNoEnum favorite) {
+        this.favorite = favorite;
+    }
+
+    public Long getFavoriteNum() {
+        return favoriteNum;
+    }
+
+    public void setFavoriteNum(Long favoriteNum) {
+        this.favoriteNum = favoriteNum;
+    }
+
+    public TeacherMusicSheetListVo getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(TeacherMusicSheetListVo teacher) {
+        this.teacher = teacher;
+    }
+}
+

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

@@ -0,0 +1,109 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 官网曲目详情老师和老师拥有的曲目信息
+ *
+ * @author liujunchi
+ * @date 2022-06-14
+ */
+@ApiModel("官网曲目详情老师和老师拥有的曲目信息")
+public class TeacherMusicSheetListVo {
+
+    @ApiModelProperty("老师id")
+    private Long userId;
+
+    @ApiModelProperty("上传老师名称")
+    private String userName;
+
+    @ApiModelProperty("上传用户头像")
+    private String userAvatar;
+
+    @ApiModelProperty("老师入驻  0 否 1 是 ")
+    private YesOrNoEnum entryFlag;
+
+    @ApiModelProperty("音乐人  0 否 1 是 ")
+    private YesOrNoEnum musicianFlag;
+
+    @ApiModelProperty("粉丝数")
+    private Long fansNum;
+
+    @ApiModelProperty("是否关注 0 ： 否 1：是")
+    private YesOrNoEnum star = YesOrNoEnum.NO;
+
+    @ApiModelProperty("老师曲目 默认最新的5个")
+    private List<MusicSheetVo> musicSheetList;
+
+    public YesOrNoEnum getStar() {
+        return star;
+    }
+
+    public void setStar(YesOrNoEnum star) {
+        this.star = star;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserAvatar() {
+        return userAvatar;
+    }
+
+    public void setUserAvatar(String userAvatar) {
+        this.userAvatar = userAvatar;
+    }
+
+    public YesOrNoEnum getEntryFlag() {
+        return entryFlag;
+    }
+
+    public void setEntryFlag(YesOrNoEnum entryFlag) {
+        this.entryFlag = entryFlag;
+    }
+
+    public YesOrNoEnum getMusicianFlag() {
+        return musicianFlag;
+    }
+
+    public void setMusicianFlag(YesOrNoEnum musicianFlag) {
+        this.musicianFlag = musicianFlag;
+    }
+
+    public Long getFansNum() {
+        return fansNum;
+    }
+
+    public void setFansNum(Long fansNum) {
+        this.fansNum = fansNum;
+    }
+
+    public List<MusicSheetVo> getMusicSheetList() {
+        return musicSheetList;
+    }
+
+    public void setMusicSheetList(List<MusicSheetVo> musicSheetList) {
+        this.musicSheetList = musicSheetList;
+    }
+}

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

@@ -15,6 +15,9 @@
 		id_, user_id_, music_sheet_id_, favorite_time_, favorite_flag_
 	</sql>
 
-
-
+	<select id="selectMusicSheetFavoriteNum" resultType="long">
+		select count(1)
+		from music_favorite
+		where music_sheet_id_ = #{musicSheetId}
+    </select>
 </mapper>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicAlbumController.java

@@ -40,16 +40,10 @@ public class MusicAlbumController extends BaseController {
 	@Autowired
 	private MusicAlbumService musicAlbumService;
 
-    @Autowired
-    private AppVersionInfoService appVersionInfoService;
 
     @ApiOperation(value = "热门专辑", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> list(@RequestBody MusicAlbumSearch query) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
 
         // 检查app版本
         query.setAuditVersion(YesOrNoEnum.NO);
@@ -67,14 +61,29 @@ public class MusicAlbumController extends BaseController {
     @ApiOperation(value = "专辑详情",httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumDetailVo> detail(@Valid @RequestBody MusicAlbumDetailSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
+        YesOrNoEnum favorite = YesOrNoEnum.NO;
+        if (sysUser != null && sysUser.getId() != null) {
+            favorite = musicAlbumService.checkFavorite(sysUser.getId(),query.getId() );
         }
         query.setType(2);
         query.setState(YesOrNoEnum.YES);
-        YesOrNoEnum yesOrNoEnum = musicAlbumService.checkFavorite(sysUser.getId(),query.getId() );
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query), query);
-        albumDetailVo.setFavorite(yesOrNoEnum);
+        albumDetailVo.setFavorite(favorite);
+
+        // 热门专辑
+        MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
+        musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
+        musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
+        musicAlbumSearch.setSortBy(1);
+        musicAlbumSearch.setPage(1);
+        musicAlbumSearch.setRows(4);
+        IPage<MusicAlbumVo> hotMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
+        albumDetailVo.setHotMusicAlbum(hotMusicAlbum.getRecords());
+
+        // 相关专辑
+        musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
+        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch);
+        albumDetailVo.setRelatedMusicAlbum(relatedMusicAlbum.getRecords());
         return succeed(albumDetailVo);
     }
 
@@ -97,7 +106,7 @@ public class MusicAlbumController extends BaseController {
      * 专辑收藏
      */
     @GetMapping("/favorite")
-    @ApiOperation(value = "收藏专辑列表")
+    @ApiOperation(value = "学生-收藏专辑列表")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> favoriteAlbum(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -2,24 +2,26 @@ package com.yonge.cooleshow.website.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.auth.api.enums.SysUserType;
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.biz.dal.vo.AlbumAndSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetWebsiteDetailVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.base.page.QueryInfo;
-import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Date;
 
 /**
  * 曲谱表 web 控制层
@@ -47,29 +50,23 @@ public class MusicSheetController extends BaseController {
     @Autowired
     private MusicAlbumService musicAlbumService;
 
-    @Autowired
-    private AppVersionInfoService appVersionInfoService;
-
     /**
      * 查询单条
      */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入musicTag")
-    public HttpResponseResult<MusicSheetDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
+    public HttpResponseResult<MusicSheetWebsiteDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(musicSheetService.detail(id, sysUser, SysUserType.STUDENT));
+        MusicSheetWebsiteDetailVo detail = musicSheetService.websiteDetail(id,sysUser);
+
+        return succeed(detail);
     }
 
-    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "首页曲目分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody StudentMusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
+
         // 检查app版本
         query.setAuditVersion(YesOrNoEnum.NO);
 
@@ -77,7 +74,9 @@ public class MusicSheetController extends BaseController {
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
         query.setAuditStatus(AuthStatusEnum.PASS);
-        query.setStudentId(sysUser.getId());
+        if (sysUser != null) {
+            query.setStudentId(sysUser.getId());
+        }
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
@@ -87,15 +86,14 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/albumAndSheetList", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumAndSheetVo> albumAndSheetList(@RequestBody StudentMusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
 
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
         query.setAuditVersion(YesOrNoEnum.NO);
         query.setAuditStatus(AuthStatusEnum.PASS);
-        query.setStudentId(sysUser.getId());
+        if (sysUser != null) {
+            query.setStudentId(sysUser.getId());
+        }
         query.setRows(query.getSheetRow());
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
 
@@ -134,7 +132,7 @@ public class MusicSheetController extends BaseController {
      * 我的单曲，收藏单曲
      */
     @GetMapping("/my")
-    @ApiOperation(value = "我的单曲")
+    @ApiOperation(value = "学生-我的单曲")
     public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
@@ -153,7 +151,7 @@ public class MusicSheetController extends BaseController {
      * 我的单曲，收藏单曲
      */
     @GetMapping("/favorite")
-    @ApiOperation(value = "收藏单曲")
+    @ApiOperation(value = "学生-收藏单曲")
     public HttpResponseResult<PageInfo<MusicSheetVo>> favoriteMusic(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
@@ -167,61 +165,44 @@ public class MusicSheetController extends BaseController {
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
 
-
-    /**
-     * 最近练习
-     */
-    @GetMapping("/practice")
-    @ApiOperation(value = "最近练习")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> practiceMusic(QueryInfo query) {
+    @ApiOperation(value = "老师曲目分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/teacher/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-        StudentMusicSheetSearch search = new StudentMusicSheetSearch();
-        search.setStudentId(sysUser.getId());
-        search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
-        IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(query),search);
-        return succeed(PageUtil.pageInfo(sheetVoIPage));
-    }
-
-
-    /**
-     * 检查实名认证
-     */
-    @GetMapping("/realNameAuth/check")
-    @ApiOperation(value = "检查实名认证")
-    public HttpResponseResult<CheckVo> realNameAuthCheck() {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
+        // 设置只查老师用户 状态为启用
+        query.setCreateBy(sysUser.getId());
+        if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {
+            query.setState(YesOrNoEnum.YES);
         }
 
-        CheckVo checkVo = new CheckVo();
-        if (StringUtil.isEmpty(sysUser.getIdCardNo())) {
-            checkVo.setCheck(YesOrNoEnum.NO);
-        }  else {
-            checkVo.setCheck(YesOrNoEnum.YES);
-        }
-        return succeed(checkVo);
+        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
 
-
-    /**
-     * 实名认证
-     */
-    @PostMapping(value = "/realNameAuth" ,consumes="application/json", produces="application/json")
-    @ApiOperation(value = "实名认证", httpMethod="POST",consumes="application/json", produces="application/json")
-    public HttpResponseResult<IdcardInfoExtractor> realNameAuth(@Valid @RequestBody RealnameAuthReq realNameAuthDto) {
+    @ApiOperation(value = "老师新增曲目", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
-        return sysUserFeignService.realNameAuth(realNameAuthDto);
-    }
-
+        if (ChargeTypeEnum.CHARGE.getCode().equals(musicSheetDto.getChargeType().getCode())
+                && musicSheetDto.getMusicPrice()==null){
+            return failed("此曲谱为收费曲谱，需要提供价格");
+        }
 
+        musicSheetDto.setUserId(sysUser.getId());
+        musicSheetDto.setAuditStatus(AuthStatusEnum.DOING);
+        musicSheetDto.setSubmitAuditTime(new Date());
+        musicSheetDto.setSourceType(SourceTypeEnum.TEACHER);
 
+        musicSheetDto.setCreateBy(sysUser.getId());
+        musicSheetDto.setCreateTime(new Date());
+        musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());
+        return succeed("新增曲谱成功");
+    }
 }

pom.xml

@@ -114,12 +114,6 @@
 				<artifactId>mall-mbg</artifactId>
 				<version>${project.cooleshow.version}</version>
 			</dependency>
-			<!--mall安全模块-->
-			<dependency>
-				<groupId>com.yonge.cooleshow</groupId>
-				<artifactId>mall-security</artifactId>
-				<version>${project.cooleshow.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>com.alibaba.cloud</groupId>
 				<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>