Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -117,8 +117,8 @@ public class NewsController extends BaseController {
 			}
 		}
 
-		// 1 6
-		if (newsInfo.getType() == 1  || newsInfo.getType() == 6) {
+		// 6
+		if (newsInfo.getType() == 6) {
 			if (StringUtil.isEmpty(newsInfo.getContent())) {
 				return failed("内容不能为空");
 			}
@@ -224,7 +224,7 @@ public class NewsController extends BaseController {
 		}
 
 		AppHomeDto appHomeDto = new AppHomeDto();
-		queryInfo.setStatus(NewsStatusEnum.SHOW);
+		queryInfo.setStatus(NewsStatusEnum.SHOW.getCode().toString());
 		queryInfo.setPlatformType("STUDENT");
 		// 1热门资讯
 		queryInfo.setType(1);

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

@@ -25,7 +25,7 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	private String subType;
 
 	@ApiModelProperty(value = "资讯状态（0：禁用，1：启用）", required = false)
-	private NewsStatusEnum status;
+	private String status;
 
 	@ApiModelProperty(value = "编号/标题", required = false)
 	private String title;
@@ -72,11 +72,11 @@ public class NewsInformationQueryInfo extends QueryInfo {
 		this.subType = subType;
 	}
 
-	public NewsStatusEnum getStatus() {
+	public String getStatus() {
 		return status;
 	}
 
-	public void setStatus(NewsStatusEnum status) {
+	public void setStatus(String status) {
 		this.status = status;
 	}
 

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

@@ -46,7 +46,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	public Map<String,PageInfo<SysNewsInformation>> getHomeList(SysUser user, NewsInformationQueryInfo queryInfo) {
 		//1精彩活动，2热门资讯,3banner类型
 		Map<String,PageInfo<SysNewsInformation>> homeList = new HashMap<>();
-		queryInfo.setStatus(NewsStatusEnum.SHOW);
+		queryInfo.setStatus(NewsStatusEnum.SHOW.getCode().toString());
 		
 		String memo = queryInfo.getMemo();
 		

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

@@ -47,7 +47,7 @@
 				and sni.sub_type_ = #{subType}
 			</if>
 			<if test="status != null">
-				and sni.status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
+				and sni.status_ = #{status}
 			</if>
 			<if test="title != null">
 				and (sni.title_ like '%' #{title} '%'

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
-import com.yonge.cooleshow.biz.dal.vo.StudentMusicSheetOrderVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -117,4 +114,11 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
      * @return
      */
     Integer selectTeacherMusicSheetCount(@Param("userId") Long userId);
+
+    /**
+     * 点播数量统计
+     *
+     * @return
+     */
+    HomeMusicSheetVo selectMusicNum();
 }

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

@@ -215,4 +215,12 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @return 老师过审的曲目数量
      */
     Integer getTeacherMusicSheetCount(Long userId);
+
+    /**
+     * 获取首页统计数据
+     *
+     * @return
+     */
+    HomeMusicSheetVo getMusicSheetHome();
+
 }

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

@@ -543,6 +543,15 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
 
     }
 
+    @Override
+    public HomeMusicSheetVo getMusicSheetHome() {
+
+        HomeMusicSheetVo homeMusicSheetVo = baseMapper.selectMusicNum();
+        // homeMusicSheetVo.
+
+        return homeMusicSheetVo;
+    }
+
     private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
                        .map(sysUserFeignService::queryUserById)

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

@@ -0,0 +1,97 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-07
+ */
+@ApiModel("首页点播数据统计")
+public class HomeMusicSheetVo {
+
+    @ApiModelProperty("乐谱总数")
+    private Integer musicSheetCount;
+
+    @ApiModelProperty("平台乐谱")
+    private Integer musicSheetTeacherCount;
+
+    @ApiModelProperty("老师上传")
+    private Integer musicSheetPlatformCount;
+
+    @ApiModelProperty("集合")
+    private List<MusicSheetSmall> musicSheetSmallList;
+
+    static class MusicSheetSmall{
+
+        @ApiModelProperty("曲目编号")
+        private Long  musicSheetId;
+
+        @ApiModelProperty("曲目名称")
+        private String musicSheetName;
+
+        @ApiModelProperty("付费人数")
+        private Integer num;
+
+
+        public Long getMusicSheetId() {
+            return musicSheetId;
+        }
+
+        public void setMusicSheetId(Long musicSheetId) {
+            this.musicSheetId = musicSheetId;
+        }
+
+        public String getMusicSheetName() {
+            return musicSheetName;
+        }
+
+        public void setMusicSheetName(String musicSheetName) {
+            this.musicSheetName = musicSheetName;
+        }
+
+        public Integer getNum() {
+            return num;
+        }
+
+        public void setNum(Integer num) {
+            this.num = num;
+        }
+    }
+
+    public Integer getMusicSheetCount() {
+        return musicSheetCount;
+    }
+
+    public void setMusicSheetCount(Integer musicSheetCount) {
+        this.musicSheetCount = musicSheetCount;
+    }
+
+    public Integer getMusicSheetTeacherCount() {
+        return musicSheetTeacherCount;
+    }
+
+    public void setMusicSheetTeacherCount(Integer musicSheetTeacherCount) {
+        this.musicSheetTeacherCount = musicSheetTeacherCount;
+    }
+
+    public Integer getMusicSheetPlatformCount() {
+        return musicSheetPlatformCount;
+    }
+
+    public void setMusicSheetPlatformCount(Integer musicSheetPlatformCount) {
+        this.musicSheetPlatformCount = musicSheetPlatformCount;
+    }
+
+    public List<MusicSheetSmall> getMusicSheetSmallList() {
+        return musicSheetSmallList;
+    }
+
+    public void setMusicSheetSmallList(List<MusicSheetSmall> musicSheetSmallList) {
+        this.musicSheetSmallList = musicSheetSmallList;
+    }
+}

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

@@ -458,4 +458,16 @@
         where user_id_ = #{userId}
         and state_ = 1 and audit_status_ = 'PASS' and del_flag_ = 0
     </select>
+
+    <select id="selectMusicNum" resultType="com.yonge.cooleshow.biz.dal.vo.HomeMusicSheetVo">
+
+        select
+            sum(if(ms.source_type_ = 'PLATFORM',1,0)) as musicSheetPlatformCount,
+            sum(if(ms.source_type_ = 'TEACHER',1,0)) as musicSheetTeacherCount,
+            count(1) as musicSheetCount
+        from music_sheet ms
+        where ms.state_ = 1 and ms.del_flag_ = 0 and ms.audit_status_ = 'PASS'
+
+
+    </select>
 </mapper>

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

@@ -133,8 +133,8 @@ public class StudentCourseScheduleController extends BaseController {
     }
 
     @ApiOperation("学生-首页-直播课&视频课&最近课程")
-    @PostMapping("/queryLiveAndVideo")
-    public HttpResponseResult<StudentHomePage> queryLiveAndVideo(@RequestBody AppAuditVersionSearch search) {
+    @GetMapping("/queryLiveAndVideo")
+    public HttpResponseResult<StudentHomePage> queryLiveAndVideo(AppAuditVersionSearch search) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");