Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreCategoriesController.java

@@ -18,7 +18,6 @@ public class SysMusicScoreCategoriesController extends BaseController {
     @Autowired
     private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
 
-
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryPage')")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -0,0 +1,56 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("eduMusicScore")
+@Api(tags = "智能陪练")
+@RestController
+public class EduMusicScoreController extends BaseController {
+    @Autowired
+    private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
+    @Autowired
+    private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
+
+    @ApiOperation(value = "树状列表")
+    @GetMapping("/queryTree")
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        String type = queryInfo.getType();
+        if(StringUtils.isEmpty(type)){
+            queryInfo.setType("ALL");
+        }
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
+        }
+        return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
+    }
+
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
+}