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

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

@@ -25,4 +25,10 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
     List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params);
 
     int findAccCount(Map<String, Object> params);
+
+    /**
+     * 获取伴奏声部列表
+     * @return
+     */
+    List<Integer> querySubjectIds();
 }

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

@@ -43,6 +43,8 @@ public class SysMusicScore {
 	
 	/** 是否删除1是0否 */
 	private Integer delFlag;
+
+	private Integer order;
 	
 	/**  */
 	private java.util.Date updateTime;
@@ -50,6 +52,14 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
 	public Integer getCategoriesId() {
 		return categoriesId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreAccompanimentService.java

@@ -14,4 +14,6 @@ public interface SysMusicScoreAccompanimentService extends BaseService<Integer,
     List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
 
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
+
+    List<Integer> querySubjectIds();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreService.java

@@ -7,9 +7,9 @@ import com.ym.mec.common.service.BaseService;
 
 public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
 
-    void updateMusicScore(MusicScoreDto examSongDto);
+    void updateMusicScore(MusicScoreDto musicScoreDto);
 
-    void add(MusicScoreDto examSongDto);
+    void add(MusicScoreDto musicScoreDto);
 
     void del(Integer id);
 }

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

@@ -56,4 +56,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 		MapUtil.populateMap(params, queryInfo);
 		return sysMusicScoreAccompanimentDao.queryAccPage(params);
 	}
+
+	@Override
+	public List<Integer> querySubjectIds() {
+		return sysMusicScoreAccompanimentDao.querySubjectIds();
+	}
 }

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

@@ -38,14 +38,14 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void updateMusicScore(MusicScoreDto examSongDto) {
-		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+	public void updateMusicScore(MusicScoreDto musicScoreDto) {
+		SysMusicScore sysMusicScore = musicScoreDto.getSysMusicScore();
 		sysMusicScoreDao.update(sysMusicScore);
-		List<Integer> delExamSongAccompanimentIds = examSongDto.getDelExamSongAccompanimentIds();
+		List<Integer> delExamSongAccompanimentIds = musicScoreDto.getDelExamSongAccompanimentIds();
 		if(delExamSongAccompanimentIds != null && delExamSongAccompanimentIds.size() > 0){
 			sysMusicScoreAccompanimentDao.batchDel(delExamSongAccompanimentIds);
 		}
-		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
 			List<Integer> subjectIdList = sysMusicScoreAccompaniments.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
 			subjectIdList.removeAll(Collections.singleton(null));
@@ -74,15 +74,15 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(MusicScoreDto examSongDto) {
+	public void add(MusicScoreDto musicScoreDto) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser == null){
 			throw new BizException("请登录");
 		}
-		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+		SysMusicScore sysMusicScore = musicScoreDto.getSysMusicScore();
 		sysMusicScore.setCreateUserId(sysUser.getId());
 		sysMusicScoreDao.insert(sysMusicScore);
-		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
 			sysMusicScoreAccompanimentDao.batchInsert(sysMusicScoreAccompaniments,sysMusicScore.getId());
 		}

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

@@ -120,7 +120,7 @@
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
-		ORDER BY sesa.id_ DESC
+		ORDER BY ses.order_,ses.name_
 		<include refid="global.limit"/>
 	</select>
 	
@@ -154,6 +154,7 @@
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
 		<include refid="queryPageSql"/>
+		ORDER BY ses.order_,ses.name_
 	</select>
 
 	<select id="findAccCount" resultType="java.lang.Integer">
@@ -162,8 +163,13 @@
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 	</select>
+    <select id="querySubjectIds" resultType="java.lang.Integer">
+		SELECT subject_id_ FROM sys_music_score_accompaniment
+		WHERE del_flag_ = 0
+		GROUP BY subject_id_
+	</select>
 
-	<sql id="queryPageSql">
+    <sql id="queryPageSql">
 		<where>
 			sesa.del_flag_ = 0
 			<if test="search != null and search != ''">

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

@@ -18,6 +18,7 @@
 		<result column="create_user_id_" property="createUserId" />
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="order_" property="order" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
@@ -34,13 +35,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_,update_time_,create_time_)
-		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},NOW(),NOW())
+		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>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore">
 		UPDATE sys_music_score <set>
+		<if test="order != null">
+			order_ = #{order},
+		</if>
 		<if test="delFlag != null">
 			del_flag_ = #{delFlag},
 		</if>
@@ -85,7 +89,7 @@
 		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>
 		GROUP BY ses.id_
-		ORDER BY ses.id_ DESC
+		ORDER BY ses.order_,ses.name_
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -29,4 +29,10 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setType("COMMON");
         return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
 }

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

@@ -37,6 +37,12 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
+
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreController.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
+import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
@@ -11,7 +12,6 @@ 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("sysMusicScore")
@@ -26,8 +26,9 @@ public class SysMusicScoreController extends BaseController {
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.add(examSongDto);
+    public Object add(@RequestBody MusicScoreDto musicScoreDto) {
+        musicScoreDto.getSysMusicScore().setType(ExamSongTypeEnum.PERSON);
+        sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }
 

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

@@ -41,4 +41,10 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
     }
+
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
 }

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

@@ -21,16 +21,16 @@ public class SysMusicScoreController extends BaseController {
     @ApiOperation(value = "修改")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/update')")
-    public Object update(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.updateMusicScore(examSongDto);
+    public Object update(@RequestBody MusicScoreDto musicScoreDto) {
+        sysMusicScoreService.updateMusicScore(musicScoreDto);
         return succeed();
     }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/add')")
-    public Object add(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.add(examSongDto);
+    public Object add(@RequestBody MusicScoreDto musicScoreDto) {
+        sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }