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:
Tankaikai
2025-01-13 17:20:11 +08:00
parent 5783f33e2f 87dff599b4
commit 90ba7eff9c
5 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningAmount.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -19,6 +21,7 @@ import lombok.Data;
@ApiModel(value = "现金红包 抽奖配置 实体类") @ApiModel(value = "现金红包 抽奖配置 实体类")
public class DiscSpinningAmount extends Model<DiscSpinningAmount> { public class DiscSpinningAmount extends Model<DiscSpinningAmount> {
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
@ApiModelProperty("1 订单 2 周任务转盘 3 月任务转盘") @ApiModelProperty("1 订单 2 周任务转盘 3 月任务转盘")
private Integer type; private Integer type;

3
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.taskCenter.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -18,6 +20,7 @@ import lombok.Data;
@ApiModel(value = "任务中心 实体类") @ApiModel(value = "任务中心 实体类")
public class TaskCenter extends Model<TaskCenter> { public class TaskCenter extends Model<TaskCenter> {
@ApiModelProperty("id") @ApiModelProperty("id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
@ApiModelProperty("标题") @ApiModelProperty("标题")
private String title; private String title;

7
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -20,17 +22,22 @@ import lombok.Data;
public class TaskCenterRecord extends Model<TaskCenterRecord> { public class TaskCenterRecord extends Model<TaskCenterRecord> {
@TableId(type = IdType.ID_WORKER) @TableId(type = IdType.ID_WORKER)
@ApiModelProperty(value = "id",hidden = true) @ApiModelProperty(value = "id",hidden = true)
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
@ApiModelProperty(value = "用户id",hidden = true) @ApiModelProperty(value = "用户id",hidden = true)
@JsonSerialize(using = ToStringSerializer.class)
private Long userId; private Long userId;
@ApiModelProperty("任务Id 周任务转盘奖励时 该值为 user_sign_record的id") @ApiModelProperty("任务Id 周任务转盘奖励时 该值为 user_sign_record的id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId; private Long taskId;
@ApiModelProperty("来源Id 周任务(签到的Id) 实物(物品Id)") @ApiModelProperty("来源Id 周任务(签到的Id) 实物(物品Id)")
@JsonSerialize(using = ToStringSerializer.class)
private Long sourceId; private Long sourceId;
@ApiModelProperty("奖励名称") @ApiModelProperty("奖励名称")
private String name; private String name;
@ApiModelProperty("奖励类型 1 金币 2 现金 3 虚拟物品 4 5 9转盘") @ApiModelProperty("奖励类型 1 金币 2 现金 3 虚拟物品 4 5 9转盘")
private Integer type; private Integer type;
@JsonSerialize(using = ToStringSerializer.class)
private Long targetId; private Long targetId;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private Integer number; private Integer number;

5
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
View File

@@ -3,6 +3,8 @@ package com.sqx.modules.taskCenter.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -18,8 +20,10 @@ import lombok.Data;
@ApiModel(value = "任务奖励 实体类") @ApiModel(value = "任务奖励 实体类")
public class TaskCenterReward extends Model<TaskCenterReward> { public class TaskCenterReward extends Model<TaskCenterReward> {
@ApiModelProperty("id") @ApiModelProperty("id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
@ApiModelProperty("任务Id") @ApiModelProperty("任务Id")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId; private Long taskId;
@ApiModelProperty("图片") @ApiModelProperty("图片")
private String img; private String img;
@@ -28,6 +32,7 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
@ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数") @ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数")
private Integer type; private Integer type;
@TableField(exist = false) @TableField(exist = false)
@JsonSerialize(using = ToStringSerializer.class)
private Long targetId; private Long targetId;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private Integer number; private Integer number;

4
src/main/java/com/sqx/modules/userSign/entity/UserSignRecord.java
View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -22,8 +24,10 @@ import java.util.Date;
public class UserSignRecord extends Model<UserSignRecord> { public class UserSignRecord extends Model<UserSignRecord> {
@TableId(type = IdType.ID_WORKER) @TableId(type = IdType.ID_WORKER)
@ApiModelProperty("id") @ApiModelProperty("id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
@ApiModelProperty("用户id") @ApiModelProperty("用户id")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId; private Long userId;
@ApiModelProperty("累计签到") @ApiModelProperty("累计签到")
private Integer day; private Integer day;