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

 Conflicts:

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

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

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

@@ -0,0 +1,16 @@
+package com.ym.mec.auth.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class MusicScoreQueryInfo {
+    @ApiModelProperty(value = "父节点编号，默认0",required = false)
+    private Integer parentId = 0;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+}

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

@@ -22,7 +22,7 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
 
     void deleteBySongId(Integer id);
 
-    Object queryAccPage(Map<String, Object> params);
+    List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params);
 
     int findAccCount(Map<String, Object> params);
 }

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

@@ -3,8 +3,11 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
 
-	
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId);
 }

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.List;
+
 /**
  * 对应数据库表(sys_music_score_categories):
  */
@@ -27,7 +29,17 @@ public class SysMusicScoreCategories {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	private List<SysMusicScoreCategories> sysMusicScoreCategoriesList;
+
+	public List<SysMusicScoreCategories> getSysMusicScoreCategoriesList() {
+		return sysMusicScoreCategoriesList;
+	}
+
+	public void setSysMusicScoreCategoriesList(List<SysMusicScoreCategories> sysMusicScoreCategoriesList) {
+		this.sysMusicScoreCategoriesList = sysMusicScoreCategoriesList;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysExamSongQueryInfo.java

@@ -14,8 +14,19 @@ public class SysExamSongQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "类型",required = true)
     private String type;
 
+    @ApiModelProperty(value = "曲库分类",required = true)
+    private Integer categoriesId;
+
     private Integer sysMusicScoreId;
 
+    public Integer getCategoriesId() {
+        return categoriesId;
+    }
+
+    public void setCategoriesId(Integer categoriesId) {
+        this.categoriesId = categoriesId;
+    }
+
     public Integer getSysMusicScoreId() {
         return sysMusicScoreId;
     }

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

@@ -5,11 +5,13 @@ import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysMusicScoreAccompanimentService extends BaseService<Integer, SysMusicScoreAccompaniment> {
 
     void updateAcc(SysMusicScoreAccompaniment sysMusicScoreAccompaniment);
 
-    Object queryAll(SysExamSongQueryInfo queryInfo);
+    List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
 
-    Object queryAccPage(SysExamSongQueryInfo queryInfo);
+    List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -1,8 +1,13 @@
 package com.ym.mec.biz.service;
 
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysMusicScoreCategoriesService extends BaseService<Integer, SysMusicScoreCategories> {
 
+    List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo);
 }

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

@@ -44,14 +44,14 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	}
 
 	@Override
-	public Object queryAll(SysExamSongQueryInfo queryInfo) {
+	public List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		return sysMusicScoreAccompanimentDao.queryPage(params);
 	}
 
 	@Override
-	public Object queryAccPage(SysExamSongQueryInfo queryInfo) {
+	public List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 		return sysMusicScoreAccompanimentDao.queryAccPage(params);

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

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
 
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
@@ -9,6 +11,9 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreCategories> implements SysMusicScoreCategoriesService {
 	
@@ -19,5 +24,31 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 	public BaseDAO<Integer, SysMusicScoreCategories> getDAO() {
 		return sysMusicScoreCategoriesDao;
 	}
-	
+
+
+	@Override
+	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
+		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId());
+		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null);
+		for (SysMusicScoreCategories categories : scoreCategories) {
+			categories = getTree(categories,scoreCategoriesAllList);
+		}
+		return scoreCategories;
+	}
+
+	private SysMusicScoreCategories getTree(SysMusicScoreCategories categories,List<SysMusicScoreCategories> scoreCategoriesAllList){
+		//得到根节点对象
+		//获取子节点list
+		List<SysMusicScoreCategories> scoreCategories = scoreCategoriesAllList.stream().filter(e->e.getParentId().equals(categories.getId())).collect(Collectors.toList());
+		//如果存在子节点
+		if(scoreCategories != null && scoreCategories.size() > 0) {
+			//将子节点list放入父节点对象
+			categories.setSysMusicScoreCategoriesList(scoreCategories);
+			//遍历子节点....
+			for (SysMusicScoreCategories sysMenu : scoreCategories) {
+				getTree(sysMenu,scoreCategoriesAllList);
+			}
+		}
+		return categories;
+	}
 }

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

@@ -146,7 +146,7 @@
 			</if>
 		</where>
 	</select>
-	<select id="queryAccPage" resultType="java.lang.Object">
+	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_exam_song ses ON ses.id_ = sesa.exam_song_id_

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

@@ -63,11 +63,24 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreCategories" parameterType="map">
-		SELECT * FROM sys_music_score_categories ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM sys_music_score_categories ORDER BY id_
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_music_score_categories
 	</select>
+	<select id="findByParentId" resultMap="SysMusicScoreCategories">
+		SELECT sm.* FROM sys_music_score_categories sm
+		<include refid="queryTree"/>
+		ORDER BY sm.id_ DESC
+	</select>
+	<sql id="queryTree">
+		<where>
+			<if test="parentId != null">
+				AND sm.parent_id_ = #{parentId}
+			</if>
+		</where>
+	</sql>
 </mapper>

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

@@ -91,6 +91,9 @@
 	<sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0
+			<if test="categoriesId != null">
+				AND ses.music_score_categories_id_ = #{categoriesId}
+			</if>
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.common.controller.BaseController;
@@ -25,4 +26,11 @@ public class SysMusicScoreCategoriesController extends BaseController {
         return succeed(sysMusicScoreCategoriesService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "树状列表")
+    @GetMapping("/queryTree")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryTree')")
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+    }
+
 }