教学伴奏调整

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/dto/MusicScoreQueryInfo.java

@@ -6,6 +6,16 @@ public class MusicScoreQueryInfo {
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
     private Integer parentId = 0;
 
+    private Integer organId;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
     public Integer getParentId() {
         return parentId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreCategoriesDao.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
 
-    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId);
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("organId") Integer organId);
 
     void batchInsert(@Param("categoriesList") List<SysMusicScoreCategories> sysMusicScoreCategoriesList, @Param("organId") String organId, @Param("enable") Boolean enable);
 

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

@@ -36,6 +36,9 @@ public class SysMusicScore {
 	/** 原音MP3 */
 	private String url;
 
+	/** 带节拍器原音MP3 */
+	private String metronomeUrl;
+
 	/** 原音MP3 */
 	private String createUserName;
 	
@@ -63,6 +66,14 @@ public class SysMusicScore {
 	//是否显示
 	private Integer showFlag = 0;
 
+	public String getMetronomeUrl() {
+		return metronomeUrl;
+	}
+
+	public void setMetronomeUrl(String metronomeUrl) {
+		this.metronomeUrl = metronomeUrl;
+	}
+
 	public Integer getShowFlag() {
 		return showFlag;
 	}

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -23,6 +22,9 @@ public class SysMusicScoreAccompaniment {
 	
 	/**  */
 	private String mp3Url;
+
+	/** 带节拍器MP3 */
+	private String metronomeUrl;
 	
 	/** 是否删除 */
 	private Integer delFlag;
@@ -65,6 +67,14 @@ public class SysMusicScoreAccompaniment {
 
 	private ClientTypeEnum clientType;
 
+	public String getMetronomeUrl() {
+		return metronomeUrl;
+	}
+
+	public void setMetronomeUrl(String metronomeUrl) {
+		this.metronomeUrl = metronomeUrl;
+	}
+
 	public String getRankIds() {
 		return rankIds;
 	}

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

@@ -38,6 +38,16 @@ public class SysMusicScoreCategories {
 
 	private String organNames;
 
+	private Integer order;
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
 	public String getOrganNames() {
 		return organNames;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreCategoriesServiceImpl.java

@@ -35,8 +35,8 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 
 	@Override
 	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
-		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId());
-		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null);
+		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId());
+		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId());
 		for (SysMusicScoreCategories categories : scoreCategories) {
 			categories = getTree(categories,scoreCategoriesAllList);
 		}

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

@@ -12,6 +12,7 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="subject_name_" property="subjectName" />
 		<result column="mp3_url_" property="mp3Url" />
+		<result column="metronome_url_" property="metronomeUrl" />
 		<result column="xml_url_" property="xmlUrl" />
 		<result column="name_" property="examSongName" />
 		<result column="categories_name_" property="categoriesName" />
@@ -49,8 +50,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_,is_open_metronome_)
-		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{speed},#{xmlUrl},NOW(),NOW(),#{isOpenMetronome})
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,metronome_url_,speed_,xml_url_,create_time_,update_time_,is_open_metronome_)
+		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{metronomeUrl},#{speed},#{xmlUrl},NOW(),NOW(),#{isOpenMetronome})
 	</insert>
     <insert id="batchInsert">
 		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,
@@ -81,7 +82,8 @@
 		<if test="examSongId != null">
 			exam_song_id_ = #{examSongId},
 		</if>
-			subject_id_ = #{subjectId},xml_url_ = #{xmlUrl},mp3_url_ = #{mp3Url}, update_time_ = NOW()
+			subject_id_ = #{subjectId},xml_url_ = #{xmlUrl},
+			mp3_url_ = #{mp3Url},metronome_url_ = #{metronomeUrl}, update_time_ = NOW()
 	</set>WHERE id_ = #{id}
 	</update>
 	<update id="batchDel">
@@ -109,7 +111,8 @@
 				<if test="item.examSongId != null">
 					exam_song_id_ = #{item.examSongId},
 				</if>
-				subject_id_ = #{item.subjectId},xml_url_ = #{item.xmlUrl},mp3_url_ = #{item.mp3Url}, update_time_ = NOW()
+				subject_id_ = #{item.subjectId},xml_url_ = #{item.xmlUrl},metronome_url_ = #{item.metronomeUrl},
+				mp3_url_ = #{item.mp3Url}, update_time_ = NOW()
 			</set> WHERE id_ = #{item.id}
 		</foreach>
 	</update>

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

@@ -14,6 +14,7 @@
 		<result column="name_" property="name" />
 		<result column="cover_img_" property="coverImg" />
 		<result column="operator_id_" property="operatorId" />
+		<result column="order_" property="order" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -30,20 +31,23 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreCategories" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score_categories (parent_id_,name_,cover_img_,operator_id_,create_time_,update_time_,organ_id_)
-		VALUES(#{parentId},#{name},#{coverImg},#{operatorId},NOW(),NOW(),#{organId})
+		INSERT INTO sys_music_score_categories (parent_id_,name_,cover_img_,operator_id_,create_time_,update_time_,organ_id_,order_)
+		VALUES(#{parentId},#{name},#{coverImg},#{operatorId},NOW(),NOW(),#{organId},#{order})
 	</insert>
 	<insert id="batchInsert">
-		INSERT INTO sys_music_score_categories (parent_id_,name_,cover_img_,operator_id_,create_time_,update_time_,organ_id_,enable_)
+		INSERT INTO sys_music_score_categories (parent_id_,name_,cover_img_,operator_id_,create_time_,update_time_,organ_id_,enable_,order_)
 		VALUES
 		<foreach collection="categoriesList" item="bean" separator=",">
-			(#{bean.parentId},#{bean.name},#{bean.coverImg},#{bean.operatorId},NOW(),NOW(),#{organId},#{enable})
+			(#{bean.parentId},#{bean.name},#{bean.coverImg},#{bean.operatorId},NOW(),NOW(),#{organId},#{enable},#{bean.order})
 		</foreach>
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreCategories">
 		UPDATE sys_music_score_categories <set>
+			<if test="order != null">
+				order_ = #{order},
+			</if>
 			<if test="parentId != null">
 				parent_id_ = #{parentId},
 			</if>
@@ -68,6 +72,9 @@
 	<update id="batchUpdate">
 		<foreach collection="categories" item="bean" index="index" open="" close="" separator=";">
 			UPDATE sys_music_score_categories <set>
+			<if test="bean.order != null">
+				order_ = #{bean.order},
+			</if>
 			<if test="bean.operatorId != null">
 				operator_id_ = #{bean.operatorId},
 			</if>
@@ -109,7 +116,7 @@
 	<select id="findByParentId" resultMap="SysMusicScoreCategories">
 		SELECT sm.* FROM sys_music_score_categories sm
 		<include refid="queryTree"/>
-		ORDER BY sm.id_
+		ORDER BY sm.order_,sm.id_
 	</select>
 	<select id="findByCategoriesIds" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(id_) FROM sys_music_score_categories WHERE FIND_IN_SET(id_,strlist) OR FIND_IN_SET(parent_id_,strlist)
@@ -119,6 +126,9 @@
 			<if test="parentId != null">
 				AND sm.parent_id_ = #{parentId}
 			</if>
+			<if test="organId != null">
+				AND FIND_IN_SET(#{organId},sm.organ_id_)
+			</if>
 		</where>
 	</sql>
 </mapper>

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

@@ -15,6 +15,7 @@
 		<result column="subject_ids_" property="subjectIds" />
 		<result column="speed_" property="speed" />
 		<result column="url_" property="url" />
+		<result column="metronome_url_" property="metronomeUrl" />
 		<result column="create_user_id_" property="createUserId" />
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
@@ -38,9 +39,10 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_,client_type_,rank_ids_,show_flag_)
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,metronome_url_,create_user_id_,order_,
+		                             update_time_,create_time_,client_type_,rank_ids_,show_flag_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds},#{showFlag})
+		       #{speed},#{url},#{metronomeUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds},#{showFlag})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -65,6 +67,7 @@
 		<if test="createUserId != null">
 			create_user_id_ = #{createUserId},
 		</if>
+			metronome_url_ = #{metronomeUrl},
 			url_ = #{url},
 		<if test="subjectIds != null and subjectIds != ''">
 			subject_ids_ = #{subjectIds},

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

@@ -1,6 +1,8 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.common.controller.BaseController;
@@ -19,6 +21,8 @@ public class SysMusicScoreCategoriesController extends BaseController {
 
     @Autowired
     private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
 
     @ApiOperation(value = "分页查询")
@@ -30,6 +34,8 @@ public class SysMusicScoreCategoriesController extends BaseController {
     @ApiOperation(value = "树状列表")
     @GetMapping("/queryTree")
     public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        queryInfo.setOrganId(sysUser.getOrganId());
         return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
     }