展示字段添加

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

@@ -327,6 +327,7 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
                 item.name(music.getMusicSheetName())
                         .cover(music.getTitleImg());
                 item.setRemark(music.getComposer());
+                item.setTagIds(music.getMusicTag());
             }
 
             if (RelationMusicAlbumEnum.ALBUM == item.getRelationType()
@@ -337,6 +338,7 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
                 item.name(album.getAlbumName())
                         .cover(album.getAlbumCoverUrl());
                 item.setRemark(album.getAlbumDesc());
+                item.setTagIds(album.getAlbumTag());
             }
         }
         return musicAlbumInfos;

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

@@ -1,6 +1,8 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,10 +15,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.biz.dal.dto.CourseMusicAlbumRelationDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseRelationMusicAlbum;
+import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseTypeEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.CourseRelationQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CourseRelationMusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
 import com.yonge.cooleshow.biz.dal.wrapper.course.CourseRelationWrapper;
@@ -90,6 +94,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     private final static Logger log = LoggerFactory.getLogger(VideoLessonGroupServiceImpl.class);
 
     @Autowired
+    private MusicTagService musicTagService;
+
+    @Autowired
     private VideoLessonGroupDao videoLessonGroupDao;
     @Autowired
     private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
@@ -404,7 +411,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             lessonGroup.setDraftFlag(YesOrNoEnum.NO);
         }
         if (lessonGroup.getDraftFlag().equals(YesOrNoEnum.YES)) {
-            lessonGroup.setAuditStatus(AuthStatusEnum.PASS);
+            lessonGroup.setAuditStatus(AuthStatusEnum.UNPASS);
             lessonGroup.setShelvesFlag(0);
         }
 
@@ -608,7 +615,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         lessonGroup.setAuditStatus(AuthStatusEnum.DOING);
 
         if (lessonGroup.getDraftFlag().equals(YesOrNoEnum.YES)) {
-            lessonGroup.setAuditStatus(AuthStatusEnum.PASS);
+            lessonGroup.setAuditStatus(AuthStatusEnum.UNPASS);
             lessonGroup.setShelvesFlag(0);
         }
         lessonGroup.setUpdateTime(date);
@@ -821,15 +828,38 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                                                           .collect(Collectors.toList());
         // 查询课程名
         List<VideoLessonGroupDetail> list = videoLessonGroupDetailService.lambdaQuery()
-                                                                         .in(VideoLessonGroupDetail::getId,
-                                                                             courseIdList)
+                                                                         .in(VideoLessonGroupDetail::getId,courseIdList)
                                                                          .list();
+
         Map<Long, String> collect = list.stream()
                                         .collect(Collectors.toMap(VideoLessonGroupDetail::getId,
                                                                   VideoLessonGroupDetail::getVideoTitle));
         for (CourseRelationWrapper.MusicAlbumInfo courseRelationMusicAlbumInfo : courseRelationMusicAlbumInfos) {
             courseRelationMusicAlbumInfo.setVideoTitle(collect.get(courseRelationMusicAlbumInfo.getCourseId()));
         }
+        //查询标签
+        List<Long> tagIdList =  courseRelationMusicAlbumInfos.stream()
+                                                             .map(CourseRelationWrapper.MusicAlbumInfo::getTagIds)
+                                                             .map(s -> Arrays.asList(s.split(",")))
+                                                             .flatMap(Collection::stream)
+                                                             .filter(StringUtils::isNotEmpty)
+                                                             .map(Long::parseLong).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(tagIdList)) {
+            List<MusicTag> musicTagList = musicTagService.lambdaQuery()
+                                                         .in(MusicTag::getId, tagIdList)
+                                                         .eq(MusicTag::getDelFlag, 0)
+                                                         .list();
+            Map<String, String> musicTagIdNameMap = musicTagList.stream()
+                                                                .collect(Collectors.toMap(o -> o.getId().toString(),
+                                                                                          MusicTag::getName));
+            for (CourseRelationWrapper.MusicAlbumInfo courseRelationMusicAlbumInfo : courseRelationMusicAlbumInfos) {
+                String tagIds = courseRelationMusicAlbumInfo.getTagIds();
+                String tagName = Arrays.stream(tagIds.split(","))
+                                       .map(musicTagIdNameMap::get)
+                                       .collect(Collectors.joining(","));
+                courseRelationMusicAlbumInfo.setTagName(tagName);
+            }
+        }
 
         courseRelationMusicAlbumIPage.setRecords(courseRelationMusicAlbumInfos);
         return courseRelationMusicAlbumIPage;

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

@@ -1,5 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
@@ -41,6 +43,41 @@ public class CourseGroupVideoVo extends BaseEntity {
     @ApiModelProperty(value = "草稿状态, 0正式1草稿")
     private YesOrNoEnum draftFlag;
 
+
+    @ApiModelProperty(value = "审核状态(DOING:待审核 PASS:通过 UNPASS:未通过)")
+    private AuthStatusEnum status;  //审核状态
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+
+    @ApiModelProperty(value = "是否置顶")
+    private Integer topFlag;  //是否置顶
+
+    public AuthStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(AuthStatusEnum status) {
+        this.status = status;
+    }
+
+    public Integer getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Integer sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public Integer getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(Integer topFlag) {
+        this.topFlag = topFlag;
+    }
+
     public YesOrNoEnum getDraftFlag() {
         return draftFlag;
     }

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

@@ -68,6 +68,12 @@ public class CourseRelationWrapper {
         @ApiModelProperty("视频标题")
         private String videoTitle;
 
+        @ApiModelProperty("标签id")
+        private String tagIds;
+
+        @ApiModelProperty("标签")
+        private String tagName;
+
         public MusicAlbumInfo name(String name) {
             this.name = name;
             return this;

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

@@ -584,6 +584,9 @@
             g.create_time_ AS createTime,
             r.create_time_ AS recordTime,
             g.shelves_flag_ as shelvesFlag,
+            g.sort_number_ as sortNumber,
+            g.top_flag_ as topFlag,
+            g.audit_status_ as status,
         g.draft_flag_ as draftFlag
         FROM video_lesson_group g
         LEFT JOIN `subject` s ON g.lesson_subject_=s.id_