Merge remote-tracking branch 'origin/feature/1219_opt' into feature/1219_opt

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -130,25 +130,28 @@ public class MusicAlbumController extends BaseController {
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query), query,sysUser,ClientEnum.STUDENT);
         albumDetailVo.setFavorite(yesOrNoEnum);
 
-        // 相关专辑
-        MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
-        musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
-        musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
-        musicAlbumSearch.setAuditVersion(albumDetailVo.getAuditVersion());
-        musicAlbumSearch.setSortBy(1);
-        musicAlbumSearch.setPage(1);
-        musicAlbumSearch.setRows(query.getRelatedNum() +1);
-        musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
-        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.STUDENT);
-        List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
-                                                      .stream()
-                                                      .filter(musicAlbumVo -> !musicAlbumVo.getId()
-                                                                                           .equals(albumDetailVo.getId()))
-                                                      .collect(Collectors.toList());
-        if (musicAlbumVos1.size() > query.getRelatedNum()) {
-            musicAlbumVos1 = musicAlbumVos1.subList(0,query.getRelatedNum());
+
+        if (query.getQueryRelatedAlbum()) {
+            // 相关专辑
+            MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
+            musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
+            musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
+            musicAlbumSearch.setAuditVersion(albumDetailVo.getAuditVersion());
+            musicAlbumSearch.setSortBy(1);
+            musicAlbumSearch.setPage(1);
+            musicAlbumSearch.setRows(query.getRelatedNum() + 1);
+            musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
+            IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch), musicAlbumSearch, ClientEnum.STUDENT);
+            List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
+                    .stream()
+                    .filter(musicAlbumVo -> !musicAlbumVo.getId()
+                            .equals(albumDetailVo.getId()))
+                    .collect(Collectors.toList());
+            if (musicAlbumVos1.size() > query.getRelatedNum()) {
+                musicAlbumVos1 = musicAlbumVos1.subList(0, query.getRelatedNum());
+            }
+            albumDetailVo.setRelatedMusicAlbum(musicAlbumVos1);
         }
-        albumDetailVo.setRelatedMusicAlbum(musicAlbumVos1);
         return succeed(albumDetailVo);
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicAlbumController.java

@@ -119,25 +119,27 @@ public class MusicAlbumController extends BaseController {
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query), query, sysUser,  ClientEnum.TEACHER);
         albumDetailVo.setFavorite(yesOrNoEnum);
 
-        // 相关专辑
-        MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
-        musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
-        musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
-        musicAlbumSearch.setAuditVersion(albumDetailVo.getAuditVersion());
-        musicAlbumSearch.setSortBy(1);
-        musicAlbumSearch.setPage(1);
-        musicAlbumSearch.setRows(query.getRelatedNum() +1);
-        musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
-        IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.TEACHER);
-        List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
-                                                      .stream()
-                                                      .filter(musicAlbumVo -> !musicAlbumVo.getId()
-                                                                                           .equals(albumDetailVo.getId()))
-                                                      .collect(Collectors.toList());
-        if (musicAlbumVos1.size() > query.getRelatedNum()) {
-            musicAlbumVos1 = musicAlbumVos1.subList(0,query.getRelatedNum());
+        if (query.getQueryRelatedAlbum()) {
+            // 相关专辑
+            MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
+            musicAlbumSearch.setAuditVersion(YesOrNoEnum.NO);
+            musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
+            musicAlbumSearch.setAuditVersion(albumDetailVo.getAuditVersion());
+            musicAlbumSearch.setSortBy(1);
+            musicAlbumSearch.setPage(1);
+            musicAlbumSearch.setRows(query.getRelatedNum() + 1);
+            musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
+            IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch), musicAlbumSearch, ClientEnum.TEACHER);
+            List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
+                    .stream()
+                    .filter(musicAlbumVo -> !musicAlbumVo.getId()
+                            .equals(albumDetailVo.getId()))
+                    .collect(Collectors.toList());
+            if (musicAlbumVos1.size() > query.getRelatedNum()) {
+                musicAlbumVos1 = musicAlbumVos1.subList(0, query.getRelatedNum());
+            }
+            albumDetailVo.setRelatedMusicAlbum(musicAlbumVos1);
         }
-        albumDetailVo.setRelatedMusicAlbum(musicAlbumVos1);
         return succeed(albumDetailVo);
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.teacher.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.AppMusicSheetVo;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetRenderDto;
@@ -24,7 +25,6 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.EStatus;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
@@ -235,18 +235,19 @@ public class MusicSheetController extends BaseController {
      */
     @GetMapping("/favorite")
     @ApiOperation(value = "收藏单曲")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> favoriteMusic(QueryInfo query) {
+    public HttpResponseResult<PageInfo<MusicSheetVo>> favoriteMusic(MusicSheetWrapper.MusicSheetFavoriteQuery query) {
         SysUser sysUser = sysUserService.getUser();
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         Teacher teacher = teacherService.getById(sysUser.getId());
         if (teacher.getTenantId() !=null && teacher.getTenantId() >0) {
             search.setTenantId(teacher.getTenantId());
         }
+        search.setFavoriteProviderType(query.getProviderType());
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(null);
         search.setProviderType(null);
-        IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search, ClientEnum.TEACHER);
+        IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(QueryInfo.getPage(query),search, ClientEnum.TEACHER);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
 

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

@@ -61,6 +61,9 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
     @ApiModelProperty("是否查询曲目信息")
     private Boolean queryMusicSheet = true;
 
+    @ApiModelProperty("是否查询相关专辑信息")
+    private Boolean queryRelatedAlbum = true;
+
     public Long getStudentId() {
         return studentId;
     }

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

@@ -61,6 +61,8 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "提供方 TENANT 机构 PLATFORM 平台")
     private SourceTypeEnum providerType = SourceTypeEnum.PLATFORM;
 
+    @ApiModelProperty("收藏来源  TENANT 机构 PLATFORM 平台")
+    private SourceTypeEnum favoriteProviderType;
 
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
     private YesOrNoEnum state;

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

@@ -579,6 +579,10 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
     // 检查时间段是否满足课程时间，不满足则删除，满足 并且可多段的情况下，将时间段拆分
     private List<CourseTimeEntity> splitTime(List<CourseTimeEntity> courseTime, Integer courseMinutes,Integer freeMinutes) {
+
+        //过滤掉当前时间之前的时间段
+        courseTime = courseTime.stream().filter(time -> time.getStartTime().compareTo(new Date()) >= 0).collect(Collectors.toList());
+
         Integer mergeMinutes = courseMinutes + freeMinutes;
         List<CourseTimeEntity> result = new ArrayList<>();
         for (CourseTimeEntity courseTimeEntity : courseTime) {

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

@@ -1364,6 +1364,7 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
     public Boolean updateImGroup(ImGroup imGroup) {
 
         this.updateById(imGroup);
+        imGroup= this.getById(imGroup.getId());
         try {
             imGroupCoreService.modifyGroupInfo(imGroup.getId(),imGroup.getName(),imGroup.getImg());
         } catch (Exception e) {

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

@@ -1174,4 +1174,19 @@ public class MusicSheetWrapper {
 
 
     }
+
+
+    @Data
+    public static class MusicSheetFavoriteQuery implements QueryInfo {
+
+        @ApiModelProperty(value = "提供方 TENANT 机构 PLATFORM 平台")
+        private SourceTypeEnum providerType = SourceTypeEnum.PLATFORM;
+
+        @ApiModelProperty("当前页")
+        private Integer page;
+
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+
+    }
 }

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

@@ -633,6 +633,9 @@
                     </if>
                 )
             </if>
+            <if test="param.favoriteProviderType != null">
+                and mf.provider_type_ = #{param.favoriteProviderType}
+            </if>
 
             <if test="param.studentId != null">
                 and mf.user_id_ = #{param.studentId}