管乐迷曲目来源内容平台

mec-application/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -1,63 +1,61 @@
 package com.ym.mec.teacher.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.TenantConfig;
 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.SysUserService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.biz.service.TenantConfigService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.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;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @RequestMapping("${app-config.url.teacher:}/sysMusicScoreAccompaniment")
 @Api(tags = "曲库伴奏服务")
 @RestController
 public class SysMusicScoreAccompanimentController extends BaseController {
 
-    @Autowired
+    @Resource
     private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
+    @Resource
+    private SysUserService sysUserService;
+    @Resource
     private TeacherService teacherService;
-    
-    @Autowired
+    @Resource
     private TenantConfigService tenantConfigService;
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds(Integer categoriesId) {
+    public HttpResponseResult<List<Subject>> querySubjectIds(Integer categoriesId) {
         return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+    public HttpResponseResult<List<SysMusicScoreAccompaniment>> queryPage(SysExamSongQueryInfo queryInfo) {
         String type = queryInfo.getType();
         if(StringUtils.isEmpty(type)){
             queryInfo.setType("ALL");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
         }
-        queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setCreateUserId(sysUserService.getUserId());
         queryInfo.setShowFlag(1);
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
@@ -69,11 +67,8 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(StringUtils.isEmpty(type)){
             queryInfo.setType("ALL");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
-        Teacher teacher = teacherService.get(sysUser.getId());
+        SysUser user = sysUserService.getUser();
+        Teacher teacher = teacherService.get(user.getId());
         if (StringUtils.isEmpty(queryInfo.getOrganId())) {
             queryInfo.setOrganId(teacher.getTeacherOrganId() + "");
         }
@@ -83,11 +78,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         if(queryInfo.getClientType() == null){
             queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         }
-        queryInfo.setCreateUserId(sysUser.getId());
+        queryInfo.setCreateUserId(user.getId());
         queryInfo.setShowFlag(1);
         queryInfo.setEnable(true);
         
-        TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", sysUser.getTenantId()));
+        TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", user.getTenantId()));
         
         queryInfo.setCategoriesIds(tenantConfig.getTeachingMaterialId());
         

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -128,6 +128,9 @@ public class SysMusicScore {
 	private PlayMode playMode;
 
 	private String organName;
+
+	//独奏、合奏
+	private String musicSheetType;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -154,7 +154,7 @@
 		SELECT s.* FROM sys_music_score sms
 		LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,sms.subject_ids_)
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = sms.music_score_categories_id_
-		WHERE sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL
+		WHERE sms.del_flag_ = 0 AND sms.cbs_music_sheet_id_ IS NOT NULL AND s.id_ IS NOT NULL AND sms.music_sheet_type_ = 'SINGLE'
 		<if test="categoriesIdList != null and categoriesIdList.size > 0">
 			AND sesc.id_ IN
 			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -186,7 +186,8 @@
 				subject_ids_ = #{item.musicSheetUpdate.subjectIds},
 				speed_ = #{item.musicSheetUpdate.playSpeed},
 				enable_evaluation_ = #{item.musicSheetUpdate.canEvaluate},
-				play_mode_ = #{item.musicSheetUpdate.playMode}
+				play_mode_ = #{item.musicSheetUpdate.playMode},
+				music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType}
 			</if>
 			where cbs_music_sheet_id_ = #{item.musicSheetId}
 		</foreach>
@@ -206,14 +207,15 @@
 		subject_ids_ = #{param.subjectIds},
 		speed_ = #{param.playSpeed},
 		enable_evaluation_ = #{param.canEvaluate},
-		play_mode_ = #{param.playMode}
+		play_mode_ = #{param.playMode},
+		music_sheet_type_ = #{param.musicSheetType}
 		where cbs_music_sheet_id_ = #{param.id}
 	</update>
 
 	<insert id="batchInsert">
 		insert into sys_music_score
 		(music_score_categories_id_,client_type_,type_,rank_ids_,order_
-		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_)
+		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_,music_sheet_type_)
 		values
 		<foreach collection="vos" item="item" separator=",">
 			(#{item.musicSheetCategoryId},
@@ -225,7 +227,7 @@
 			#{item.musicSheetUpdate.playSpeed},
 			#{item.musicSheetUpdate.canEvaluate},
 			#{item.musicSheetUpdate.playMode},0,
-			#{item.musicSheetId}
+			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType}
 			)
 		</foreach>
 	</insert>