diff --git a/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogTodo.java b/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogTodo.java new file mode 100644 index 00000000..b8e99356 --- /dev/null +++ b/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogTodo.java @@ -0,0 +1,85 @@ +package com.xjs.todo.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.common.core.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 博客待办实体 + * + * @author xiejs + * @since 2022-01-27 + */ +@Data +public class BlogTodo implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 待办标题 + */ + @Excel(name = "待办标题") + private String todoTitle; + + /** + * 待办内容 + */ + @Excel(name = "待办内容") + private String todoContent; + + /** + * 待办程度 + */ + @Excel(name = "待办程度") + private String todoLevel; + + /** + * 是否过期 1:未过期 2:已过期 + */ + @Excel(name = "是否过期 ", readConverterExp = "1=未过期 2=已过期") + private Integer pastDue; + + /** + * 显示颜色 + */ + @Excel(name = "显示颜色") + private String todoColor; + + /** + * 外键分类id + */ + @Excel(name = "外键分类id") + private Long sortId; + + /** + * 博客分类对象 + */ + @TableField(exist = false) + private BlogTodoSort blogTodoSort; + + + /** + * 博客用户账号 + */ + @Excel(name = "博客用户账号") + private String userName; + + /** + * 博客用户对象 + */ + @TableField(exist = false) + private BlogUser blogUser; + + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + +} diff --git a/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogTodoSort.java b/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogTodoSort.java new file mode 100644 index 00000000..91b833a6 --- /dev/null +++ b/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogTodoSort.java @@ -0,0 +1,44 @@ +package com.xjs.todo.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.common.core.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 博客待办分类实体 + * @author xiejs + * @since 2022-01-27 + */ +@Data +public class BlogTodoSort implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 外键分类id */ + @Excel(name = "外键分类id") + private Long sortId; + + /** 分类名称 */ + @Excel(name = "分类名称") + private String sortName; + + /** 分类颜色(#999999)这种 */ + @Excel(name = "分类颜色") + private String sortColor; + + /** 分类排序 */ + @Excel(name = "分类排序") + private Long sort; + + @Excel(name = "创建时间" ,dateFormat = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + +} diff --git a/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogUser.java b/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogUser.java new file mode 100644 index 00000000..65a035a8 --- /dev/null +++ b/xjs-business/xjs-business-blog/src/main/java/com/xjs/todo/domain/BlogUser.java @@ -0,0 +1,94 @@ +package com.xjs.todo.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.common.core.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 博客用户实体 + * + * @author xiejs + * @since 2022-01-27 + */ +@Data +public class BlogUser implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 用户名称 + */ + @Excel(name = "用户名称") + private String userName; + + /** + * 用户密码 + */ + @Excel(name = "用户密码") + private String userPassword; + + /** + * 用户昵称 + */ + @Excel(name = "用户昵称") + private String userNick; + + /** + * 用户头像 + */ + @Excel(name = "用户头像") + private String avatar; + + /** + * 手机号码 + */ + @Excel(name = "手机号码") + private Long phoneNumber; + + /** + * 用户邮箱 + */ + @Excel(name = "用户邮箱") + private String email; + + /** + * 用户性别 1:男 2:女 + */ + @Excel(name = "用户性别", readConverterExp = "1=男,2=女") + private Integer sex; + + /** + * 登录次数 + */ + @Excel(name = "登录次数") + private Long loginCount; + + /** + * 最后登录Ip + */ + @Excel(name = "最后登录Ip") + private String loginIp; + + /** + * 最后登录时间 + */ + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date loginDate; + + /** + * 创建时间 + */ + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + +}