diff --git a/src/main/java/com/sqx/config/ShardingConfig.java b/src/main/java/com/sqx/config/ShardingConfig.java index 2ca52aa0..298f5ce6 100644 --- a/src/main/java/com/sqx/config/ShardingConfig.java +++ b/src/main/java/com/sqx/config/ShardingConfig.java @@ -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); diff --git a/src/main/java/com/sqx/modules/app/entity/App.java b/src/main/java/com/sqx/modules/app/entity/App.java index cdb7c94d..142715db 100644 --- a/src/main/java/com/sqx/modules/app/entity/App.java +++ b/src/main/java/com/sqx/modules/app/entity/App.java @@ -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; diff --git a/src/main/java/com/sqx/modules/app/entity/Msg.java b/src/main/java/com/sqx/modules/app/entity/Msg.java index 58a67ad2..a3dfd5cf 100644 --- a/src/main/java/com/sqx/modules/app/entity/Msg.java +++ b/src/main/java/com/sqx/modules/app/entity/Msg.java @@ -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; diff --git a/src/main/java/com/sqx/modules/app/entity/UserEntity.java b/src/main/java/com/sqx/modules/app/entity/UserEntity.java index 5a8c0e32..e5ddbae7 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserEntity.java +++ b/src/main/java/com/sqx/modules/app/entity/UserEntity.java @@ -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; /** * 用户名 diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoney.java b/src/main/java/com/sqx/modules/app/entity/UserMoney.java index 0786e12f..0505cf28 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoney.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoney.java @@ -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; } diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java index cfecdf9d..6d37e5de 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -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; /** * 标题 diff --git a/src/main/java/com/sqx/modules/app/entity/UserPrizeExchange.java b/src/main/java/com/sqx/modules/app/entity/UserPrizeExchange.java index cdab4dae..34a594a6 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserPrizeExchange.java +++ b/src/main/java/com/sqx/modules/app/entity/UserPrizeExchange.java @@ -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; /** * 用户名 diff --git a/src/main/java/com/sqx/modules/app/entity/UserVip.java b/src/main/java/com/sqx/modules/app/entity/UserVip.java index 156ae09e..3587716c 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserVip.java +++ b/src/main/java/com/sqx/modules/app/entity/UserVip.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/app/entity/VipDetails.java b/src/main/java/com/sqx/modules/app/entity/VipDetails.java index d6a997e7..29ea5abf 100644 --- a/src/main/java/com/sqx/modules/app/entity/VipDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/VipDetails.java @@ -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("会员类型") diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java index 32e4fe65..4e3f09fd 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java @@ -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 queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", dto.getForeignId()); + queryWrapper.eq("user_id", currentUserId); + DiscSpinningRecord record = discSpinningRecordService.getOne(queryWrapper); if (record == null) { throw new SqxException("中奖记录不存在"); } diff --git a/src/main/java/com/sqx/modules/banner/entity/Activity.java b/src/main/java/com/sqx/modules/banner/entity/Activity.java index c1facbd8..881a3dff 100644 --- a/src/main/java/com/sqx/modules/banner/entity/Activity.java +++ b/src/main/java/com/sqx/modules/banner/entity/Activity.java @@ -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; diff --git a/src/main/java/com/sqx/modules/banner/entity/Banner.java b/src/main/java/com/sqx/modules/banner/entity/Banner.java index 57d12e41..db632089 100644 --- a/src/main/java/com/sqx/modules/banner/entity/Banner.java +++ b/src/main/java/com/sqx/modules/banner/entity/Banner.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java b/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java index 43ff1af6..d86fa1f6 100644 --- a/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java +++ b/src/main/java/com/sqx/modules/callback/entity/UniAdCallbackRecord.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/common/entity/CommonInfo.java b/src/main/java/com/sqx/modules/common/entity/CommonInfo.java index 5742bc6c..11cfc724 100644 --- a/src/main/java/com/sqx/modules/common/entity/CommonInfo.java +++ b/src/main/java/com/sqx/modules/common/entity/CommonInfo.java @@ -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; diff --git a/src/main/java/com/sqx/modules/complet/entity/CompletAward.java b/src/main/java/com/sqx/modules/complet/entity/CompletAward.java index 43630e21..9221f07f 100644 --- a/src/main/java/com/sqx/modules/complet/entity/CompletAward.java +++ b/src/main/java/com/sqx/modules/complet/entity/CompletAward.java @@ -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 { @ApiModelProperty("id") + @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty("人数") private Integer inviteCount; diff --git a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java index 45767b6e..e3ae6c5f 100644 --- a/src/main/java/com/sqx/modules/coupon/entity/Coupon.java +++ b/src/main/java/com/sqx/modules/coupon/entity/Coupon.java @@ -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; /** * 优惠券名称 diff --git a/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java b/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java index dbd087ef..eba6df2e 100644 --- a/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java +++ b/src/main/java/com/sqx/modules/coupon/entity/CouponUser.java @@ -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; /** * 优惠券金币 diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java index 25d4ca2b..087781a2 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java @@ -19,7 +19,6 @@ public interface CourseDetailsDao extends BaseMapper { int deleteCourseDetails(String[] ids); - List selectCourseDetailsList(String randomNum,Integer wxShow,Integer dyShow); Map countCourse(Long courseId); diff --git a/src/main/java/com/sqx/modules/course/entity/CommentGood.java b/src/main/java/com/sqx/modules/course/entity/CommentGood.java index a4364f5b..af2060b2 100644 --- a/src/main/java/com/sqx/modules/course/entity/CommentGood.java +++ b/src/main/java/com/sqx/modules/course/entity/CommentGood.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/course/entity/Course.java b/src/main/java/com/sqx/modules/course/entity/Course.java index 2fc6d4a7..19555127 100644 --- a/src/main/java/com/sqx/modules/course/entity/Course.java +++ b/src/main/java/com/sqx/modules/course/entity/Course.java @@ -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; /** * 短剧分类对象 diff --git a/src/main/java/com/sqx/modules/course/entity/CourseClassification.java b/src/main/java/com/sqx/modules/course/entity/CourseClassification.java index 52d3f3ee..24116875 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseClassification.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseClassification.java @@ -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; /** * 分类名称 diff --git a/src/main/java/com/sqx/modules/course/entity/CourseCollect.java b/src/main/java/com/sqx/modules/course/entity/CourseCollect.java index 717a4902..05080a1b 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseCollect.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseCollect.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/course/entity/CourseComment.java b/src/main/java/com/sqx/modules/course/entity/CourseComment.java index a8e9001b..6e54c77e 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseComment.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseComment.java @@ -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; /** * 短剧 diff --git a/src/main/java/com/sqx/modules/course/entity/CourseDetails.java b/src/main/java/com/sqx/modules/course/entity/CourseDetails.java index bc9bf6db..860532e2 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseDetails.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseDetails.java @@ -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) diff --git a/src/main/java/com/sqx/modules/course/entity/CourseUser.java b/src/main/java/com/sqx/modules/course/entity/CourseUser.java index 4fc9606c..cf579b8c 100644 --- a/src/main/java/com/sqx/modules/course/entity/CourseUser.java +++ b/src/main/java/com/sqx/modules/course/entity/CourseUser.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 5f5ccd29..cd55f68f 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -120,7 +120,7 @@ public class CourseCollectServiceImpl extends ServiceImpl collectList = baseMapper.selectByUserId(userId, classify); // Set courseIdList = collectList.stream().map(CourseCollect::getCourseId).collect(Collectors.toSet()); diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index f02a0abf..f2d96893 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -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 ServiceImpllambdaQuery().eq(CourseDetails::getCourseId, id) .orderByAsc(CourseDetails::getSort).last(" limit 1")); @@ -254,25 +256,29 @@ public class CourseDetailsServiceImpl extends ServiceImpl list = baseMapper.selectCourseDetailsList(randomNum, wxShow, dyShow); + } + Integer detailCount = baseMapper.selectCount(new QueryWrapper<>()); + if (detailCount != null) { + PageHelper.startPage(RandomUtil.randomInt(1, detailCount / 10), 10); + } + List list = baseMapper.selectList(new QueryWrapper<>()); + PageInfo pageInfo = new PageInfo<>(list); - if (userId != null) { - List records = pageInfo.getList(); - for (CourseDetails courseDetails : records) { - courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper() - .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1))); - courseDetails.setIsGood(courseCollectDao.selectCount(new QueryWrapper() - .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().eq("course_id", courseDetails.getCourseId()))); - } - } +// if (userId != null) { +// List records = pageInfo.getList(); +// for (CourseDetails courseDetails : records) { +// courseDetails.setIsCollect(courseCollectDao.selectCount(new QueryWrapper() +// .eq("user_id", userId).eq("course_details_id", courseDetails.getCourseDetailsId()).eq("classify", 1))); +// courseDetails.setIsGood(courseCollectDao.selectCount(new QueryWrapper() +// .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().eq("course_id", courseDetails.getCourseId()))); +// } +// } return Result.success().put("data", PageUtils.page(pageInfo)); } diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java index b8c414e2..b19b830d 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java @@ -41,7 +41,8 @@ public class DiscSpinningRecordController { public Result selectDiscSpinningRecord(Integer page, Integer limit, @RequestAttribute("userId") Long userId) { PageHelper.startPage(page, limit); List list = discSpinningRecordService.list(new QueryWrapper().eq("user_id", userId).orderByDesc("create_time")); - return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true)); + PageInfo pageInfo = new PageInfo<>(list); + PageUtils pageUtils = PageUtils.page(pageInfo, true); + return Result.success().put("data", pageUtils); } } - diff --git a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java index a8a4f604..fcd94cda 100644 --- a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java +++ b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java @@ -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 { //主键 + @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 { private BigDecimal number; //流向 1 提现 2 存入余额 3 兑换 private String target; - + @JsonSerialize(using = ToStringSerializer.class) private Long targetId; //抽奖日期 private String drawDay; diff --git a/src/main/java/com/sqx/modules/integral/entity/UserIntegral.java b/src/main/java/com/sqx/modules/integral/entity/UserIntegral.java index 743c7681..329230e6 100644 --- a/src/main/java/com/sqx/modules/integral/entity/UserIntegral.java +++ b/src/main/java/com/sqx/modules/integral/entity/UserIntegral.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/integral/entity/UserIntegralDetails.java b/src/main/java/com/sqx/modules/integral/entity/UserIntegralDetails.java index 092fbace..fba107f2 100644 --- a/src/main/java/com/sqx/modules/integral/entity/UserIntegralDetails.java +++ b/src/main/java/com/sqx/modules/integral/entity/UserIntegralDetails.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/invite/entity/Invite.java b/src/main/java/com/sqx/modules/invite/entity/Invite.java index a6eb8f04..32fd8802 100644 --- a/src/main/java/com/sqx/modules/invite/entity/Invite.java +++ b/src/main/java/com/sqx/modules/invite/entity/Invite.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/invite/entity/InviteMoney.java b/src/main/java/com/sqx/modules/invite/entity/InviteMoney.java index 0f355b99..df805e0e 100644 --- a/src/main/java/com/sqx/modules/invite/entity/InviteMoney.java +++ b/src/main/java/com/sqx/modules/invite/entity/InviteMoney.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/job/entity/ScheduleJobEntity.java b/src/main/java/com/sqx/modules/job/entity/ScheduleJobEntity.java index cc4b8c19..5d416b6b 100644 --- a/src/main/java/com/sqx/modules/job/entity/ScheduleJobEntity.java +++ b/src/main/java/com/sqx/modules/job/entity/ScheduleJobEntity.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/job/entity/ScheduleJobLogEntity.java b/src/main/java/com/sqx/modules/job/entity/ScheduleJobLogEntity.java index 1025c25f..85284cd6 100644 --- a/src/main/java/com/sqx/modules/job/entity/ScheduleJobLogEntity.java +++ b/src/main/java/com/sqx/modules/job/entity/ScheduleJobLogEntity.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/message/entity/ActivityMessageInfo.java b/src/main/java/com/sqx/modules/message/entity/ActivityMessageInfo.java index ec4bbce0..cdcc7c7b 100644 --- a/src/main/java/com/sqx/modules/message/entity/ActivityMessageInfo.java +++ b/src/main/java/com/sqx/modules/message/entity/ActivityMessageInfo.java @@ -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; diff --git a/src/main/java/com/sqx/modules/message/entity/MessageInfo.java b/src/main/java/com/sqx/modules/message/entity/MessageInfo.java index 568cfe44..4e37a2db 100644 --- a/src/main/java/com/sqx/modules/message/entity/MessageInfo.java +++ b/src/main/java/com/sqx/modules/message/entity/MessageInfo.java @@ -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; diff --git a/src/main/java/com/sqx/modules/orders/entity/Orders.java b/src/main/java/com/sqx/modules/orders/entity/Orders.java index 57e65829..3d00e0dc 100644 --- a/src/main/java/com/sqx/modules/orders/entity/Orders.java +++ b/src/main/java/com/sqx/modules/orders/entity/Orders.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/oss/entity/SysOssEntity.java b/src/main/java/com/sqx/modules/oss/entity/SysOssEntity.java index e8693848..4ff9ccc5 100644 --- a/src/main/java/com/sqx/modules/oss/entity/SysOssEntity.java +++ b/src/main/java/com/sqx/modules/oss/entity/SysOssEntity.java @@ -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; diff --git a/src/main/java/com/sqx/modules/pay/entity/CashOut.java b/src/main/java/com/sqx/modules/pay/entity/CashOut.java index 8c1e1d5b..baba18a8 100644 --- a/src/main/java/com/sqx/modules/pay/entity/CashOut.java +++ b/src/main/java/com/sqx/modules/pay/entity/CashOut.java @@ -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; diff --git a/src/main/java/com/sqx/modules/pay/entity/PayClassify.java b/src/main/java/com/sqx/modules/pay/entity/PayClassify.java index e22908c6..4f30c917 100644 --- a/src/main/java/com/sqx/modules/pay/entity/PayClassify.java +++ b/src/main/java/com/sqx/modules/pay/entity/PayClassify.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/pay/entity/PayDetails.java b/src/main/java/com/sqx/modules/pay/entity/PayDetails.java index 93c08a79..7773c9ef 100644 --- a/src/main/java/com/sqx/modules/pay/entity/PayDetails.java +++ b/src/main/java/com/sqx/modules/pay/entity/PayDetails.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/sdk/entity/SdkInfo.java b/src/main/java/com/sqx/modules/sdk/entity/SdkInfo.java index 89d9d5d6..4df1283f 100644 --- a/src/main/java/com/sqx/modules/sdk/entity/SdkInfo.java +++ b/src/main/java/com/sqx/modules/sdk/entity/SdkInfo.java @@ -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) diff --git a/src/main/java/com/sqx/modules/sdk/entity/SdkType.java b/src/main/java/com/sqx/modules/sdk/entity/SdkType.java index 61deb24f..9149568a 100644 --- a/src/main/java/com/sqx/modules/sdk/entity/SdkType.java +++ b/src/main/java/com/sqx/modules/sdk/entity/SdkType.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/search/entity/Search.java b/src/main/java/com/sqx/modules/search/entity/Search.java index f3348e0e..6df5d8f9 100644 --- a/src/main/java/com/sqx/modules/search/entity/Search.java +++ b/src/main/java/com/sqx/modules/search/entity/Search.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java b/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java index fcfc900b..31a91e78 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java @@ -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); diff --git a/src/main/java/com/sqx/modules/sys/controller/SysUserController.java b/src/main/java/com/sqx/modules/sys/controller/SysUserController.java index a39f9332..3ed65381 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysUserController.java @@ -88,7 +88,7 @@ public class SysUserController extends AbstractController { SysUserEntity user = sysUserService.getById(userId); //获取用户所属的角色列表 - List roleIdList = sysUserRoleService.queryRoleIdList(userId); + List roleIdList = sysUserRoleService.queryRoleIdList(userId); user.setRoleIdList(roleIdList); return Result.success().put("user", user); diff --git a/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java b/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java index b0d82b7b..5c71317b 100644 --- a/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java +++ b/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java @@ -12,11 +12,11 @@ import java.util.List; */ @Mapper public interface SysUserRoleDao extends BaseMapper { - + /** * 根据用户ID，获取角色ID列表 */ - List queryRoleIdList(Long userId); + List queryRoleIdList(Long userId); /** diff --git a/src/main/java/com/sqx/modules/sys/entity/SysConfigEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysConfigEntity.java index 6ca6d530..6cdeadc8 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysConfigEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysConfigEntity.java @@ -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; diff --git a/src/main/java/com/sqx/modules/sys/entity/SysDictEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysDictEntity.java index 3cc548a5..97bb29be 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysDictEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysDictEntity.java @@ -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; /** * 字典名称 diff --git a/src/main/java/com/sqx/modules/sys/entity/SysLogEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysLogEntity.java index 1239aff4..1f6e1a8b 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysLogEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysLogEntity.java @@ -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; diff --git a/src/main/java/com/sqx/modules/sys/entity/SysMenuEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysMenuEntity.java index 410cbdb8..e547967b 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysMenuEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysMenuEntity.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/sys/entity/SysRoleEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysRoleEntity.java index bd5f074d..47338d15 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysRoleEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysRoleEntity.java @@ -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) diff --git a/src/main/java/com/sqx/modules/sys/entity/SysRoleMenuEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysRoleMenuEntity.java index dcdce806..c3aa4642 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysRoleMenuEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysRoleMenuEntity.java @@ -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; } diff --git a/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java index 6b3def70..c7c36565 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java @@ -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 roleIdList; + private List 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; /** diff --git a/src/main/java/com/sqx/modules/sys/entity/SysUserRoleEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysUserRoleEntity.java index ba913a6c..9e679f58 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysUserRoleEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysUserRoleEntity.java @@ -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; /** diff --git a/src/main/java/com/sqx/modules/sys/entity/SysUserTokenEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysUserTokenEntity.java index d5e9ffd3..b2fa741d 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysUserTokenEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysUserTokenEntity.java @@ -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; diff --git a/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java b/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java index 66abf8c2..91080574 100644 --- a/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java +++ b/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java @@ -12,13 +12,13 @@ import java.util.List; * */ public interface SysUserRoleService extends IService { - - void saveOrUpdate(Long userId, List roleIdList); - + + void saveOrUpdate(Long userId, List roleIdList); + /** * 根据用户ID，获取角色ID列表 */ - List queryRoleIdList(Long userId); + List queryRoleIdList(Long userId); /** * 根据角色ID数组，批量删除 diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java index 3945616b..d8f30068 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { @Override - public void saveOrUpdate(Long userId, List roleIdList) { + public void saveOrUpdate(Long userId, List roleIdList) { if (roleIdList == null || roleIdList.isEmpty()) { return; } @@ -27,17 +27,17 @@ public class SysUserRoleServiceImpl extends ServiceImpl queryRoleIdList(Long userId) { + public List queryRoleIdList(Long userId) { return baseMapper.queryRoleIdList(userId); } diff --git a/src/main/java/com/sqx/sharding/StandardShardingStrategyConf.java b/src/main/java/com/sqx/sharding/StandardShardingStrategyConf.java new file mode 100644 index 00000000..659edb5b --- /dev/null +++ b/src/main/java/com/sqx/sharding/StandardShardingStrategyConf.java @@ -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 { + @Override + public String doSharding(Collection availableTargetNames, PreciseShardingValue shardingValue) { + // 根据ID对5取模来确定表名 + long tableIndex = shardingValue.getValue() % 5; + for (String tableName : availableTargetNames) { + if (tableName.endsWith(String.valueOf(tableIndex))) { + return tableName; + } + } + throw new IllegalArgumentException(); + } +} \ No newline at end of file diff --git a/src/main/resources/mapper/course/CourseDetailsDao.xml b/src/main/resources/mapper/course/CourseDetailsDao.xml index 784bb74d..dc9ad259 100644 --- a/src/main/resources/mapper/course/CourseDetailsDao.xml +++ b/src/main/resources/mapper/course/CourseDetailsDao.xml @@ -53,12 +53,6 @@ - - + - \ No newline at end of file +