伴奏修改

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -101,7 +101,7 @@ public class NewsController extends BaseController {
 	@ApiOperation("新增资讯")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@AuditLogAnnotation(operateName = "资讯新增",interfaceURL = "news/add")
-//	@PreAuthorize("@pcs.hasPermissions('news/add')")
+	@PreAuthorize("@pcs.hasPermissions('news/add')")
 	public Object add(SysNewsInformation newsInfo) {
 		return succeed(sysNewsInformationService.insert(newsInfo));
 	}
@@ -109,7 +109,7 @@ public class NewsController extends BaseController {
 	@ApiOperation("更新资讯")
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@AuditLogAnnotation(operateName = "资讯更新",interfaceURL = "news/update")
-//	@PreAuthorize("@pcs.hasPermissions('news/update')")
+	@PreAuthorize("@pcs.hasPermissions('news/update')")
 	public Object update(SysNewsInformation newsInfo) {
 		Date date = new Date();
 		newsInfo.setUpdateTime(date);
@@ -120,7 +120,7 @@ public class NewsController extends BaseController {
 	@ApiOperation("删除")
 	@PostMapping(value = "/del/{id}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@AuditLogAnnotation(operateName = "资讯删除",interfaceURL = "news/del")
-//	@PreAuthorize("@pcs.hasPermissions('news/del')")
+	@PreAuthorize("@pcs.hasPermissions('news/del')")
 	public Object add(@PathVariable("id") Long id) {
 		return succeed(sysNewsInformationService.deleteWithLogical(id));
 	}

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

@@ -32,6 +32,4 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
      * @return
      */
     List<Subject> querySubjectIds();
-
-    List<Map<String,Integer>> findUrlMap();
 }

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

@@ -3,15 +3,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
 
 public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
 
-
-    List<Map<String,Integer>> findUrlMap();
-
-    void batchInsert(@Param("list") List<SysMusicScore> sysMusicScoreList);
 }

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

@@ -192,9 +192,6 @@
 		WHERE sesa.del_flag_ = 0
 		GROUP BY sesa.subject_id_
 	</select>
-	<select id="findUrlMap" resultType="java.util.Map">
-		SELECT SUBSTRING(mp3_url_,46,7) 'key',id_ 'value' FROM sys_music_score_accompaniment
-	</select>
 
 	<sql id="queryPageSql">
 		<where>

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

@@ -19,6 +19,7 @@
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="order_" property="order" />
+		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
@@ -35,21 +36,17 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_)
-		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},#{order},NOW(),NOW())
-	</insert>
-	<insert id="batchInsert">
-		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_)
-		VALUE
-		<foreach collection="list" item="item" separator=",">
-			(#{item.musicScoreCategoriesId},#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		    #{item.speed},#{item.url},#{item.createUserId},#{item.order},NOW(),NOW())
-		</foreach>
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,order_,update_time_,create_time_,client_type_)
+		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})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore">
 		UPDATE sys_music_score <set>
+		<if test="clientType != null">
+			client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		</if>
 		<if test="order != null">
 			order_ = #{order},
 		</if>
@@ -106,9 +103,6 @@
 		SELECT COUNT(0) FROM sys_music_score ses
 		<include refid="queryPageSql"/>
 	</select>
-    <select id="findUrlMap" resultType="java.util.Map">
-		SELECT SUBSTRING(url_,46,7) 'key',id_ 'value' FROM sys_music_score
-	</select>
     <sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0
@@ -118,6 +112,9 @@
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="clientType != null">
+				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
 			<if test="type != null and type == 'COMMON'">
 				AND ses.type_ = #{type}
 			</if>