Merge branch 'dev_v1.3.6_20221021' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.6_20221021

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

@@ -130,6 +130,7 @@ public class MusicSheetController extends BaseController {
         musicSheetDto.setDelFlag(false);
         musicSheetDto.setSourceType(SourceTypeEnum.PLATFORM);
 
+        musicSheetDto.setFavoriteCount(0);
         musicSheetDto.setCreateBy(sysUser.getId());
         musicSheetDto.setCreateTime(new Date());
         musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());

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

@@ -113,6 +113,7 @@ public class MusicSheetController extends BaseController {
         musicSheetDto.setSubmitAuditTime(new Date());
         musicSheetDto.setSourceType(SourceTypeEnum.TEACHER);
 
+        musicSheetDto.setFavoriteCount(0);
         musicSheetDto.setCreateBy(sysUser.getId());
         musicSheetDto.setCreateTime(new Date());
         musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/StudentController.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.teacher.controller;
 
-import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.util.StringUtil;
@@ -22,7 +22,7 @@ public class StudentController extends BaseController {
 
     @ApiOperation(value = "查询指定学员信息-融云token")
     @GetMapping("/queryUserById")
-    public HttpResponseResult<Student> queryUserById(String rongCloudUserId) {
+    public HttpResponseResult<StudentVo> queryUserById(String rongCloudUserId) {
 
         if (StringUtil.isEmpty(rongCloudUserId)) {
             return failed("用户信息获取失败");

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.teacher.controller.open;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicImgDto;
 import com.yonge.cooleshow.biz.dal.dto.search.ShareProfitParam;
 import com.yonge.cooleshow.biz.dal.entity.SysConfig;
 import com.yonge.cooleshow.biz.dal.service.*;
@@ -51,6 +52,14 @@ public class OpenShareController extends BaseController {
     @Autowired
     private MusicAlbumService musicAlbumService;
 
+
+
+    @ApiOperation(value = "新增曲谱渲染图")
+    @PostMapping(value="/music/sheet/img")
+    public HttpResponseResult<Boolean> img(@RequestBody @Valid MusicImgDto musicImgDto) {
+        return succeed(musicSheetService.updateMusicImg(musicImgDto.getMusicImg(),musicImgDto.getMusicSheetId()));
+    }
+
     /**
      * 服务对象
      */

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

@@ -179,6 +179,7 @@ public class MusicSheetController extends BaseController {
         musicSheetDto.setSubmitAuditTime(new Date());
         musicSheetDto.setSourceType(SourceTypeEnum.TEACHER);
 
+        musicSheetDto.setFavoriteCount(0);
         musicSheetDto.setCreateBy(sysUser.getId());
         musicSheetDto.setCreateTime(new Date());
         musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());

service.md

@@ -3,7 +3,7 @@
 - [x] admin-server
 - [x] teacher-server
 - [x] student-server
-- [ ] website-server
+- [x] website-server
 - [ ] task-server
 - [ ] websocket-server
 - [ ] audio-analysis