Merge branch 'music_score'

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

@@ -51,6 +51,8 @@ public class SysMusicScore {
 	 * 客户端类型
 	 */
 	private ClientTypeEnum clientType;
+
+	private String rankIds;
 	
 	/**  */
 	private java.util.Date updateTime;
@@ -58,6 +60,14 @@ public class SysMusicScore {
 	/**  */
 	private java.util.Date createTime;
 
+	public String getRankIds() {
+		return rankIds;
+	}
+
+	public void setRankIds(String rankIds) {
+		this.rankIds = rankIds;
+	}
+
 	public ClientTypeEnum getClientType() {
 		return clientType;
 	}

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

@@ -21,6 +21,8 @@ public class SysMusicCompareRecordQueryInfo extends QueryInfo {
 
     private String musicGroupId;
 
+    private int orderType;
+
     @ApiModelProperty("排序字段：TRAINDAYS(训练天数);TRAINTIME(训练时长);TRAINNUM(训练次数)")
     private String sortField = "TRAINDAYS";
 
@@ -42,6 +44,14 @@ public class SysMusicCompareRecordQueryInfo extends QueryInfo {
         this.teacherId = teacherId;
     }
 
+    public int getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(int orderType) {
+        this.orderType = orderType;
+    }
+
     public Integer getUserId() {
         return userId;
     }

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

@@ -35,11 +35,10 @@ public interface SysMusicCompareRecordService extends BaseService<Long, SysMusic
      * @describe 云教练排行榜
      * @author Joburgess
      * @date 2021/8/11 0011
-     * @param startDate:
-     * @param endDate:
+     * @param queryInfo:
      * @return com.ym.mec.biz.dal.dto.StatDto
      */
-    StatDto rankingList(Integer headUserId, int type, String startDate, String endDate);
+    StatDto rankingList(SysMusicCompareRecordQueryInfo queryInfo);
 
     /**
      * @describe 学员训练数据统计

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

@@ -102,13 +102,13 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	}
 
 	@Override
-	public StatDto rankingList(Integer headUserId,int type, String startDate, String endDate) {
+	public StatDto rankingList(SysMusicCompareRecordQueryInfo queryInfo) {
 		StatDto result = new StatDto();
 		MusicCompareRankingDto head = new MusicCompareRankingDto();
-		head.setUserId(headUserId);
-		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareRecordDao.getUserTrainStat(startDate, endDate);
+		head.setUserId(queryInfo.getUserId());
+		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareRecordDao.getUserTrainStat(queryInfo.getStartTime(), queryInfo.getEndTime());
 		List<MusicCompareRankingDto> detail = new ArrayList<>();
-		switch (type){
+		switch (queryInfo.getOrderType()){
 			case 1:
 				userTrainStat.sort(Comparator.comparing(m->m.getScore(), Comparator.reverseOrder()));
 				break;
@@ -131,7 +131,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		for (int i = 0; i < detail.size(); i++) {
 			detail.get(i).setRankNum(i+1);
 			detail.get(i).setTrainTime(detail.get(i).getTrainTime()/60);
-			if(detail.get(i).getUserId().equals(headUserId)){
+			if(detail.get(i).getUserId().equals(queryInfo.getUserId())){
 				head = detail.get(i);
 			}
 			if(studentSubjectMap.containsKey(detail.get(i).getUserId())){

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="rank_ids_" property="rankIds" />
 		<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" />
@@ -36,9 +37,9 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_)
+		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_)
 		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})
+		       #{speed},#{url},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rankIds})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -47,6 +48,9 @@
 		<if test="clientType != null">
 			client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
+		<if test="rankIds != null">
+			rank_ids_ = #{rankIds},
+		</if>
 		<if test="order != null">
 			order_ = #{order},
 		</if>

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

@@ -32,12 +32,13 @@ public class CloudStudyController extends BaseController {
 
     @ApiOperation("云教练排行榜")
     @GetMapping("rankingList")
-    public HttpResponseResult rankingList(Integer orderType, String startDate, String endDate){
+    public HttpResponseResult rankingList(SysMusicCompareRecordQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("获取用户信息失败");
         }
-        return succeed(sysMusicCompareRecordService.rankingList(sysUser.getId(), orderType, startDate, endDate));
+        queryInfo.setUserId(sysUser.getId());
+        return succeed(sysMusicCompareRecordService.rankingList(queryInfo));
     }
 
     @ApiOperation("学员训练数据统计")