소스 검색

酷乐秀曲目来源改为内容平台

zouxuan 1 년 전
부모
커밋
7acb38debb
1개의 변경된 파일16개의 추가작업 그리고 11개의 파일을 삭제
  1. 16 11
      cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

+ 16 - 11
cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -6,6 +6,7 @@ import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
@@ -14,7 +15,9 @@ import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
 import com.yonge.cooleshow.biz.dal.vo.*;
 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.page.PageInfo;
+import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,19 +63,21 @@ public class MusicSheetController extends BaseController {
 
     @ApiOperation(value = "启/停用")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/state', {'BACKEND'})")
-    @PostMapping("music/sheet/state")
-    public R<JSONObject> status(@RequestBody CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus status) {
-        cbsMusicScoreService.updateStatus(status);
-        return R.defaultR();
+    @PostMapping("music/sheet/state/{id}")
+    public HttpResponseResult<Object> state(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
+        if (id == null) {
+            return failed("参数不能为空");
+        }
+        MusicSheet musicSheet = musicSheetService.getById(id);
+        if (musicSheet == null) {
+            return failed("未找到曲目");
+        }
+        if (musicSheet.getState().equals(YesOrNoEnum.NO)) {
+            return failed("曲目已被下架");
+        }
+        return status(musicSheetService.state(id, "", ClientEnum.SYSTEM));
     }
 
-/*    @ApiOperation(value = "详情", notes = "曲目表-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@pcs.hasPermissions('musicSheet/cbsDetail', {'BACKEND'})")
-    @GetMapping("musicSheet/cbsDetail/{id}")
-    public R<CbsMusicSheetWrapper.MusicSheet> cbsDetail(@PathVariable("id") Long id) {
-        return cbsMusicScoreService.musicSheetDetail(id);
-    }*/
-
     @PostMapping(value = "music/sheet/student")
     @ApiOperation(value = "学生详情-乐谱")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/student')")