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

16
src/main/java/com/sqx/config/ShardingConfig.java
View File

@@ -3,6 +3,7 @@ package com.sqx.config;
import com.sqx.modules.utils.InvitationCodeUtil;
import com.sqx.sharding.MasterSlaveRules;
import com.sqx.sharding.ShardingDataBase;
import com.sqx.sharding.StandardShardingStrategyConf;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import lombok.Data;
@@ -13,6 +14,8 @@ import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
import org.apache.shardingsphere.api.config.sharding.strategy.InlineShardingStrategyConfiguration;
import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
import org.apache.shardingsphere.core.strategy.route.standard.StandardShardingStrategy;
import org.apache.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
import org.codehaus.groovy.util.StringUtil;
import org.springframework.beans.factory.annotation.Value;
@@ -143,8 +146,10 @@ public class ShardingConfig {
sets.add(tableRuleConfig);
}
// 定义区域表的分库规则
InlineShardingStrategyConfiguration databaseShardingStrategyConfig = new InlineShardingStrategyConfiguration(
regionTablesShardingDatabaseColumn, regionTablesShardingDatabaseAlgorithm);
StandardShardingStrategyConfiguration databaseShardingStrategyConfig = new StandardShardingStrategyConfiguration(
regionTablesShardingDatabaseColumn, new StandardShardingStrategyConf());
// InlineShardingStrategyConfiguration databaseShardingStrategyConfig = new InlineShardingStrategyConfiguration(
// regionTablesShardingDatabaseColumn, regionTablesShardingDatabaseAlgorithm);
for (String regionTable : regionTables) {
TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable));
tableRuleConfig.setDatabaseShardingStrategyConfig(databaseShardingStrategyConfig);
@@ -169,9 +174,12 @@ public class ShardingConfig {
sets.add(tableRuleConfig);
}
// 定义区域表的分库规则
InlineShardingStrategyConfiguration courseDetailsShardingStrategyConfig = new InlineShardingStrategyConfiguration(
courseDetailsShardingDatabaseColumn, courseDetailsShardingDatabaseAlgorithm);
StandardShardingStrategyConfiguration courseDetailsShardingStrategyConfig = new StandardShardingStrategyConfiguration(
courseDetailsShardingDatabaseColumn, new StandardShardingStrategyConf());
// InlineShardingStrategyConfiguration courseDetailsShardingStrategyConfig = new InlineShardingStrategyConfiguration(
// courseDetailsShardingDatabaseColumn, courseDetailsShardingDatabaseAlgorithm);
for (String regionTable : courseDetails) {
TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable));
tableRuleConfig.setDatabaseShardingStrategyConfig(courseDetailsShardingStrategyConfig);

3
src/main/java/com/sqx/modules/app/entity/App.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.app.entity;
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;
@@ -13,6 +15,7 @@ import java.io.Serializable;
@TableName("app")
public class App implements Serializable {
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private String createAt;

3
src/main/java/com/sqx/modules/app/entity/Msg.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.app.entity;
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;
@@ -17,6 +19,7 @@ public class Msg implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private String code;

3
src/main/java/com/sqx/modules/app/entity/UserEntity.java
View File

@@ -5,6 +5,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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,6 +31,7 @@ public class UserEntity implements Serializable {
@Excel(name = "用户id", orderNum = "1")
@ApiModelProperty("用户id")
@TableId(value = "user_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 用户名

5
src/main/java/com/sqx/modules/app/entity/UserMoney.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -24,6 +26,7 @@ public class UserMoney implements Serializable {
*/
@ApiModelProperty("主键id")
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -43,6 +46,7 @@ public class UserMoney implements Serializable {
*/
@ApiModelProperty("用户id")
@TableField("user_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
@@ -50,6 +54,7 @@ public class UserMoney implements Serializable {
*/
@ApiModelProperty("渠道用户id")
@TableField("sys_user_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long sysUserId;
}

7
src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java
View File

@@ -6,6 +6,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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -25,12 +27,14 @@ public class UserMoneyDetails implements Serializable {
*/
@ApiModelProperty("钱包详情id")
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 用户id
*/
@TableField("user_id")
@ApiModelProperty("用户id")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
@@ -38,8 +42,10 @@ public class UserMoneyDetails implements Serializable {
*/
@ApiModelProperty("渠道用户id")
@TableField("sys_user_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long sysUserId;
@ApiModelProperty("源id")
@JsonSerialize(using = ToStringSerializer.class)
private Long sourceId;
/**
@@ -47,6 +53,7 @@ public class UserMoneyDetails implements Serializable {
*/
@TableField("by_user_id")
@ApiModelProperty("对应用户id")
@JsonSerialize(using = ToStringSerializer.class)
private Long byUserId;
/**
* 标题

5
src/main/java/com/sqx/modules/app/entity/UserPrizeExchange.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.app.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;
@@ -24,10 +26,12 @@ public class UserPrizeExchange implements Serializable {
* 奖品记录
*/
@TableId(type = IdType.ID_WORKER)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 奖品引用id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long foreignId;
/**
* 活动类型 task-任务奖励 spinning-大转盘
@@ -44,6 +48,7 @@ public class UserPrizeExchange implements Serializable {
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 用户名

4
src/main/java/com/sqx/modules/app/entity/UserVip.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.app.entity;
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;
@@ -13,6 +15,7 @@ public class UserVip implements Serializable {
* 用户会员ID
*/
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long vipId;
/**
* 会员类型
@@ -21,6 +24,7 @@ public class UserVip implements Serializable {
/**
* 用户ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

3
src/main/java/com/sqx/modules/app/entity/VipDetails.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -21,6 +23,7 @@ import java.math.BigDecimal;
public class VipDetails implements Serializable {
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("会员类型")

9
src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java
View File

@@ -9,6 +9,7 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.aliyun.tea.ValidateException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
@@ -28,6 +29,7 @@ import com.sqx.modules.common.entity.CommonInfo;
import com.sqx.modules.common.service.CommonInfoService;
import com.sqx.modules.discSpinning.dao.DiscSpinningRecordDao;
import com.sqx.modules.discSpinning.entity.DiscSpinningRecord;
import com.sqx.modules.discSpinning.service.DiscSpinningRecordService;
import com.sqx.modules.taskCenter.dao.TaskCenterRecordDao;
import com.sqx.modules.taskCenter.dao.TaskCenterRewardDao;
import com.sqx.modules.taskCenter.entity.TaskCenterRecord;
@@ -54,6 +56,8 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpl<UserPrizeExchangeD
@Resource
private DiscSpinningRecordDao discSpinningRecordDao;
@Resource
private DiscSpinningRecordService discSpinningRecordService;
@Resource
private TaskCenterRecordDao taskCenterRecordDao;
@Resource
private TaskCenterRewardDao taskCenterRewardDao;
@@ -126,7 +130,10 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpl<UserPrizeExchangeD
}
Dict dict = Dict.create();
if ("spinning".equals(dto.getForeignType())) {
DiscSpinningRecord record = discSpinningRecordDao.selectById(dto.getForeignId());
QueryWrapper<DiscSpinningRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id", dto.getForeignId());
queryWrapper.eq("user_id", currentUserId);
DiscSpinningRecord record = discSpinningRecordService.getOne(queryWrapper);
if (record == null) {
throw new SqxException("中奖记录不存在");
}

3
src/main/java/com/sqx/modules/banner/entity/Activity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.banner.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;
@@ -14,6 +16,7 @@ import java.io.Serializable;
@TableName("activity")
public class Activity implements Serializable {
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
private String createAt;

3
src/main/java/com/sqx/modules/banner/entity/Banner.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.course.entity.Course;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -27,6 +29,7 @@ public class Banner implements Serializable {
* banner图id
*/
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**

5
src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java
View File

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
/**
@@ -19,11 +22,13 @@ public class UniAdCallbackRecord implements Serializable {
*
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

7
src/main/java/com/sqx/modules/common/entity/CommonInfo.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.common.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;
@@ -15,11 +17,12 @@ import java.io.Serializable;
public class CommonInfo implements Serializable {
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private long id;
private String createAt;
private Integer type; //1表示客服二维码 2表示公众号二维码 3表示全局佣金是否开启 4注册客服渠道id配置 5、佣金规则 6、
//1表示客服二维码 2表示公众号二维码 3表示全局佣金是否开启 4注册客服渠道id配置 5、佣金规则 6、
private Integer type;
private String value;

3
src/main/java/com/sqx/modules/complet/entity/CompletAward.java
View File

@@ -5,6 +5,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +25,7 @@ import lombok.Data;
@ApiModel(value = "达标奖励表(邀请人员 几个人达标后的额外奖励) 实体类")
public class CompletAward extends Model<CompletAward> {
@ApiModelProperty("id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("人数")
private Integer inviteCount;

3
src/main/java/com/sqx/modules/coupon/entity/Coupon.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.coupon.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;
@@ -16,6 +18,7 @@ public class Coupon implements Serializable {
* 优惠券d
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long couponId;
/**
* 优惠券名称

4
src/main/java/com/sqx/modules/coupon/entity/CouponUser.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.coupon.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;
@@ -16,10 +18,12 @@ public class CouponUser implements Serializable {
* 用户优惠券id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long couponUserId;
/**
*用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 优惠券金币

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));
}

5
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java
View File

@@ -41,7 +41,8 @@ public class DiscSpinningRecordController {
public Result selectDiscSpinningRecord(Integer page, Integer limit, @RequestAttribute("userId") Long userId) {
PageHelper.startPage(page, limit);
List<DiscSpinningRecord> list = discSpinningRecordService.list(new QueryWrapper<DiscSpinningRecord>().eq("user_id", userId).orderByDesc("create_time"));
return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
PageInfo<DiscSpinningRecord> pageInfo = new PageInfo<>(list);
PageUtils pageUtils = PageUtils.page(pageInfo, true);
return Result.success().put("data", pageUtils);
}
}

8
src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.math.BigDecimal;
@@ -18,11 +20,13 @@ import java.math.BigDecimal;
@TableName("disc_spinning_record")
public class DiscSpinningRecord extends Model<DiscSpinningRecord> {
//主键
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@JsonSerialize(using = ToStringSerializer.class)
private Long sourceId;
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
private String imgUrl;
//描述
@@ -33,7 +37,7 @@ public class DiscSpinningRecord extends Model<DiscSpinningRecord> {
private BigDecimal number;
//流向 1 提现 2 存入余额 3 兑换
private String target;
@JsonSerialize(using = ToStringSerializer.class)
private Long targetId;
//抽奖日期
private String drawDay;

3
src/main/java/com/sqx/modules/integral/entity/UserIntegral.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.integral.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;
@Data
@@ -13,6 +15,7 @@ public class UserIntegral {
* 用户id
*/
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

3
src/main/java/com/sqx/modules/integral/entity/UserIntegralDetails.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.integral.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;
@Data
@@ -12,6 +14,7 @@ public class UserIntegralDetails {
* 积分详情id
*/
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**

5
src/main/java/com/sqx/modules/invite/entity/Invite.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.invite.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,16 +22,19 @@ public class Invite implements Serializable {
* 邀请id
*/
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 邀请人id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 被邀请人id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long inviteeUserId;
/**

4
src/main/java/com/sqx/modules/invite/entity/InviteMoney.java
View File

@@ -1,5 +1,7 @@
package com.sqx.modules.invite.entity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -16,11 +18,13 @@ public class InviteMoney implements Serializable {
/**
* 邀请收益钱包id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

3
src/main/java/com/sqx/modules/job/entity/ScheduleJobEntity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.job.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -27,6 +29,7 @@ public class ScheduleJobEntity implements Serializable {
* 任务id
*/
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long jobId;
/**

4
src/main/java/com/sqx/modules/job/entity/ScheduleJobLogEntity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.job.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -21,11 +23,13 @@ public class ScheduleJobLogEntity implements Serializable {
* 日志id
*/
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long logId;
/**
* 任务id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long jobId;
/**

3
src/main/java/com/sqx/modules/message/entity/ActivityMessageInfo.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.message.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;
@@ -18,6 +20,7 @@ public class ActivityMessageInfo implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private long id;
private String createAt;

3
src/main/java/com/sqx/modules/message/entity/MessageInfo.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;
@@ -20,6 +22,7 @@ public class MessageInfo implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private long id;
private String createAt;

7
src/main/java/com/sqx/modules/orders/entity/Orders.java
View File

@@ -1,6 +1,8 @@
package com.sqx.modules.orders.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.sqx.modules.course.entity.Course;
import lombok.Data;
@@ -22,6 +24,7 @@ public class Orders implements Serializable {
* 订单id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long ordersId;
/**
@@ -38,13 +41,16 @@ public class Orders implements Serializable {
* 用户id
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 短剧id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long courseId;
@JsonSerialize(using = ToStringSerializer.class)
private Long courseDetailsId;
private String courseDetailsIds;
@@ -109,6 +115,7 @@ public class Orders implements Serializable {
/**
* 渠道用户
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long sysUserId;
/**

3
src/main/java/com/sqx/modules/oss/entity/SysOssEntity.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.oss.entity;
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;
@@ -18,6 +20,7 @@ public class SysOssEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
//URL地址
private String url;

7
src/main/java/com/sqx/modules/pay/entity/CashOut.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 lombok.Data;
import java.io.Serializable;
@@ -24,6 +26,7 @@ public class CashOut implements Serializable {
* 申请提现id
*/
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private long id;
/**
@@ -54,6 +57,7 @@ public class CashOut implements Serializable {
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@TableField(exist = false)
@@ -89,6 +93,7 @@ public class CashOut implements Serializable {
*/
private Double rate;
@JsonSerialize(using = ToStringSerializer.class)
private Long sysUserId;
/**
@@ -124,6 +129,7 @@ public class CashOut implements Serializable {
* 成功提现次数
*/
@TableField(exist = false)
@JsonSerialize(using = ToStringSerializer.class)
private Long count;
/**
* 待复审金额
@@ -135,6 +141,7 @@ public class CashOut implements Serializable {
* 待复审笔数
*/
@TableField(exist = false)
@JsonSerialize(using = ToStringSerializer.class)
private Long verifyCount;
private Integer withdrawType;

3
src/main/java/com/sqx/modules/pay/entity/PayClassify.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.pay.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,6 +23,7 @@ public class PayClassify implements Serializable {
/**
* 充值分类id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long payClassifyId;
/**

4
src/main/java/com/sqx/modules/pay/entity/PayDetails.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 lombok.Data;
import java.io.Serializable;
@@ -23,6 +25,7 @@ public class PayDetails implements Serializable {
* 充值记录id
*/
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -53,6 +56,7 @@ public class PayDetails implements Serializable {
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

6
src/main/java/com/sqx/modules/sdk/entity/SdkInfo.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.SqlCondition;
import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -25,6 +27,7 @@ public class SdkInfo implements Serializable {
* 卡密id
*/
@TableId(value = "sdk_id", type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long sdkId;
/**
@@ -35,6 +38,7 @@ public class SdkInfo implements Serializable {
/**
* 卡密类型id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long typeId;
/**
@@ -49,6 +53,7 @@ public class SdkInfo implements Serializable {
/**
* 用户id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
@@ -68,6 +73,7 @@ public class SdkInfo implements Serializable {
/**
* 渠道商
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long sysUserId;
@TableField(exist = false)

3
src/main/java/com/sqx/modules/sdk/entity/SdkType.java
View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.SqlCondition;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -26,6 +28,7 @@ public class SdkType implements Serializable {
* sdk类型
*/
@TableId(value = "type_id", type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long typeId;
/**

4
src/main/java/com/sqx/modules/search/entity/Search.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 lombok.Data;
import java.io.Serializable;
@@ -15,6 +17,7 @@ public class Search implements Serializable {
* 搜索id
*/
@TableId(type = IdType.AUTO)
@JsonSerialize(using = ToStringSerializer.class)
private Long searchId;
/**
* 搜索名称
@@ -23,6 +26,7 @@ public class Search implements Serializable {
/**
* 用户
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

2
src/main/java/com/sqx/modules/sys/controller/SysLoginController.java
View File

@@ -86,7 +86,7 @@ public class SysLoginController extends AbstractController {
user.setIsChannel(1);
user.setQdRate(new BigDecimal("0.01"));
user.setStatus(1);
user.setRoleIdList(Collections.singletonList(4L));
user.setRoleIdList(Collections.singletonList("4"));
ValidatorUtils.validateEntity(user, AddGroup.class);
user.setUserId(InvitationCodeUtil.getSnowFlakeId());
sysUserService.saveUser(user);

2
src/main/java/com/sqx/modules/sys/controller/SysUserController.java
View File

@@ -88,7 +88,7 @@ public class SysUserController extends AbstractController {
SysUserEntity user = sysUserService.getById(userId);
//获取用户所属的角色列表
List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
List<String> roleIdList = sysUserRoleService.queryRoleIdList(userId);
user.setRoleIdList(roleIdList);
return Result.success().put("user", user);

4
src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java
View File

@@ -12,11 +12,11 @@ import java.util.List;
*/
@Mapper
public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> {
/**
* 根据用户ID，获取角色ID列表
*/
List<Long> queryRoleIdList(Long userId);
List<String> queryRoleIdList(Long userId);
/**

3
src/main/java/com/sqx/modules/sys/entity/SysConfigEntity.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.sys.entity;
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 javax.validation.constraints.NotBlank;
@@ -14,6 +16,7 @@ import javax.validation.constraints.NotBlank;
@TableName("sys_config")
public class SysConfigEntity {
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@NotBlank(message="参数名不能为空")
private String paramKey;

3
src/main/java/com/sqx/modules/sys/entity/SysDictEntity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.sys.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
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 javax.validation.constraints.NotBlank;
@@ -18,6 +20,7 @@ public class SysDictEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 字典名称

3
src/main/java/com/sqx/modules/sys/entity/SysLogEntity.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.sys.entity;
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;
@@ -17,6 +19,7 @@ import java.util.Date;
public class SysLogEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
//用户名
private String username;

4
src/main/java/com/sqx/modules/sys/entity/SysMenuEntity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.sys.entity;
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 lombok.Data;
import java.io.Serializable;
@@ -21,11 +23,13 @@ public class SysMenuEntity implements Serializable {
* 菜单ID
*/
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long menuId;
/**
* 父菜单ID，一级菜单为0
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
/**

4
src/main/java/com/sqx/modules/sys/entity/SysRoleEntity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.sys.entity;
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 lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -23,6 +25,7 @@ public class SysRoleEntity implements Serializable {
* 角色ID
*/
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
/**
@@ -39,6 +42,7 @@ public class SysRoleEntity implements Serializable {
/**
* 创建者ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long createUserId;
@TableField(exist=false)

5
src/main/java/com/sqx/modules/sys/entity/SysRoleMenuEntity.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.sys.entity;
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;
@@ -16,16 +18,19 @@ public class SysRoleMenuEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 角色ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
/**
* 菜单ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long menuId;
}

7
src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
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.common.validator.group.AddGroup;
import com.sqx.common.validator.group.UpdateGroup;
import lombok.Data;
@@ -28,6 +30,7 @@ public class SysUserEntity implements Serializable {
* 用户ID
*/
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
@@ -69,11 +72,12 @@ public class SysUserEntity implements Serializable {
* 角色ID列表
*/
@TableField(exist=false)
private List<Long> roleIdList;
private List<String> roleIdList;
/**
* 创建者ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long createUserId;
/**
@@ -99,6 +103,7 @@ public class SysUserEntity implements Serializable {
/**
* 员工
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long sysUserId;
/**

4
src/main/java/com/sqx/modules/sys/entity/SysUserRoleEntity.java
View File

@@ -2,6 +2,8 @@ package com.sqx.modules.sys.entity;
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;
@@ -15,11 +17,13 @@ import java.io.Serializable;
public class SysUserRoleEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 用户ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**

3
src/main/java/com/sqx/modules/sys/entity/SysUserTokenEntity.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.sys.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 SysUserTokenEntity implements Serializable {
//用户ID
@TableId(type = IdType.INPUT)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
//token
private String token;

8
src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java
View File

@@ -12,13 +12,13 @@ import java.util.List;
*
*/
public interface SysUserRoleService extends IService<SysUserRoleEntity> {
void saveOrUpdate(Long userId, List<Long> roleIdList);
void saveOrUpdate(Long userId, List<String> roleIdList);
/**
* 根据用户ID，获取角色ID列表
*/
List<Long> queryRoleIdList(Long userId);
List<String> queryRoleIdList(Long userId);
/**
* 根据角色ID数组，批量删除

8
src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserRoleEntity> implements SysUserRoleService {
@Override
public void saveOrUpdate(Long userId, List<Long> roleIdList) {
public void saveOrUpdate(Long userId, List<String> roleIdList) {
if (roleIdList == null || roleIdList.isEmpty()) {
return;
}
@@ -27,17 +27,17 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR
this.removeByMap(new MapUtils().put("user_id", userId));
//保存用户与角色关系
for (Long roleId : roleIdList) {
for (String roleId : roleIdList) {
SysUserRoleEntity sysUserRoleEntity = new SysUserRoleEntity();
sysUserRoleEntity.setUserId(userId);
sysUserRoleEntity.setRoleId(roleId);
sysUserRoleEntity.setRoleId(Long.parseLong(roleId));
this.save(sysUserRoleEntity);
}
}
@Override
public List<Long> queryRoleIdList(Long userId) {
public List<String> queryRoleIdList(Long userId) {
return baseMapper.queryRoleIdList(userId);
}

19
src/main/java/com/sqx/sharding/StandardShardingStrategyConf.java Normal file
View File

@@ -0,0 +1,19 @@
package com.sqx.sharding;
import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm;
import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue;
import java.util.Collection;
public class StandardShardingStrategyConf implements PreciseShardingAlgorithm<Long> {
@Override
public String doSharding(Collection<String> availableTargetNames, PreciseShardingValue<Long> shardingValue) {
// 根据ID对5取模来确定表名
long tableIndex = shardingValue.getValue() % 5;
for (String tableName : availableTargetNames) {
if (tableName.endsWith(String.valueOf(tableIndex))) {
return tableName;
}
}
throw new IllegalArgumentException();
}
}