czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-01-03 21:04:07 +08:00
parent 63d27895bd 404e7b663b
commit 9f2f15b093
62 changed files with 281 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java
View File

@@ -19,7 +19,6 @@ public interface CourseDetailsDao extends BaseMapper<CourseDetails> {
int deleteCourseDetails(String[] ids);
List<CourseDetails> selectCourseDetailsList(String randomNum,Integer wxShow,Integer dyShow);
Map<String,Object> countCourse(Long courseId);

5
src/main/java/com/sqx/modules/course/entity/CommentGood.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.course.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -21,16 +23,19 @@ public class CommentGood implements Serializable {
* 评论点赞id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long commentGoodId;
/**
* 评论id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseCommentId;
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

4
src/main/java/com/sqx/modules/course/entity/Course.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.sqx.modules.orders.entity.Orders;
import lombok.Data;
@@ -26,6 +28,7 @@ public class Course implements Serializable {
* 短剧id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long courseId;
/**
@@ -68,6 +71,7 @@ public class Course implements Serializable {
* 分类
*/
@TableField("classify_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long classifyId;
/**
* 短剧分类对象

3
src/main/java/com/sqx/modules/course/entity/CourseClassification.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.course.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -20,6 +22,7 @@ public class CourseClassification implements Serializable {
* 分类id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long classificationId;
/**
* 分类名称

6
src/main/java/com/sqx/modules/course/entity/CourseCollect.java
View File

@@ -1,6 +1,8 @@
package com.sqx.modules.course.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
import org.apache.ibatis.annotations.Update;
@@ -25,22 +27,26 @@ public class CourseCollect implements Serializable {
* 收藏id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long courseCollectId;
/**
* 短剧id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseId;
/**
* 集id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseDetailsId;
/**
* 用户id
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

5
src/main/java/com/sqx/modules/course/entity/CourseComment.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.sqx.modules.app.entity.UserEntity;
import lombok.Data;
@@ -25,11 +27,13 @@ public class CourseComment implements Serializable {
* 短剧评论id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long courseCommentId;
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@TableField(exist = false)
private UserEntity userEntity;
@@ -49,6 +53,7 @@ public class CourseComment implements Serializable {
/**
* 短剧id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseId;
/**
* 短剧

6
src/main/java/com/sqx/modules/course/entity/CourseDetails.java
View File

@@ -1,6 +1,8 @@
package com.sqx.modules.course.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -22,12 +24,14 @@ public class CourseDetails implements Serializable {
* 短剧目录id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long courseDetailsId;
/**
* 短剧id
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
private Long courseId;
@TableField(exist = false)
@@ -134,11 +138,13 @@ public class CourseDetails implements Serializable {
/**
* 播放量
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long viewCount;
/**
* 完播量
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long playCompleteCount;
@TableField(exist = false)

7
src/main/java/com/sqx/modules/course/entity/CourseUser.java
View File

@@ -1,6 +1,8 @@
package com.sqx.modules.course.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -21,16 +23,19 @@ public class CourseUser implements Serializable {
* 我的短剧id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long courseUserId;
/**
* 短剧id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseId;
/**
* 集数id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseDetailsId;
/**
@@ -41,12 +46,14 @@ public class CourseUser implements Serializable {
/**
* 订单id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long orderId;
/**
* 用户id
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

2
src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java
View File

@@ -120,7 +120,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
.eq(CourseCollect::getUserId, userId)
.eq(CourseCollect::getClassify, classify)
.isNotNull(CourseCollect::getCourseId)
.select(CourseCollect::getCourseId, CourseCollect::getUserId))
.select(CourseCollect::getCourseId, CourseCollect::getUserId).groupBy(CourseCollect::getCourseId))
.stream().map(CourseCollect::getCourseId).collect(Collectors.toSet());
// List<CourseCollect> collectList = baseMapper.selectByUserId(userId, classify);
// Set<Long> courseIdList = collectList.stream().map(CourseCollect::getCourseId).collect(Collectors.toSet());

40
src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.sqx.modules.course.service.impl;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -48,6 +49,7 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Random;
@Service
@Slf4j
@@ -232,7 +234,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
bean.setCourseDetailsName(courseDetails.getCourseDetailsName());
bean.setCourseDetailsCount(courseDetails.getCourseDetailsCount());
}
}else{
} else {
//默认取第一集
CourseDetails courseDetails = courseDetailsDao.selectOne(Wrappers.<CourseDetails>lambdaQuery().eq(CourseDetails::getCourseId, id)
.orderByAsc(CourseDetails::getSort).last(" limit 1"));
@@ -254,25 +256,29 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
userId = Long.parseLong(claims.getSubject());
}
}
if(!Validator.isNumber(randomNum)){
if (!Validator.isNumber(randomNum)) {
throw new SqxException("随机码必须是数字");
};
PageHelper.startPage(page, limit);
List<CourseDetails> list = baseMapper.selectCourseDetailsList(randomNum, wxShow, dyShow);
}
Integer detailCount = baseMapper.selectCount(new QueryWrapper<>());
if (detailCount != null) {
PageHelper.startPage(RandomUtil.randomInt(1, detailCount / 10), 10);
}
List<CourseDetails> list = baseMapper.selectList(new QueryWrapper<>());
PageInfo<CourseDetails> pageInfo = new PageInfo<>(list);
if (userId != null) {
List<CourseDetails> records = pageInfo.getList();
for (CourseDetails courseDetails : records) {
courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper<CourseCollect>()
.eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1)));
courseDetails.setIsGood(courseCollectDao.selectCount(new QueryWrapper<CourseCollect>()
.eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 2)));
courseDetails.setCourse(courseDao.selectById(courseDetails.getCourseId()));
courseDetails.setTitle(courseDetails.getCourse().getTitle());
courseDetails.setCourseDetailsCount(baseMapper.selectCount(new QueryWrapper<CourseDetails>().eq("course_id", courseDetails.getCourseId())));
}
}
// if (userId != null) {
// List<CourseDetails> records = pageInfo.getList();
// for (CourseDetails courseDetails : records) {
// courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper<CourseCollect>()
// .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1)));
// courseDetails.setIsGood(courseCollectDao.selectCount(new QueryWrapper<CourseCollect>()
// .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 2)));
// courseDetails.setCourse(courseDao.selectById(courseDetails.getCourseId()));
// courseDetails.setTitle(courseDetails.getCourse().getTitle());
// courseDetails.setCourseDetailsCount(baseMapper.selectCount(new QueryWrapper<CourseDetails>().eq("course_id", courseDetails.getCourseId())));
// }
// }
return Result.success().put("data", PageUtils.page(pageInfo));
}