Procházet zdrojové kódy

修复官网老师端我的曲谱未返回

Eric před 2 roky
rodič
revize
4188c01bf4

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
 
 
+import java.io.File;
 import java.util.Date;
 import java.util.Date;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
@@ -87,15 +88,21 @@ public class MusicSheetController extends BaseController {
      */
      */
     @GetMapping("/my")
     @GetMapping("/my")
     @ApiOperation(value = "学生-我的单曲")
     @ApiOperation(value = "学生-我的单曲")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(QueryInfo query) {
+    public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(@ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "STUDENT") String clientType,
+                                                              QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null  || sysUser.getId() == null) {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
             return failed("用户信息获取失败");
         }
         }
+
+        if (ClientEnum.invalid(clientType)) {
+            return failed("无效的客户端类型");
+        }
+
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setStudentId(sysUser.getId());
         search.setAuditStatus(AuthStatusEnum.PASS);
         search.setAuditStatus(AuthStatusEnum.PASS);
-        search.setUserType(ClientEnum.STUDENT);
+        search.setUserType(ClientEnum.valueOf(clientType));
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
     }