fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/CourseMusicAlbumRelationDto.java

@@ -24,17 +24,6 @@ public class CourseMusicAlbumRelationDto {
     @ApiModelProperty("类型 MUSIC：曲目 ALBUM:专辑")
     private RelationMusicAlbumEnum relationMusicAlbum;
 
-    @ApiModelProperty(hidden = true,value = "冗余json转换")
-    private RelationMusicAlbumEnum relationType;
-
-    public RelationMusicAlbumEnum getRelationType() {
-        return relationType;
-    }
-
-    public void setRelationType(RelationMusicAlbumEnum relationType) {
-        this.relationType = relationType;
-    }
-
     public CourseRelationTypeEnum getUseRelationType() {
         return useRelationType;
     }
@@ -65,6 +54,5 @@ public class CourseMusicAlbumRelationDto {
 
     public void setRelationMusicAlbum(RelationMusicAlbumEnum relationMusicAlbum) {
         this.relationMusicAlbum = relationMusicAlbum;
-        this.relationType = relationMusicAlbum;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/VideoLessonGroupDetailDto.java

@@ -1,9 +1,11 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
+import com.yonge.cooleshow.biz.dal.entity.CourseRelationMusicAlbum;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.wrapper.course.CourseRelationWrapper;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -15,6 +17,19 @@ public class VideoLessonGroupDetailDto extends VideoLessonGroupDetail {
     @ApiModelProperty("关联曲目/专辑信息(查看) ")
     private List<CourseRelationWrapper.MusicAlbumInfo> musicAlbumInfos;
 
+
+    @ApiModelProperty(value = "数据库保存json数据",hidden = true)
+    private List<CourseRelationMusicAlbum> courseRelationMusicAlbumList = new ArrayList<>();
+
+
+    public List<CourseRelationMusicAlbum> getCourseRelationMusicAlbumList() {
+        return courseRelationMusicAlbumList;
+    }
+
+    public void setCourseRelationMusicAlbumList(List<CourseRelationMusicAlbum> courseRelationMusicAlbumList) {
+        this.courseRelationMusicAlbumList = courseRelationMusicAlbumList;
+    }
+
     public List<CourseMusicAlbumRelationDto> getRelationList() {
         return relationList;
     }

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

@@ -238,11 +238,12 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
         search.setVideoLessonGroupId(groupId);
         lessonStudentVo.setDetailList(JsonUtil.parseArray(videoLessonGroupLog.getVideoDetailJson(), VideoLessonGroupDetailDto.class));
 
-        List<CourseMusicAlbumRelationDto> relationMusicAlbums = lessonStudentVo.getDetailList().stream()
-                .flatMap(x -> x.getRelationList().stream()).collect(Collectors.toList());
-        // 课程关联曲目、专辑信息
-        List<CourseRelationMusicAlbum> recordInfos = JSON.parseArray(JSON.toJSONString(relationMusicAlbums),
-                CourseRelationMusicAlbum.class);
+        List<CourseRelationMusicAlbum> recordInfos = lessonStudentVo.getDetailList().stream()
+                .filter(x -> CollectionUtils.isNotEmpty(x.getCourseRelationMusicAlbumList()))
+                .flatMap(x -> x.getCourseRelationMusicAlbumList().stream()).collect(Collectors.toList());
+        // // 课程关联曲目、专辑信息
+        // List<CourseRelationMusicAlbum> recordInfos = JSON.parseArray(JSON.toJSONString(relationMusicAlbums),
+        //         CourseRelationMusicAlbum.class);
 
         List<CourseRelationWrapper.MusicAlbumInfo> musicAlbumInfos;
         if (CollectionUtils.isNotEmpty(recordInfos)) {

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

@@ -303,6 +303,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                 } else {
                     updateCourseRelationMusicAlbums.add(courseRelationMusicAlbum);
                 }
+                videoLessonGroupDetailDto.getCourseRelationMusicAlbumList().add(courseRelationMusicAlbum);
             }
         }
         // 删除关联数据
@@ -421,6 +422,8 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             lessonGroup.setDraftFlag(YesOrNoEnum.NO);
         }
 
+        // 设置关联曲目
+        courseMusicAlbumRelation(lessonList,lessonGroup.getId());
 
         if (YesOrNoEnum.NO.equals(lessonGroup.getDraftFlag())) {
             VideoLessonGroupLog videoLessonGroupLog = new VideoLessonGroupLog();
@@ -441,8 +444,6 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             videoLessonGroupLogService.insert(videoLessonGroupLog);
         }
 
-        // 设置关联曲目
-        courseMusicAlbumRelation(lessonList,lessonGroup.getId());
     }
 
     /**