add:专辑添加app审核控制

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -72,6 +72,9 @@ public class NewsController extends BaseController {
 		if (!check.getStatus()) {
 			return check;
 		}
+		if (StringUtil.isEmpty(newsInfo.getAttribute1())) {
+			newsInfo.setAttribute1("0");
+		}
 		newsInfo.setStatus(NewsStatusEnum.HIDDEN);
 		newsInfo.setCreateTime(new Date());
 		newsInfo.setCreateBy(sysUser.getId());
@@ -158,6 +161,9 @@ public class NewsController extends BaseController {
 		if(NewsStatusEnum.SHOW.getCode().equals(sysNewsInformationDto.getStatus().getCode())) {
 			return failed("启用状态下，不可修改");
 		}
+		if (StringUtil.isEmpty(newsInfo.getAttribute1())) {
+			newsInfo.setAttribute1("0");
+		}
 		if (newsInfo.getType() == 2) {
 			if ( "IMAGE".equals(newsInfo.getAttribute2())) {
 				newsInfo.setLinkUrl("");
@@ -207,8 +213,17 @@ public class NewsController extends BaseController {
 	@ApiOperation("app首页banner、按钮、资讯")
 	@PostMapping(value = "/app/home")
 	public HttpResponseResult<AppHomeDto> appHome(@RequestBody AppParam param) {
-		AppHomeDto appHomeDto = new AppHomeDto();
+
 		NewsInformationQueryInfo queryInfo = new NewsInformationQueryInfo();
+		//  查询app版本
+		String status = sysNewsInformationService.selectAppVersionInfo(param.getPlatform(), param.getVersion());
+		if ("auditing".equals(status)) {
+			queryInfo.setVersion("1");
+		}  else {
+			queryInfo.setVersion("0");
+		}
+
+		AppHomeDto appHomeDto = new AppHomeDto();
 		queryInfo.setStatus(NewsStatusEnum.SHOW);
 		queryInfo.setPlatformType("STUDENT");
 		// 1热门资讯
@@ -236,7 +251,6 @@ public class NewsController extends BaseController {
 
 		// 按钮
 		queryInfo.setType(5);
-		queryInfo.setVersion(param.getVersion());
 		params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		appHomeDto.setAppMenu(sysNewsInformationService.selectPage(queryInfo).getRows());

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -39,7 +39,7 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "需排除编号")
 	private List<Long> excludeIds;
 
-	@ApiModelProperty("版本号")
+	@ApiModelProperty("是否审核版本 0：否，1：是")
 	private String version;
 
 	@ApiModelProperty("广告类型  IMAGE:图片，VIDEO:视频")

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsInformationDao.java

@@ -60,7 +60,7 @@ public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation>
 	 *
 	 * @param id
 	 */
-    void updateStatus(Long id);
+	void updateStatus(Long id);
 
 	/**
 	 * 查看广告版本
@@ -70,4 +70,13 @@ public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation>
 	 * @return
 	 */
 	Integer selectByVersionAndStatus(@Param("version") String version, @Param("status") Integer status);
+
+	/**
+	 * 获取当前app版本是否为审核状态
+	 *
+	 * @param platform 平台
+	 * @param version 版本
+	 * @return
+	 */
+	String selectAppVersionInfo(@Param("platform") String platform, @Param("version") String version);
 }

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

@@ -81,7 +81,7 @@ public class SysNewsInformation {
 
 	private Boolean delFlag= false;
 
-	@ApiModelProperty("版本号")
+	@ApiModelProperty("是否审核版本 0：否，1：是")
 	private String attribute1;
 
 	@ApiModelProperty("广告类型  IMAGE:图片，VIDEO:视频")

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/AppParam.java

@@ -12,9 +12,13 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel("app首页查询参数")
 public class AppParam {
 
-    @ApiModelProperty("版本号")
+    @ApiModelProperty(value = "版本号",required = true)
     private String version;
 
+    @ApiModelProperty(value = "平台",required = true)
+    private String platform;
+
+
     public String getVersion() {
         return version;
     }
@@ -22,4 +26,12 @@ public class AppParam {
     public void setVersion(String version) {
         this.version = version;
     }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsInformationService.java

@@ -62,4 +62,6 @@ public interface SysNewsInformationService extends BaseService<Long, SysNewsInfo
 	 * @return
 	 */
     boolean updateStatus(Long id);
+
+    String selectAppVersionInfo(String platform, String version);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -118,7 +118,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	}
 
 	private PageInfo<SysNewsInformation> queryHomePage(QueryInfo queryInfo) {
-		PageInfo<SysNewsInformation> pageInfo = new PageInfo<SysNewsInformation>(queryInfo.getPage(), queryInfo.getRows());
+		PageInfo<SysNewsInformation> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 		
@@ -197,4 +197,8 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		return true;
     }
 
+	@Override
+	public String selectAppVersionInfo(String platform, String version) {
+		return sysNewsInformationDao.selectAppVersionInfo(platform, version);
+	}
 }

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

@@ -180,7 +180,12 @@
 		order by sni.status_ desc,sni.order_,sni.update_time_ desc
 		<include refid="global.limit"/>
 	</select>
-	
+
+	<select id="selectAppVersionInfo" resultType="java.lang.String">
+
+		select avi.status_ from app_version_info avi where avi.platform_ = #{platform} and avi.version_ = #{version}
+
+	</select>
 	<!-- 查询当前表的总记录数 -->
 	<select id="selectPageCount" resultType="int">
 		SELECT COUNT(sni.id_) FROM sys_news_information sni

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

@@ -1,9 +1,10 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import java.util.List;
-
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
 import com.yonge.toolset.mybatis.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface AppVersionInfoDao extends BaseDAO<Long, AppVersionInfo> {
 
@@ -13,4 +14,15 @@ public interface AppVersionInfoDao extends BaseDAO<Long, AppVersionInfo> {
 	 * @param platform
 	 */
 	void batchUpdateStatus(String platform);
+
+
+	/**
+	 * 获取当前app版本是否为审核状态
+	 *
+	 * @param platform 平台
+	 * @param version 版本
+	 * @return
+	 */
+	AppVersionInfo selectAppVersionInfo(@Param("platform") String platform, @Param("version") String version);
+
 }

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

@@ -45,4 +45,12 @@ public interface MusicAlbumDao extends BaseMapper<MusicAlbum> {
      * @return
      */
     List<MusicAlbumVo> selectFavoriteNumAndMusicNum(@Param("records") List<MusicAlbumVo> records);
+
+    /**
+     * 根据id获取专辑信息
+     *
+     * @param musicAlbumId 专辑id
+     * @return
+     */
+    MusicAlbumVo selectMusicAlbumById(@Param("musicAlbumId") Long musicAlbumId);
 }

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

@@ -30,9 +30,35 @@ public class MusicAlbumSearch extends QueryInfo{
     @ApiModelProperty("专辑状态0：停用，1：启用")
     private YesOrNoEnum albumStatus;
 
+
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
     @ApiModelProperty(value = "排序规则，1：按收藏人数倒叙",hidden = true)
     private Integer sortBy;
 
+    @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;
+    }
+
     public String getIdAndName() {
         return idAndName;
     }
@@ -75,4 +101,12 @@ public class MusicAlbumSearch extends QueryInfo{
     public void setSortBy(Integer sortBy) {
         this.sortBy = sortBy;
     }
+
+    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/MusicAlbum.java

@@ -48,6 +48,11 @@ public class MusicAlbum extends BaseEntity {
     @ApiModelProperty(value = "专辑状态(1:启用;0:停用)")
     private YesOrNoEnum albumStatus;  //专辑状态(1:启用;0:停用)
 
+
+	@TableField("audit_version_")
+	@ApiModelProperty(value = "是否审核时可见 （0:否  1：是）")
+	private YesOrNoEnum auditVersion;
+
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
     private Integer sortNumber;  //排序号
@@ -210,4 +215,12 @@ public class MusicAlbum extends BaseEntity {
 	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
+
+	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/enums/AppVersionStatusEnum.java

@@ -0,0 +1,39 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * Description 曲目音频类型 1：mp3,2:midi,3:mp3_metronome
+ *
+ * @author liujunchi
+ * @date 2022-04-01
+ */
+public enum AppVersionStatusEnum implements BaseEnum<String, AppVersionStatusEnum> {
+
+
+    NEWEST("newest","newest"),
+    HISTORY("history","history"),
+    AUDITING("auditing","auditing");
+    @EnumValue
+    private String code;
+    private String msg;
+
+    AppVersionStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

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

@@ -12,4 +12,13 @@ public interface AppVersionInfoService extends BaseService<Long, AppVersionInfo>
 	void add(AppVersionInfo appVersionInfo);
 
 	void updateVersion(AppVersionInfo appVersionInfo);
+
+	/**
+	 * 获取app版本信息
+	 *
+	 * @param platform 平台  ios、andorid
+	 * @param version 版本号
+	 * @return
+	 */
+	AppVersionInfo selectAppVersionInfo(String platform, String version);
 }

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

@@ -56,4 +56,8 @@ public class AppVersionInfoServiceImpl extends BaseServiceImpl<Long, AppVersionI
 		appVersionInfoDao.update(appVersionInfo);
 	}
 
+	@Override
+	public AppVersionInfo selectAppVersionInfo(String platform, String version) {
+		return appVersionInfoDao.selectAppVersionInfo(platform, version);
+	}
 }

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

@@ -9,7 +9,6 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
@@ -81,7 +80,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
 
     @Override
     public AlbumDetailVo detail(IPage<MusicSheetVo> page, MusicAlbumDetailSearch query) {
-        MusicAlbum musicAlbum = this.getById(query.getId());
+        MusicAlbumVo musicAlbum = baseMapper.selectMusicAlbumById(query.getId());
         if (musicAlbum == null) {
             throw  new BizException("未找到专辑信息");
         }
@@ -90,7 +89,10 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         albumDetailVo.setAlbumName(musicAlbum.getAlbumName());
         albumDetailVo.setAlbumDesc(musicAlbum.getAlbumDesc());
         albumDetailVo.setAlbumTag(musicAlbum.getAlbumTag());
+        albumDetailVo.setAlbumCoverUrl(musicAlbum.getAlbumCoverUrl());
         albumDetailVo.setAlbumStatue(musicAlbum.getAlbumStatus());
+        albumDetailVo.setAlbumFavoriteCount(musicAlbum.getAlbumFavoriteCount());
+        albumDetailVo.setMusicSheetCount(musicAlbum.getMusicSheetCount());
         albumDetailVo.setMusicTagNames(musicTagService.getMusicTagNames(StringUtil.toLongList(musicAlbum.getAlbumTag())));
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectAlbumDetailPage(page,query);
@@ -126,6 +128,9 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         if (checkNameRepeat(musicAlbum.getAlbumName(),musicAlbum.getId())) {
             throw new BizException("专辑名称重复");
         }
+        if (musicAlbum.getAuditVersion() == null) {
+            musicAlbum.setAuditVersion(YesOrNoEnum.NO);
+        }
         musicAlbum.setDelFlag(false);
         return this.save(musicAlbum);
     }
@@ -136,6 +141,9 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         if (checkNameRepeat(musicAlbum.getAlbumName(),musicAlbum.getId())) {
             throw new BizException("专辑名称重复");
         }
+        if (musicAlbum.getAuditVersion() == null) {
+            musicAlbum.setAuditVersion(YesOrNoEnum.NO);
+        }
         return this.updateById(musicAlbum);
     }
 

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

@@ -30,6 +30,12 @@ public class AlbumDetailVo {
     @ApiModelProperty("专辑详情曲目")
     private PageInfo<MusicSheetVo> musicSheetList;
 
+    @ApiModelProperty("曲目数量")
+    private Integer musicSheetCount;
+
+    @ApiModelProperty("收藏数量")
+    private Integer albumFavoriteCount;
+
     @ApiModelProperty(value = "专辑标签(多个标签以逗号分开)",required = true)
     private String albumTag;  //专辑标签(多个标签以逗号分开)
 
@@ -47,6 +53,22 @@ public class AlbumDetailVo {
     @ApiModelProperty("专辑状态 0：停用1：启用")
     private YesOrNoEnum albumStatue;
 
+    public Integer getMusicSheetCount() {
+        return musicSheetCount;
+    }
+
+    public void setMusicSheetCount(Integer musicSheetCount) {
+        this.musicSheetCount = musicSheetCount;
+    }
+
+    public Integer getAlbumFavoriteCount() {
+        return albumFavoriteCount;
+    }
+
+    public void setAlbumFavoriteCount(Integer albumFavoriteCount) {
+        this.albumFavoriteCount = albumFavoriteCount;
+    }
+
     public String getAlbumTag() {
         return albumTag;
     }

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

@@ -120,4 +120,10 @@
 			</if>
 		</where>
 	</select>
+
+	<select id="selectAppVersionInfo" resultMap="AppVersionInfo">
+
+		select avi.status_ from app_version_info avi where avi.platform_ = #{platform} and avi.version_ = #{version}
+
+	</select>
 </mapper>

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

@@ -12,6 +12,7 @@
         <result column="sort_number_" jdbcType="INTEGER" property="sortNumber"/>
         <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag"/>
         <result column="top_flag_" jdbcType="TINYINT" property="topFlag"/>
+        <result column="audit_version_" jdbcType="TINYINT" property="auditVersion"/>
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="create_by_" jdbcType="BIGINT" property="createBy"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -29,6 +30,7 @@
         t.hot_flag_,
         t.top_flag_,
         t.create_time_,
+        t.audit_version_,
         t.create_by_,
         t.update_time_,
         t.update_by_
@@ -58,6 +60,9 @@
             <if test="query.albumStatus != null">
                 and t.album_status_ = #{query.albumStatus}
             </if>
+            <if test="query.auditVersion != null">
+                and t.audit_version_ = #{query.auditVersion}
+            </if>
         </where>
         <if test="query.sortBy != null">
             <choose>
@@ -92,6 +97,10 @@
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>
+
+            <if test="query.auditVersion != null">
+                and t.audit_version_ = #{query.auditVersion}
+            </if>
             <if test="query.albumStatus != null">
                 and t.album_status_ = #{query.albumStatus}
             </if>
@@ -123,4 +132,16 @@
             </foreach>
         </if>
     </select>
+
+    <select id="selectMusicAlbumById" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
+        select <include refid="Base_Column_List"/>
+        ,(select group_concat(mt.name_) from music_tag mt
+        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0) as musicTagNames
+        , t1.num as musicSheetCount
+        ,t2.num as albumFavoriteCount
+        from music_album t
+        left join (select count(1) as num,amr.album_id_ from album_music_relate amr group by amr.album_id_) t1 on t1.album_id_ = t.id_
+        left join (select count(1) as num,af.album_id_ from album_favorite af group by af.album_id_) t2 on t2.album_id_ = t.id_
+        where t.id_ = #{musicAlbumId}
+    </select>
 </mapper>

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

@@ -6,7 +6,10 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
+import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
+import com.yonge.cooleshow.biz.dal.enums.AppVersionStatusEnum;
 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.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
@@ -39,6 +42,8 @@ public class MusicAlbumController extends BaseController {
 	@Autowired
 	private MusicAlbumService musicAlbumService;
 
+    @Autowired
+    private AppVersionInfoService appVersionInfoService;
 
     @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
@@ -47,6 +52,17 @@ public class MusicAlbumController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
+
+        // 检查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.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);

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

@@ -134,6 +134,7 @@ public class StudentCourseScheduleController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        // 检查app版本审核/正式
         return succeed(courseScheduleService.queryLiveAndVideo(user.getId(),null));
     }