add:老师风采，曲目，专辑，课程审核版本

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/CmsFeignService.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.api.feign;
 
+import com.yonge.cooleshow.common.constant.AppConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.api.feign.fallback.CmsFeignServiceFallback;
 import com.yonge.toolset.feign.config.FeignConfiguration;
@@ -13,7 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @date 2022-04-29
  */
 
-@FeignClient(name = "cms-server", configuration = FeignConfiguration.class, fallback = CmsFeignServiceFallback.class)
+@FeignClient(name = AppConstant.APPLICATION_CMS_SERVER, configuration = FeignConfiguration.class, fallback = CmsFeignServiceFallback.class)
 public interface CmsFeignService {
 
     /**

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsInformation.java

@@ -35,7 +35,7 @@ public class SysNewsInformation {
 	private String videoCoverImage;
 
 	/** 类型 */
-	@ApiModelProperty(value = "类型,1热门资讯,2开屏广告，3闪页管理，4轮播图管理 5app按钮管理", required = true)
+	@ApiModelProperty(value = "类型,1热门资讯,2开屏广告，3闪页管理，4轮播图管理 5app按钮管理 6：乐理章节", required = true)
 	@NotNull(message = "类型不能为空")
 	private Integer type;
 	

cooleshow-cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -236,5 +236,6 @@
 		where content.status_ = 0
 		and content.release_time_ <= date_add(now(),interval 5 MINUTE)
 		and content.catalog_id_ = 2
+		and content.release_status_ = 0
 	</select>
 </mapper>

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/NoticeReleaseTask.java

@@ -4,13 +4,10 @@ import com.yonge.cooleshow.task.core.BaseTask;
 import com.yonge.cooleshow.task.core.TaskException;
 import com.yonge.cooleshow.api.feign.CmsFeignService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-/**
- * Description
- *
- * @author liujunchi
- * @date 2022-04-29
- */
+
+@Service
 public class NoticeReleaseTask  extends BaseTask {
 
     @Autowired

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/TeacherSendTask.java

@@ -7,11 +7,6 @@ import com.yonge.cooleshow.task.core.TaskException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-/**
- * 订单轮询
- * @Author: liweifan
- * @Data: 2022/4/13 17:36
- */
 @Service
 public class TeacherSendTask extends BaseTask {
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -9,10 +9,10 @@ import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -125,10 +125,10 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
     void courseAdjust(CourseAdjustVo adjustVo);
 
     //学生端-首页-直播课
-    List<StudentHomePage.Live> selectLive();
+    List<StudentHomePage.Live> selectLive(YesOrNoEnum appAuditVersion);
 
     //学生端-首页-视频课
-    List<StudentHomePage.Video> selectVideo();
+    List<StudentHomePage.Video> selectVideo(YesOrNoEnum appAuditVersion);
 
     //学生端-首页-最近一堂课
     StudentHomePage.RecentCourses selectRecentCourses(Long studentId);

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

@@ -0,0 +1,36 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-07
+ */
+@ApiModel("app审核版本参数")
+public class AppAuditVersionSearch {
+
+    @ApiModelProperty(value = "版本号", required = true)
+    private String version;
+
+    @ApiModelProperty(value = "平台",required = true)
+    private String platform;
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -20,6 +21,40 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     @ApiModelProperty("专辑分页参数")
     private Integer albumRow = 3;
 
+
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
+    @ApiModelProperty(value = "版本号",required = true)
+    private String version;
+
+    @ApiModelProperty(value = "平台",required = true)
+    private String platform;
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     public Integer getSheetRow() {
         return sheetRow;
     }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +18,39 @@ public class TeacherStyleSearch extends QueryInfo{
 
     private Long studentId;
 
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
+    @ApiModelProperty(value = "版本号",required = true)
+    private String version;
+
+    @ApiModelProperty(value = "平台",required = true)
+    private String platform;
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     public String getUsername() {
         return username;
     }

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +27,39 @@ public class VideoLessonGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "老师id")
     private Long teacherId;
 
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
+    @ApiModelProperty(value = "版本号",required = true)
+    private String version;
+
+    @ApiModelProperty(value = "平台",required = true)
+    private String platform;
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     public Long getTeacherId() {
         return teacherId;
     }

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

@@ -1,9 +1,11 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -91,6 +93,10 @@ public class CourseGroup implements Serializable {
     @ApiModelProperty(value = "课程开始时间")
     private Date courseStartTime;
 
+    @TableField(value = "audit_version_")
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
+    private YesOrNoEnum auditVersion = YesOrNoEnum.NO;
+
     @TableField("created_by_")
     @ApiModelProperty(value = "创建人")
     private Long createdBy;
@@ -282,5 +288,13 @@ public class CourseGroup implements Serializable {
     public void setCompleteCourseNum(Integer completeCourseNum) {
         this.completeCourseNum = completeCourseNum;
     }
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
 }
 

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

@@ -141,6 +141,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
     private YesOrNoEnum hasBeat;  //是否自带节拍器(0:否;1:是)
 
+	@TableField("audit_version_")
+	@ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
+	private YesOrNoEnum auditVersion;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;  //创建时间
@@ -421,4 +425,12 @@ public class MusicSheet implements Serializable {
 	public void setMp3Type(AudioTypeEnum mp3Type) {
 		this.mp3Type = mp3Type;
 	}
+
+	public YesOrNoEnum getAuditVersion() {
+		return auditVersion;
+	}
+
+	public void setAuditVersion(YesOrNoEnum auditVersion) {
+		this.auditVersion = auditVersion;
+	}
 }

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -55,6 +56,10 @@ public class TeacherStyleVideo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    @TableField("audit_version_")
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
+    private YesOrNoEnum auditVersion = YesOrNoEnum.NO;
+
     public Long getId() {
         return id;
     }
@@ -110,4 +115,12 @@ public class TeacherStyleVideo implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
 }

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.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.valid.AddGroup;
 import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
 import com.yonge.cooleshow.common.entity.BaseEntity;
@@ -103,6 +104,11 @@ public class VideoLessonGroup extends BaseEntity {
     @ApiModelProperty(value = "审批人id")
     private Integer auditId;
 
+
+    @TableField("audit_version_")
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
+    private YesOrNoEnum auditVersion = YesOrNoEnum.NO;
+
     public Long getId() {
         return id;
     }
@@ -246,4 +252,12 @@ public class VideoLessonGroup extends BaseEntity {
     public void setAuditId(Integer auditId) {
         this.auditId = auditId;
     }
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import java.util.List;
 
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface AppVersionInfoService extends BaseService<Long, AppVersionInfo> {
@@ -21,4 +22,13 @@ public interface AppVersionInfoService extends BaseService<Long, AppVersionInfo>
 	 * @return
 	 */
 	AppVersionInfo selectAppVersionInfo(String platform, String version);
+
+	/**
+	 * 获取是否是审核版本
+	 *
+	 * @param platform 平台 ios、andorid
+	 * @param version 版本号
+	 * @return
+	 */
+	YesOrNoEnum getAppAuditVersion(String platform, String version);
 }

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

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseCalendarEntity;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.entity.TeacherSubjectPrice;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -185,7 +186,7 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     void courseAdjust(CourseAdjustVo adjustVo);
 
-    StudentHomePage queryLiveAndVideo(Long studentId,Long teacherId);
+    StudentHomePage queryLiveAndVideo(Long studentId, Long teacherId, YesOrNoEnum appAuditVersion);
 
     List<TeacherSubjectPrice> teacherSubjectPrice(Long teacherId);
 

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

@@ -3,6 +3,8 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.yonge.cooleshow.biz.dal.enums.AppVersionStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,4 +62,15 @@ public class AppVersionInfoServiceImpl extends BaseServiceImpl<Long, AppVersionI
 	public AppVersionInfo selectAppVersionInfo(String platform, String version) {
 		return appVersionInfoDao.selectAppVersionInfo(platform, version);
 	}
+
+    @Override
+    public YesOrNoEnum getAppAuditVersion(String platform, String version) {
+		AppVersionInfo appVersionInfo = selectAppVersionInfo(platform, version);
+		if (appVersionInfo != null
+				&& AppVersionStatusEnum.AUDITING.getCode().equals(appVersionInfo.getStatus())) {
+			return YesOrNoEnum.YES;
+		} else {
+			return YesOrNoEnum.NO;
+		}
+	}
 }

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

@@ -996,11 +996,14 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @Date: 2022/4/22
      */
     @Override
-    public StudentHomePage queryLiveAndVideo(Long studentId, Long teacherId) {
+    public StudentHomePage queryLiveAndVideo(Long studentId, Long teacherId, YesOrNoEnum appAuditVersion) {
         StudentHomePage homePage = new StudentHomePage();
+        if (appAuditVersion == null) {
+            appAuditVersion = YesOrNoEnum.NO;
+        }
         if (teacherId == null) {
-            homePage.setLiveList(baseMapper.selectLive());
-            homePage.setVideoList(baseMapper.selectVideo());
+            homePage.setLiveList(baseMapper.selectLive(appAuditVersion));
+            homePage.setVideoList(baseMapper.selectVideo(appAuditVersion));
             homePage.setRecentCourses(baseMapper.selectRecentCourses(studentId));
         }
         if (studentId == null) {

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

@@ -198,6 +198,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
 
     private boolean checkNameRepeat(String albumName, Long id) {
         LambdaQueryChainWrapper<MusicAlbum> eq = this.lambdaQuery()
+                                                     .eq(MusicAlbum::getDelFlag,0)
                                                    .eq(MusicAlbum::getAlbumName, albumName);
         if (id != null) {
             eq.ne(MusicAlbum::getId,id);

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

@@ -323,6 +323,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             musicSheetAccompanimentService.delByMusicSheetId(musicSheetDto.getId());
         }
 
+        if (musicSheetDto.getAuditVersion() == null) {
+            musicSheetDto.setAuditVersion(YesOrNoEnum.NO);
+        }
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
             list = musicSheetDto.getBackground();

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

@@ -335,7 +335,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         List<TeacherStyleVideo> createList = styleVideo.stream().filter(o -> o.getId() == null)
                 .collect(Collectors.toList());
 
-        createList.forEach(o -> o.setUserId(teacherDto.getUserId()));
+        createList.forEach(o -> {
+            o.setUserId(teacherDto.getUserId());
+            o.setAuditVersion(YesOrNoEnum.NO);
+        });
 
         List<Long> oldIds = styleVideo.stream().filter(o -> o.getId() != null)
                 .map(TeacherStyleVideo::getId).collect(Collectors.toList());

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

@@ -132,6 +132,9 @@
                 or b.name_ like concat('%',#{param.search},'%')
                 )
             </if>
+            <if test="param.auditVersion != null ">
+                and #{param.auditVersion} = b.audit_version_
+            </if>
         </where>
     </select>
 

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

@@ -503,7 +503,7 @@
         FROM course_group g
         LEFT JOIN sys_user u ON g.teacher_id_=u.id_
         LEFT JOIN subject s ON g.subject_id_=s.id_
-        WHERE type_='LIVE' and g.status_ = 'APPLY'
+        WHERE type_='LIVE' and g.status_ = 'APPLY' and #{appAuditVersion} = g.audit_version_
         ORDER BY courseStartTime DESC LIMIT 4
     </select>
     <select id="selectVideo" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$Video">
@@ -525,7 +525,7 @@
         LEFT JOIN sys_user u ON g.teacher_id_=u.id_
         LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
         LEFT JOIN (SELECT video_lesson_group_id_ ,COUNT(1) AS count_ FROM video_lesson_purchase_record GROUP BY video_lesson_group_id_) r ON g.id_= r.video_lesson_group_id_
-        WHERE g.audit_status_='PASS'
+        WHERE g.audit_status_='PASS' and #{appAuditVersion} = g.audit_version_
         ORDER BY g.create_time_ DESC LIMIT 4
     </select>
     <select id="selectRecentCourses" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$RecentCourses">

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

@@ -84,13 +84,13 @@
         </if>
         <if test="param.musicTagIds != null and param.musicTagIds != ''">
             and
-            <foreach collection="param.musicTagIdList" separator="and" item="item">
+            <foreach collection="param.musicTagIdList" separator="or" item="item">
                 find_in_set(#{item},t.music_tag_)
             </foreach>
         </if>
         <if test="param.subjectIds != null and param.subjectIds != ''">
             and
-            <foreach collection="param.subjectIdList" separator="and" item="item">
+            <foreach collection="param.subjectIdList" separator="or" item="item">
                 find_in_set(#{item},t.music_subject_)
             </foreach>
         </if>
@@ -247,6 +247,9 @@
         </if>
         <where>
             <include refid="QueryInfo"/>
+            <if test="param.auditVersion != null ">
+                and #{param.auditVersion} = t.audit_version_
+            </if>
         </where>
         order by  t.id_ desc
     </select>

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

@@ -58,6 +58,9 @@
 			<if test="param.subjectId != null and param.subjectId != ''">
 				AND INTE_ARRAY(a.subject_id_,#{param.subjectId})
 			</if>
+			<if test="param.auditVersion != null">
+				and #{param.auditVersion} = t.audit_version_
+			</if>
 		</where>
 		order by ta.live_flag_ desc,(ta.fans_num_ * 0.3 + t.browse_ * 0.3 + ta.exp_time_) desc
 	</select>

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

@@ -252,6 +252,9 @@
 			<if	test="param.teacherId != null">
 				AND g.teacher_id_ = #{param.teacherId}
 			</if>
+			<if test="param.auditVersion != null">
+				and g.audit_version_ = #{param.auditVersion}
+			</if>
 		</where>
 		ORDER BY g.create_time_ DESC
 	</select>

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

@@ -54,14 +54,8 @@ public class MusicAlbumController extends BaseController {
         }
 
         // 检查app版本
-        AppVersionInfo appVersionInfo = appVersionInfoService.selectAppVersionInfo(query.getPlatform(),
-                                                                                   query.getVersion());
-        if (appVersionInfo != null
-                && AppVersionStatusEnum.AUDITING.getCode().equals(appVersionInfo.getStatus())) {
-            query.setAuditVersion(YesOrNoEnum.YES);
-        } else {
-            query.setAuditVersion(YesOrNoEnum.NO);
-        }
+        query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
+
 
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
@@ -48,6 +49,9 @@ public class MusicSheetController extends BaseController {
     @Autowired
     private MusicAlbumService musicAlbumService;
 
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
+
     /**
      * 查询单条
      */
@@ -68,6 +72,9 @@ public class MusicSheetController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
+        // 检查app版本
+        query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
+
 
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
@@ -86,8 +93,11 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
+        // 检查app版本
+        YesOrNoEnum appAuditVersion = appVersionInfoService.getAppAuditVersion(query.getPlatform(), query.getVersion());
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
+        query.setAuditVersion(appAuditVersion);
         query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         query.setRows(query.getSheetRow());
@@ -96,6 +106,7 @@ public class MusicSheetController extends BaseController {
         MusicAlbumSearch musicAlbumSearch = new MusicAlbumSearch();
         musicAlbumSearch.setAlbumStatus(YesOrNoEnum.YES);
         musicAlbumSearch.setSortBy(1);
+        musicAlbumSearch.setAuditVersion(appAuditVersion);
         musicAlbumSearch.setAlbumTagIds(query.getMusicTagIds());
         musicAlbumSearch.setPage(query.getPage());
         musicAlbumSearch.setRows(query.getAlbumRow());

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentCourseGroupController.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.student.controller;
 
 import com.yonge.cooleshow.biz.dal.dto.CheckCourseTimeDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
 import com.yonge.cooleshow.biz.dal.vo.CourseGroupVo;
 import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
@@ -9,6 +11,7 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -31,6 +34,9 @@ public class StudentCourseGroupController extends BaseController {
     @Resource
     private CourseGroupService courseGroupService;
 
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
+
     @ApiOperation("直播课详情")
     @GetMapping("/queryLiveCourseInfo")
     public HttpResponseResult<LiveCourseInfoVo> queryLiveCourseInfo(@ApiParam(value = "课程组id", required = true) @RequestParam(value = "groupId") Long groupId) {
@@ -43,11 +49,18 @@ public class StudentCourseGroupController extends BaseController {
             @ApiImplicitParam(name = "groupStatus", dataType = "String", value = "课程组状态  ING(进行中)  NOT_SALE(未开售,未上架) APPLY(报名中,销售中) COMPLETE(已完成)"),
             @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
             @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+            @ApiImplicitParam(name = "version", dataType = "String", value = "版本"),
+            @ApiImplicitParam(name = "platform", dataType = "Integer", value = "平台"),
     })
     @ApiOperation("分页查询直播课课程组列表")
     @PostMapping("/queryPageCourseGroup")
     public HttpResponseResult<PageInfo<CourseGroupVo>> queryPageLiveCourseGroup(@RequestBody Map<String, Object> param) {
         param.put("os","student");
+        YesOrNoEnum auditVersion = YesOrNoEnum.NO;
+        if (param.get("platform") != null && param.get("version") != null) {
+            auditVersion = appVersionInfoService.getAppAuditVersion(param.get("platform").toString(),param.get("version").toString());
+        }
+        param.put("auditVersion",auditVersion);
         return succeed(courseGroupService.queryPageLiveCourseGroup(param));
     }
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentCourseScheduleController.java

@@ -3,12 +3,15 @@ package com.yonge.cooleshow.student.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.search.AppAuditVersionSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseCalendarEntity;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
 import com.yonge.cooleshow.biz.dal.entity.TeacherSubjectPrice;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.CourseRepliedService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
@@ -44,6 +47,8 @@ public class StudentCourseScheduleController extends BaseController {
     private CourseScheduleService courseScheduleService;
     @Autowired
     private CourseRepliedService repliedService;
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
 
     @ApiOperation("学生端-我的-我的课程-陪练课")
     @PostMapping("/queryStudentPracticeCourse")
@@ -128,14 +133,16 @@ public class StudentCourseScheduleController extends BaseController {
     }
 
     @ApiOperation("学生-首页-直播课&视频课&最近课程")
-    @GetMapping("/queryLiveAndVideo")
-    public HttpResponseResult<StudentHomePage> queryLiveAndVideo() {
+    @PostMapping("/queryLiveAndVideo")
+    public HttpResponseResult<StudentHomePage> queryLiveAndVideo(@RequestBody AppAuditVersionSearch search) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         // 检查app版本审核/正式
-        return succeed(courseScheduleService.queryLiveAndVideo(user.getId(),null));
+        YesOrNoEnum appAuditVersion = appVersionInfoService.getAppAuditVersion(search.getPlatform(),
+                                                                               search.getVersion());
+        return succeed(courseScheduleService.queryLiveAndVideo(user.getId(),null,appAuditVersion));
     }
 
     @ApiImplicitParams({

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/TeacherController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherStyleSearch;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.StudentStarService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.service.TeacherStyleVideoService;
@@ -34,6 +35,9 @@ public class TeacherController extends BaseController {
     @Autowired
     private StudentStarService studentStarService;
 
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
+
     @ApiOperation(value = "老师风采-分页")
     @PostMapping("/stylePage")
     public HttpResponseResult<PageInfo<TeacherStyleVideoVo>> stylePage(@RequestBody TeacherStyleSearch query) {
@@ -41,6 +45,8 @@ public class TeacherController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        // 检查app版本
+        query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
         query.setStudentId(user.getId());
         IPage<TeacherStyleVideoVo> pages = styleVideoService.stylePage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VideoLessonController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonEvaluateSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
+import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
@@ -42,7 +43,8 @@ public class VideoLessonController extends BaseController {
     private VideoLessonEvaluateService evaluateService;
     @Autowired
     private VideoLessonGroupService videoLessonGroupService;
-
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
     /**
      * @Description: 根据组id查询视频课
      * @Author: cy
@@ -95,6 +97,10 @@ public class VideoLessonController extends BaseController {
     @ApiOperation(value = "查询视频课组")
     @PostMapping(value = "/selectGroup")
     public HttpResponseResult<PageInfo<LessonGroupVo>> page(@RequestBody VideoLessonGroupSearch query) {
+
+        // 检查app版本
+        query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
+
         IPage<LessonGroupVo> pages = videoLessonGroupService.selectLessonGroup(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseScheduleController.java

@@ -143,7 +143,7 @@ public class TeacherCourseScheduleController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(courseScheduleService.queryLiveAndVideo(null,user.getId()));
+        return succeed(courseScheduleService.queryLiveAndVideo(null, user.getId(), null));
     }
 }