增加枚举类型定义

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseRelationMusicAlbum.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.course.RelationMusicAlbumEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -30,10 +32,10 @@ public class CourseRelationMusicAlbum implements Serializable {
     private Long courseId;
     @ApiModelProperty("课程类型 ")
 	@TableField(value = "course_type_")
-    private String courseType;
+    private CourseTypeEnum courseType;
     @ApiModelProperty("关联类型, MUSIC, ALBUM ")
 	@TableField(value = "relation_type_")
-    private String relationType;
+    private RelationMusicAlbumEnum relationType;
     @ApiModelProperty("关联曲目专辑ID ")
 	@TableField(value = "music_album_id_")
     private Long musicAlbumId;
@@ -77,24 +79,24 @@ public class CourseRelationMusicAlbum implements Serializable {
     public void setCourseId(Long courseId) {
         this.courseId = courseId;
     }
-    
-	public String getCourseType() {
+
+    public CourseTypeEnum getCourseType() {
         return courseType;
     }
 
-    public void setCourseType(String courseType) {
+    public void setCourseType(CourseTypeEnum courseType) {
         this.courseType = courseType;
     }
-    
-	public String getRelationType() {
+
+    public RelationMusicAlbumEnum getRelationType() {
         return relationType;
     }
 
-    public void setRelationType(String relationType) {
+    public void setRelationType(RelationMusicAlbumEnum relationType) {
         this.relationType = relationType;
     }
-    
-	public Long getMusicAlbumId() {
+
+    public Long getMusicAlbumId() {
         return musicAlbumId;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroup.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -132,7 +133,7 @@ public class VideoLessonGroup extends BaseEntity {
 
     @TableField("relation_type_")
     @ApiModelProperty(value = "关联曲目专辑类型,RECOMMEND:推荐  GIFT:赠品")
-    private YesOrNoEnum relationType;
+    private CourseRelationTypeEnum relationType;
 
     @TableField("audit_version_")
     @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
@@ -146,11 +147,11 @@ public class VideoLessonGroup extends BaseEntity {
         this.draftFlag = draftFlag;
     }
 
-    public YesOrNoEnum getRelationType() {
+    public CourseRelationTypeEnum getRelationType() {
         return relationType;
     }
 
-    public void setRelationType(YesOrNoEnum relationType) {
+    public void setRelationType(CourseRelationTypeEnum relationType) {
         this.relationType = relationType;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroupDetail.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
 import com.yonge.cooleshow.biz.dal.valid.AddGroup;
 import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
 import com.yonge.cooleshow.common.entity.BaseEntity;
@@ -76,13 +77,13 @@ public class 	VideoLessonGroupDetail extends BaseEntity {
 
 	@TableField("relation_type_")
 	@ApiModelProperty(value = "关联曲目专辑类型,RECOMMEND:推荐  GIFT:赠品")
-	private YesOrNoEnum relationType;
+	private CourseRelationTypeEnum relationType;
 
-	public YesOrNoEnum getRelationType() {
+	public CourseRelationTypeEnum getRelationType() {
 		return relationType;
 	}
 
-	public void setRelationType(YesOrNoEnum relationType) {
+	public void setRelationType(CourseRelationTypeEnum relationType) {
 		this.relationType = relationType;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/course/CourseRelationTypeEnum.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.biz.dal.enums.course;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 课程关联类型
+ * @author: Eric
+ * @date: 2022-03-30
+ */
+public enum CourseRelationTypeEnum implements BaseEnum<String, CourseRelationTypeEnum> {
+
+    RECOMMEND("推荐"),
+    GIFT("赠品"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    CourseRelationTypeEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 类型匹配
+     * @param name 类型
+     * @return boolean
+     */
+    public static boolean match(String name) {
+
+        CourseRelationTypeEnum[] values = CourseRelationTypeEnum.values();
+        for (CourseRelationTypeEnum item : values) {
+
+            if (item.name().equals(name)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/course/CourseTypeEnum.java

@@ -0,0 +1,53 @@
+package com.yonge.cooleshow.biz.dal.enums.course;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 课程类型
+ * @author: Eric
+ * @date: 2022-03-30
+ */
+public enum CourseTypeEnum implements BaseEnum<String, CourseTypeEnum> {
+
+    PRACTICE("陪练课"),
+    LIVE("直播课"),
+    PIANO_ROOM_CLASS("琴房课"),
+    VIDEO("视频课"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    CourseTypeEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 类型匹配
+     * @param name 类型
+     * @return boolean
+     */
+    public static boolean match(String name) {
+
+        CourseTypeEnum[] values = CourseTypeEnum.values();
+        for (CourseTypeEnum item : values) {
+
+            if (item.name().equals(name)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/course/RelationMusicAlbumEnum.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.biz.dal.enums.course;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 课程关联曲目、专辑类型
+ * @author: Eric
+ * @date: 2022-03-30
+ */
+public enum RelationMusicAlbumEnum implements BaseEnum<String, RelationMusicAlbumEnum> {
+
+    MUSIC("曲目"),
+    ALBUM("专辑"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    RelationMusicAlbumEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 类型匹配
+     * @param name 类型
+     * @return boolean
+     */
+    public static boolean match(String name) {
+
+        RelationMusicAlbumEnum[] values = RelationMusicAlbumEnum.values();
+        for (RelationMusicAlbumEnum item : values) {
+
+            if (item.name().equals(name)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupDetailServiceImpl.java

@@ -215,6 +215,9 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
         VideoLessonSearch search = new VideoLessonSearch();
         search.setVideoLessonGroupId(groupId);
         lessonStudentVo.setDetailList(JsonUtil.parseArray(videoLessonGroupLog.getVideoDetailJson(), VideoLessonGroupDetail.class));
+
+        // 课程关联曲目、专辑信息
+
         return lessonStudentVo;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LessonGroupVo.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
@@ -54,6 +55,9 @@ public class LessonGroupVo extends BaseEntity {
     @ApiModelProperty("审核版本")
     private YesOrNoEnum auditVersion;
 
+    @ApiModelProperty(value = "关联曲目专辑类型,RECOMMEND:推荐  GIFT:赠品")
+    private CourseRelationTypeEnum relationType;
+
     public YesOrNoEnum getAuditVersion() {
         return auditVersion;
     }
@@ -165,4 +169,12 @@ public class LessonGroupVo extends BaseEntity {
     public void setCountStudent(Integer countStudent) {
         this.countStudent = countStudent;
     }
+
+    public CourseRelationTypeEnum getRelationType() {
+        return relationType;
+    }
+
+    public void setRelationType(CourseRelationTypeEnum relationType) {
+        this.relationType = relationType;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonStudentVo.java

@@ -17,8 +17,11 @@ import java.util.List;
 public class VideoLessonStudentVo extends BaseEntity {
     private VideoLessonGroupVo lessonGroup;
 
+    @ApiModelProperty("课程详情信息 ")
     private List<VideoLessonGroupDetail> detailList;
 
+
+
     @ApiModelProperty(value = "true已买,false未买")
     private Boolean alreadyBuy;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/course/CourseRelationWrapper.java

@@ -0,0 +1,27 @@
+package com.yonge.cooleshow.biz.dal.wrapper.course;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 课程关联曲目、专辑信息
+ * Created by Eric.Shang on 2022/10/24.
+ */
+public class CourseRelationWrapper {
+
+    /**
+     * 关联曲目、专辑信息
+     */
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class MusicAlbumInfo implements Serializable {
+
+
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -281,6 +281,7 @@
 			g.lesson_cover_url_ AS lessonCoverUrl,
 			g.lesson_count_ AS lessonCount,
 			g.teacher_id_ AS teacherId,
+			g.relation_type_ AS relationType,
 			u.username_ AS userName,
 			u.real_name_ AS realName,
 			u.avatar_ AS avatar,