diff --git a/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java b/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java index aae5546..eed0ba7 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TBookQuery.java @@ -20,5 +20,6 @@ import java.util.Date; @Schema(description = "查询") public class TBookQuery extends Query { private String author; + private Integer category; private String bookName; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java index 72a7801..09deb95 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCommentServiceImpl.java @@ -40,6 +40,7 @@ public class TBookCommentServiceImpl extends BaseServiceImpl imp LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(TBookEntity::getBookName, query.getBookName()); wrapper.like(TBookEntity::getAuthor, query.getAuthor()); + wrapper.eq(ObjectUtil.isNotNull(query.getCategory()), TBookEntity::getCategory, query.getCategory()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java b/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java index 501ce43..9f9dad7 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TBookCollectionVO.java @@ -14,7 +14,7 @@ import java.util.Date; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "书籍收藏表视图数据") public class TBookCollectionVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java b/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java index a132b74..d7f5b48 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TBookCommentVO.java @@ -14,7 +14,7 @@ import java.util.Date; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "书籍评论表视图数据") public class TBookCommentVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java b/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java index 1aea373..2ed7016 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TBookVO.java @@ -15,11 +15,11 @@ import java.util.Date; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "书本视图数据") public class TBookVO implements Serializable { private static final long serialVersionUID = 1L; - private Integer id; + private Long id; private String bookName; diff --git a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java index b5be5ca..7de279b 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseDetailsVO.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "订单详情表视图数据") public class TPurchaseDetailsVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java index ce96ee1..6097807 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TPurchaseVO.java @@ -15,7 +15,7 @@ import java.util.Date; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "书籍订单表视图数据") public class TPurchaseVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java b/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java index e1c530d..1c614e8 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java @@ -14,7 +14,7 @@ import java.util.Date; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "购物车视图数据") public class TShoppingTrolleyVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java b/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java index ca71eb8..97912fa 100644 --- a/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java +++ b/maku-server/src/main/java/net/maku/maku/vo/TUserVO.java @@ -15,7 +15,7 @@ import java.util.Date; * @since 1.0.0 2024-07-16 */ @Data -@Schema(description = "") +@Schema(description = "用户视图数据") public class TUserVO implements Serializable { private static final long serialVersionUID = 1L;