diff --git a/dao/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java b/dao/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java deleted file mode 100644 index c3b5e3b..0000000 --- a/dao/src/main/java/cn/bunny/dto/article/LoadArticleListDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bunny.dto.article; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Objects; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class LoadArticleListDto { - private Integer pBoardId; - private Integer boardId; - private Integer orderType = 1; - - public void getOrderType(Integer orderType) { - this.orderType = Objects.requireNonNullElse(orderType, 1); - } -} diff --git a/dao/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java b/dao/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java deleted file mode 100644 index a644f4f..0000000 --- a/dao/src/main/java/cn/bunny/dto/article/LoadUserArticleDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.bunny.dto.article; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class LoadUserArticleDto { - private Long userId; - private Integer type; -} diff --git a/dao/src/main/java/cn/bunny/dto/common/CommentPostDto.java b/dao/src/main/java/cn/bunny/dto/common/CommentPostDto.java deleted file mode 100644 index 18a0ec4..0000000 --- a/dao/src/main/java/cn/bunny/dto/common/CommentPostDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bunny.dto.common; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.web.multipart.MultipartFile; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class CommentPostDto { - private String articleId; - private Integer pCommentId; - private String content; - private MultipartFile image; - private Long replyUserId; -} diff --git a/dao/src/main/java/cn/bunny/dto/common/CommentQueryDto.java b/dao/src/main/java/cn/bunny/dto/common/CommentQueryDto.java deleted file mode 100644 index 2ad59bc..0000000 --- a/dao/src/main/java/cn/bunny/dto/common/CommentQueryDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bunny.dto.common; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class CommentQueryDto { - private String articleId; - // time 时间查询、goods 点赞数量 - private String orderType; -} diff --git a/dao/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java b/dao/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java deleted file mode 100644 index 843a9de..0000000 --- a/dao/src/main/java/cn/bunny/dto/common/QueryTopTypeDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.bunny.dto.common; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class QueryTopTypeDto { - private Long commentId; - private Integer topType; -} diff --git a/dao/src/main/java/cn/bunny/dto/user/UserInfoDto.java b/dao/src/main/java/cn/bunny/dto/user/UserInfoDto.java deleted file mode 100644 index 4bbbc79..0000000 --- a/dao/src/main/java/cn/bunny/dto/user/UserInfoDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bunny.dto.user; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.web.multipart.MultipartFile; - -/** - * 修改用户信息 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class UserInfoDto { - private String nickName; - private String password; - private MultipartFile avatar; - private Integer sex; - private String personDescription; -} diff --git a/dao/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java b/dao/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java deleted file mode 100644 index 8320e0a..0000000 --- a/dao/src/main/java/cn/bunny/dto/user/UserIntegralRecordDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.bunny.dto.user; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class UserIntegralRecordDto { - private String startDate; - private String endDate; -} diff --git a/dao/src/main/java/cn/bunny/dto/user/UserMessageDto.java b/dao/src/main/java/cn/bunny/dto/user/UserMessageDto.java deleted file mode 100644 index 575bd73..0000000 --- a/dao/src/main/java/cn/bunny/dto/user/UserMessageDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bunny.dto.user; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class UserMessageDto { - private String type; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/article/Article.java b/dao/src/main/java/cn/bunny/entity/system/article/Article.java deleted file mode 100644 index fe9f84d..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/article/Article.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.bunny.entity.system.article; - -import cn.bunny.entity.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *
- * 文章信息 - *
- * - * @author Bunny - * @since 2024-05-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@ApiModel(value = "Article对象", description = "文章信息") -public class Article extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("板块ID") - private Integer boardId; - - @ApiModelProperty("板块名称") - private String boardName; - - @ApiModelProperty("父级板块ID") - private Integer pBoardId; - - @ApiModelProperty("父板块名称") - private String pBoardName; - - @ApiModelProperty("用户ID") - private Long userId; - - @ApiModelProperty("昵称") - private String nickName; - - @ApiModelProperty("最后登录ip地址") - private String userIpAddress; - - @ApiModelProperty("标题") - private String title; - - @ApiModelProperty("封面") - private String cover; - - @ApiModelProperty("内容") - private String content; - - @ApiModelProperty("0:富文本编辑器 1:markdown编辑器") - private Byte editorType; - - @ApiModelProperty("摘要") - private String summary; - - @ApiModelProperty("阅读数量") - private Integer readCount; - - @ApiModelProperty("点赞数") - private Integer goodCount; - - @ApiModelProperty("评论数") - private Integer commentCount; - - @ApiModelProperty("0未置顶 1:已置顶") - private Byte topType; - - @ApiModelProperty("0:没有附件 1:有附件") - private Byte attachmentType; - - @ApiModelProperty("-1已删除 0:待审核 1:已审核 ") - private Byte status; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/article/ForumComment.java b/dao/src/main/java/cn/bunny/entity/system/article/ForumComment.java deleted file mode 100644 index bb3b0ff..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/article/ForumComment.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.bunny.entity.system.article; - -import cn.bunny.entity.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *- * 评论 - *
- * - * @author Bunny - * @since 2024-05-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("forum_comment") -@ApiModel(value = "ForumComment对象", description = "评论") -public class ForumComment extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("父级评论ID") - private Long pCommentId; - - @ApiModelProperty("文章ID") - private String articleId; - - @ApiModelProperty("回复内容") - private String content; - - @ApiModelProperty("图片") - private String imgPath; - - @ApiModelProperty("用户ID") - private Long userId; - - @ApiModelProperty("昵称") - private String nickName; - - @ApiModelProperty("用户ip地址") - private String userIpAddress; - - @ApiModelProperty("回复人ID") - private Long replyUserId; - - @ApiModelProperty("回复人昵称") - private String replyNickName; - - @ApiModelProperty("0:未置顶 1:置顶") - private Integer topType; - - @ApiModelProperty("good数量") - private Integer goodCount; - - @ApiModelProperty("0:待审核 1:已审核") - private Integer status; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java b/dao/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java deleted file mode 100644 index b88f1e8..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/article/IntegralRecord.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.bunny.entity.system.article; - -import cn.bunny.entity.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *- * 用户积分记录表 - *
- * - * @author Bunny - * @since 2024-05-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("integral_record") -@ApiModel(value = "IntegralRecord对象", description = "用户积分记录表") -public class IntegralRecord extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("用户ID") - private Long userId; - - @ApiModelProperty("操作类型") - private Byte operType; - - @ApiModelProperty("积分") - private Integer integral; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/article/LikeRecord.java b/dao/src/main/java/cn/bunny/entity/system/article/LikeRecord.java deleted file mode 100644 index 8d27cb9..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/article/LikeRecord.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bunny.entity.system.article; - -import cn.bunny.entity.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *- * 点赞记录 - *
- * - * @author Bunny - * @since 2024-05-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("like_record") -@ApiModel(value = "LikeRecord对象", description = "点赞记录") -public class LikeRecord extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("操作类型0:文章点赞 1:评论点赞") - private Byte opType; - - @ApiModelProperty("主体ID") - private String objectId; - - @ApiModelProperty("用户ID") - private Long userId; - - @ApiModelProperty("主体作者ID") - private Long authorUserId; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/board/ForumBoard.java b/dao/src/main/java/cn/bunny/entity/system/board/ForumBoard.java deleted file mode 100644 index 0fad48c..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/board/ForumBoard.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.bunny.entity.system.board; - -import cn.bunny.entity.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *- * 文章板块信息 - *
- * - * @author Bunny - * @since 2024-05-19 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("forum_board") -@ApiModel(value = "ForumBoard对象", description = "文章板块信息") -public class ForumBoard extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("父级板块ID") - private Long parentId; - - @ApiModelProperty("板块名") - private String boardName; - - @ApiModelProperty("封面") - private String cover; - - @ApiModelProperty("描述") - private String boardDesc; - - @ApiModelProperty("排序") - private Integer sort; - - @ApiModelProperty("0:只允许管理员发帖 1:任何人可以发帖") - private Boolean postType; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/file/Files.java b/dao/src/main/java/cn/bunny/entity/system/file/Files.java deleted file mode 100644 index 2597bb2..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/file/Files.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.bunny.entity.system.file; - -import cn.bunny.entity.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *- * 用于存储文件信息的数据表 - *
- * - * @author Bunny - * @since 2024-05-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@ApiModel(value = "Files对象", description = "用于存储文件信息的数据表") -public class Files extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("文章ID") - private Long articleId; - - @ApiModelProperty("文件的名称") - private String filename; - - @ApiModelProperty("文件在服务器上的存储路径") - private String filepath; - - @ApiModelProperty("文件的大小,以字节为单位") - private Long fileSize; - - @ApiModelProperty("文件的MIME类型") - private String fileType; - - @ApiModelProperty("创建用户") - private Long createUser; - - @ApiModelProperty("下载次数") - private Integer downloadCount; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/user/UserMessage.java b/dao/src/main/java/cn/bunny/entity/system/user/UserMessage.java deleted file mode 100644 index faa6cdf..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/user/UserMessage.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.bunny.entity.system.user; - -import cn.bunny.entity.base.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *- * 用户消息 - *
- * - * @author Bunny - * @since 2024-05-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("user_message") -@ApiModel(value = "UserMessage对象", description = "用户消息") -public class UserMessage extends BaseEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @ApiModelProperty("接收人用户ID") - private Long receivedUserId; - - @ApiModelProperty("文章ID") - private String articleId; - - @ApiModelProperty("文章标题") - private String articleTitle; - - @ApiModelProperty("评论ID") - private Integer commentId; - - @ApiModelProperty("发送人用户ID") - private Long sendUserId; - - @ApiModelProperty("发送人昵称") - private String sendNickName; - - @ApiModelProperty("sys:系统消息 reply:评论 likePost:文章点赞 likeComment:评论点赞 attachment:附件下载") - private String messageType; - - @ApiModelProperty("消息内容") - private String messageContent; - - @ApiModelProperty("1:未读 2:已读") - private Byte status; -} diff --git a/dao/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java b/dao/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java deleted file mode 100644 index 6caaf01..0000000 --- a/dao/src/main/java/cn/bunny/vo/system/article/ForumArticleVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.bunny.vo.system.article; - -import cn.bunny.vo.file.FileInfoVo; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class ForumArticleVo { - // 文章ID - private Long id; - // 板块ID - private Integer boardId; - // 父级板块ID - private Integer pBoardId; - // 板块名称 - private String boardName; - // 父板块名称 - private String pBoardName; - // 用户ID - private String userId; - // 昵称 - private String nickName; - // 最后登录ip地址 - private String userIpAddress; - // 标题 - private String title; - // 封面 - private String cover; - // 内容 - private String content; - // 0:富文本编辑器 1:markdown编辑器 - private Byte editorType; - // 摘要 - private String summary; - // 发布时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private String createTime; - // 最后更新时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private String updateTime; - // 阅读数量 - private Integer readCount; - // 点赞数 - private Integer goodCount; - // 评论数 - private Integer commentCount; - // 0未置顶 1:已置顶 - private Byte topType; - // 0:没有附件 1:有附件 - private Byte attachmentType; - // -1已删除 0:待审核 1:已审核 - private Byte status; - private List