From f50a24f82605def4b8ab79f3e3b909ecbafa8751 Mon Sep 17 00:00:00 2001 From: hxf13 <2994198039@qq.com> Date: Wed, 17 Jul 2024 16:25:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/maku/framework/common/query/Query.java | 30 +++++++++++----------- .../net/maku/maku/controller/TBookController.java | 1 - .../java/net/maku/maku/convert/TBookConvert.java | 3 +++ .../main/java/net/maku/maku/query/TBookQuery.java | 2 ++ .../java/net/maku/maku/query/TPurchaseQuery.java | 2 ++ .../net/maku/maku/query/TShoppingTrolleyQuery.java | 3 +++ .../main/java/net/maku/maku/query/TUserQuery.java | 5 ++++ .../maku/maku/service/impl/TBookServiceImpl.java | 2 ++ .../maku/service/impl/TPurchaseServiceImpl.java | 3 +++ .../service/impl/TShoppingTrolleyServiceImpl.java | 5 +++- .../maku/maku/service/impl/TUserServiceImpl.java | 3 +++ 11 files changed, 42 insertions(+), 17 deletions(-) diff --git a/maku-framework/src/main/java/net/maku/framework/common/query/Query.java b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java index 9466a8d..f574303 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/query/Query.java +++ b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java @@ -12,21 +12,21 @@ import org.hibernate.validator.constraints.Range; * @author 阿沐 babamu@126.com * MAKU */ -@Data -public class Query { - @NotNull(message = "页码不能为空") - @Min(value = 1, message = "页码最小值为 1") - @Schema(description = "当前页码", required = true) - Integer page; + @Data + public class Query { + @NotNull(message = "页码不能为空") + @Min(value = 1, message = "页码最小值为 1") + @Schema(description = "当前页码", required = true) + Integer page; - @NotNull(message = "每页条数不能为空") - @Range(min = 1, max = 1000, message = "每页条数，取值范围 1-1000") - @Schema(description = "每页条数", required = true) - Integer limit; + @NotNull(message = "每页条数不能为空") + @Range(min = 1, max = 1000, message = "每页条数，取值范围 1-1000") + @Schema(description = "每页条数", required = true) + Integer limit; - @Schema(description = "排序字段") - String order; + @Schema(description = "排序字段") + String order; - @Schema(description = "是否升序") - boolean asc; -} + @Schema(description = "是否升序") + boolean asc; + } diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java index 582b6e5..faa7412 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java @@ -35,7 +35,6 @@ public class TBookController { @PreAuthorize("hasAuthority('maku:t_book:page')") public Result> page(@ParameterObject @Valid TBookQuery query){ PageResult page = tBookService.page(query); - return Result.ok(page); } diff --git a/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java b/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java index 58bdee5..6b107c8 100644 --- a/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java +++ b/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java @@ -1,5 +1,6 @@ package net.maku.maku.convert; + import net.maku.maku.entity.TBookEntity; import net.maku.maku.vo.TBookVO; import org.mapstruct.Mapper; @@ -21,6 +22,8 @@ public interface TBookConvert { TBookVO convert(TBookEntity entity); + + List convertList(List list); } \ No newline at end of file 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 ed1c582..aae5546 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 @@ -19,4 +19,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TBookQuery extends Query { + private String author; + private String bookName; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java b/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java index c8ec28a..9d4bc36 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java @@ -19,4 +19,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TPurchaseQuery extends Query { + private Integer id; + private BigDecimal totalPrice; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java b/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java index 91c9cce..4bf0419 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java @@ -18,4 +18,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TShoppingTrolleyQuery extends Query { + private Integer userId; + + private Integer bookId; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java b/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java index 9fada3c..1bf4f22 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java @@ -19,4 +19,9 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TUserQuery extends Query { + + private String username; + private Integer status; + + } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java index 4c9b703..58bf1ae 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java @@ -36,6 +36,8 @@ public class TBookServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TBookQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(TBookEntity::getBookName, query.getBookName()); + wrapper.eq(TBookEntity::getAuthor, query.getAuthor()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java index f06e6fd..3ef4e3e 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,6 +37,8 @@ public class TPurchaseServiceImpl extends BaseServiceImpl getWrapper(TPurchaseQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(ObjectUtils.isNotNull(query.getId()),TPurchaseEntity::getId,query.getId()); + wrapper.eq(ObjectUtils.isNotNull(query.getTotalPrice()),TPurchaseEntity::getTotalPrice, query.getTotalPrice()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java index b399c7b..16ac78a 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,6 +8,7 @@ import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.maku.convert.TShoppingTrolleyConvert; +import net.maku.maku.entity.TPurchaseEntity; import net.maku.maku.entity.TShoppingTrolleyEntity; import net.maku.maku.query.TShoppingTrolleyQuery; import net.maku.maku.vo.TShoppingTrolleyVO; @@ -36,7 +38,8 @@ public class TShoppingTrolleyServiceImpl extends BaseServiceImpl getWrapper(TShoppingTrolleyQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.eq(ObjectUtils.isNotNull(query.getUserId()), TShoppingTrolleyEntity::getUserId,query.getUserId()); + wrapper.eq(ObjectUtils.isNotNull(query.getBookId()),TShoppingTrolleyEntity::getBookId, query.getBookId()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 36f00e8..3c54cbc 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,6 +37,8 @@ public class TUserServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TUserQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(TUserEntity::getUsername, query.getUsername()); + wrapper.eq(ObjectUtils.isNotNull(query.getStatus()),TUserEntity::getStatus, query.getStatus()); return wrapper; } From fcd0049022c71ed12b30f23c06be299ba750ec39 Mon Sep 17 00:00:00 2001 From: zhao <2796247050@qq.com> Date: Wed, 17 Jul 2024 16:34:39 +0800 Subject: [PATCH 2/7] =?UTF-8?q?Revert=20"=E5=AE=8C=E6=88=90=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f50a24f82605def4b8ab79f3e3b909ecbafa8751. --- .../net/maku/framework/common/query/Query.java | 30 +++++++++++----------- .../net/maku/maku/controller/TBookController.java | 1 + .../java/net/maku/maku/convert/TBookConvert.java | 3 --- .../main/java/net/maku/maku/query/TBookQuery.java | 2 -- .../java/net/maku/maku/query/TPurchaseQuery.java | 2 -- .../net/maku/maku/query/TShoppingTrolleyQuery.java | 3 --- .../main/java/net/maku/maku/query/TUserQuery.java | 5 ---- .../maku/maku/service/impl/TBookServiceImpl.java | 2 -- .../maku/service/impl/TPurchaseServiceImpl.java | 3 --- .../service/impl/TShoppingTrolleyServiceImpl.java | 5 +--- .../maku/maku/service/impl/TUserServiceImpl.java | 3 --- 11 files changed, 17 insertions(+), 42 deletions(-) diff --git a/maku-framework/src/main/java/net/maku/framework/common/query/Query.java b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java index f574303..9466a8d 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/query/Query.java +++ b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java @@ -12,21 +12,21 @@ import org.hibernate.validator.constraints.Range; * @author 阿沐 babamu@126.com * MAKU */ - @Data - public class Query { - @NotNull(message = "页码不能为空") - @Min(value = 1, message = "页码最小值为 1") - @Schema(description = "当前页码", required = true) - Integer page; +@Data +public class Query { + @NotNull(message = "页码不能为空") + @Min(value = 1, message = "页码最小值为 1") + @Schema(description = "当前页码", required = true) + Integer page; - @NotNull(message = "每页条数不能为空") - @Range(min = 1, max = 1000, message = "每页条数，取值范围 1-1000") - @Schema(description = "每页条数", required = true) - Integer limit; + @NotNull(message = "每页条数不能为空") + @Range(min = 1, max = 1000, message = "每页条数，取值范围 1-1000") + @Schema(description = "每页条数", required = true) + Integer limit; - @Schema(description = "排序字段") - String order; + @Schema(description = "排序字段") + String order; - @Schema(description = "是否升序") - boolean asc; - } + @Schema(description = "是否升序") + boolean asc; +} diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java index faa7412..582b6e5 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java @@ -35,6 +35,7 @@ public class TBookController { @PreAuthorize("hasAuthority('maku:t_book:page')") public Result> page(@ParameterObject @Valid TBookQuery query){ PageResult page = tBookService.page(query); + return Result.ok(page); } diff --git a/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java b/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java index 6b107c8..58bdee5 100644 --- a/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java +++ b/maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java @@ -1,6 +1,5 @@ package net.maku.maku.convert; - import net.maku.maku.entity.TBookEntity; import net.maku.maku.vo.TBookVO; import org.mapstruct.Mapper; @@ -22,8 +21,6 @@ public interface TBookConvert { TBookVO convert(TBookEntity entity); - - List convertList(List list); } \ No newline at end of file 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..ed1c582 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 @@ -19,6 +19,4 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TBookQuery extends Query { - private String author; - private String bookName; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java b/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java index 9d4bc36..c8ec28a 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java @@ -19,6 +19,4 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TPurchaseQuery extends Query { - private Integer id; - private BigDecimal totalPrice; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java b/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java index 4bf0419..91c9cce 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java @@ -18,7 +18,4 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TShoppingTrolleyQuery extends Query { - private Integer userId; - - private Integer bookId; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java b/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java index 1bf4f22..9fada3c 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java @@ -19,9 +19,4 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TUserQuery extends Query { - - private String username; - private Integer status; - - } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java index 58bf1ae..4c9b703 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java @@ -36,8 +36,6 @@ public class TBookServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TBookQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(TBookEntity::getBookName, query.getBookName()); - wrapper.eq(TBookEntity::getAuthor, query.getAuthor()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java index 3ef4e3e..f06e6fd 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java @@ -1,6 +1,5 @@ package net.maku.maku.service.impl; -import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,8 +36,6 @@ public class TPurchaseServiceImpl extends BaseServiceImpl getWrapper(TPurchaseQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(ObjectUtils.isNotNull(query.getId()),TPurchaseEntity::getId,query.getId()); - wrapper.eq(ObjectUtils.isNotNull(query.getTotalPrice()),TPurchaseEntity::getTotalPrice, query.getTotalPrice()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java index 16ac78a..b399c7b 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java @@ -1,6 +1,5 @@ package net.maku.maku.service.impl; -import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,7 +7,6 @@ import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.maku.convert.TShoppingTrolleyConvert; -import net.maku.maku.entity.TPurchaseEntity; import net.maku.maku.entity.TShoppingTrolleyEntity; import net.maku.maku.query.TShoppingTrolleyQuery; import net.maku.maku.vo.TShoppingTrolleyVO; @@ -38,8 +36,7 @@ public class TShoppingTrolleyServiceImpl extends BaseServiceImpl getWrapper(TShoppingTrolleyQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(ObjectUtils.isNotNull(query.getUserId()), TShoppingTrolleyEntity::getUserId,query.getUserId()); - wrapper.eq(ObjectUtils.isNotNull(query.getBookId()),TShoppingTrolleyEntity::getBookId, query.getBookId()); + return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 3c54cbc..36f00e8 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -1,6 +1,5 @@ package net.maku.maku.service.impl; -import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,8 +36,6 @@ public class TUserServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TUserQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(TUserEntity::getUsername, query.getUsername()); - wrapper.eq(ObjectUtils.isNotNull(query.getStatus()),TUserEntity::getStatus, query.getStatus()); return wrapper; } From 1b78494bfe2677c15ea78a737b504433ef9a5d3b Mon Sep 17 00:00:00 2001 From: zhao <2796247050@qq.com> Date: Wed, 17 Jul 2024 16:51:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/maku/maku/query/TBookCollectionQuery.java | 4 ++++ .../src/main/java/net/maku/maku/query/TBookCommentQuery.java | 6 ++++++ maku-server/src/main/java/net/maku/maku/query/TBookQuery.java | 2 ++ .../src/main/java/net/maku/maku/query/TPurchaseDetailsQuery.java | 4 ++++ maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java | 2 ++ .../src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java | 2 ++ maku-server/src/main/java/net/maku/maku/query/TUserQuery.java | 2 ++ .../java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java | 4 +++- .../java/net/maku/maku/service/impl/TBookCommentServiceImpl.java | 3 +++ .../src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java | 3 ++- .../net/maku/maku/service/impl/TPurchaseDetailsServiceImpl.java | 4 +++- .../main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java | 4 +++- .../net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java | 4 +++- .../src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java | 4 +++- 14 files changed, 42 insertions(+), 6 deletions(-) diff --git a/maku-server/src/main/java/net/maku/maku/query/TBookCollectionQuery.java b/maku-server/src/main/java/net/maku/maku/query/TBookCollectionQuery.java index 5ff4b55..34f21a6 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TBookCollectionQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TBookCollectionQuery.java @@ -18,4 +18,8 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TBookCollectionQuery extends Query { + @Schema(description = "用户id") + private Integer userId; + @Schema(description = "书本id") + private Integer bookId; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TBookCommentQuery.java b/maku-server/src/main/java/net/maku/maku/query/TBookCommentQuery.java index de6c1da..68df672 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TBookCommentQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TBookCommentQuery.java @@ -18,4 +18,10 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TBookCommentQuery extends Query { + @Schema(description = "用户id") + private Integer userId; + @Schema(description = "书籍id") + private Integer bookId; + @Schema(description = "用户名") + private String userName; } \ No newline at end of file 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 ed1c582..aae5546 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 @@ -19,4 +19,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TBookQuery extends Query { + private String author; + private String bookName; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TPurchaseDetailsQuery.java b/maku-server/src/main/java/net/maku/maku/query/TPurchaseDetailsQuery.java index e91b0f7..cdc7434 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TPurchaseDetailsQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TPurchaseDetailsQuery.java @@ -18,4 +18,8 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TPurchaseDetailsQuery extends Query { + @Schema(description = "订单编号") + private Integer purchaseId; + @Schema(description = "书本编号") + private Integer bookId; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java b/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java index c8ec28a..9d4bc36 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java @@ -19,4 +19,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TPurchaseQuery extends Query { + private Integer id; + private BigDecimal totalPrice; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java b/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java index 91c9cce..0deb6c8 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java @@ -18,4 +18,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TShoppingTrolleyQuery extends Query { + private Integer userId; + private Integer bookId; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java b/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java index 9fada3c..35a714d 100644 --- a/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java +++ b/maku-server/src/main/java/net/maku/maku/query/TUserQuery.java @@ -19,4 +19,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = false) @Schema(description = "查询") public class TUserQuery extends Query { + private String username; + private Integer status; } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java index 00d9e60..7679fff 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,7 +37,8 @@ public class TBookCollectionServiceImpl extends BaseServiceImpl getWrapper(TBookCollectionQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.eq(ObjectUtils.isNotNull(query.getUserId()),TBookCollectionEntity::getUserId,query.getUserId()); + wrapper.eq(ObjectUtils.isNotNull(query.getBookId()),TBookCollectionEntity::getBookId,query.getBookId()); return wrapper; } 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 d8b500a..72a7801 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 @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,6 +37,8 @@ public class TBookCommentServiceImpl extends BaseServiceImpl getWrapper(TBookCommentQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(ObjectUtil.isNotNull(query.getUserId()), TBookCommentEntity::getUserId, query.getUserId()); + wrapper.eq(ObjectUtil.isNotNull(query.getBookId()), TBookCommentEntity::getBookId, query.getBookId()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java index 4c9b703..641a091 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java @@ -36,7 +36,8 @@ public class TBookServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TBookQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.eq(TBookEntity::getBookName, query.getBookName()); + wrapper.eq(TBookEntity::getAuthor, query.getAuthor()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseDetailsServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseDetailsServiceImpl.java index 8ca160b..8313013 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseDetailsServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseDetailsServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,7 +37,8 @@ public class TPurchaseDetailsServiceImpl extends BaseServiceImpl getWrapper(TPurchaseDetailsQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.eq(ObjectUtil.isNotNull(query.getPurchaseId()),TPurchaseDetailsEntity::getPurchaseId,query.getPurchaseId()); + wrapper.eq(ObjectUtil.isNotNull(query.getBookId()),TPurchaseDetailsEntity::getBookId,query.getBookId()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java index f06e6fd..f91b90e 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,7 +37,8 @@ public class TPurchaseServiceImpl extends BaseServiceImpl getWrapper(TPurchaseQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.eq(ObjectUtils.isNotNull(query.getId()),TPurchaseEntity::getId,query.getId()); + wrapper.eq(ObjectUtils.isNotNull(query.getTotalPrice()),TPurchaseEntity::getTotalPrice, query.getTotalPrice()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java index b399c7b..d77d729 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,7 +37,8 @@ public class TShoppingTrolleyServiceImpl extends BaseServiceImpl getWrapper(TShoppingTrolleyQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.eq(ObjectUtils.isNotNull(query.getUserId()), TShoppingTrolleyEntity::getUserId,query.getUserId()); + wrapper.eq(ObjectUtils.isNotNull(query.getBookId()),TShoppingTrolleyEntity::getBookId, query.getBookId()); return wrapper; } diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 36f00e8..3f6ecf9 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,7 +37,8 @@ public class TUserServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TUserQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - + wrapper.like(TUserEntity::getUsername, query.getUsername()); + wrapper.eq(ObjectUtil.isNotNull(query.getStatus()), TUserEntity::getStatus, query.getStatus()); return wrapper; } From a7b578c7a052aa9aa370afd6fe3e91a7a9e95a3a Mon Sep 17 00:00:00 2001 From: xiaoqiantx223 <491437285@qq.com> Date: Wed, 17 Jul 2024 17:23:45 +0800 Subject: [PATCH 4/7] xiaoqiantx --- maku-framework/src/main/resources/auth.yml | 6 ++- .../net/maku/maku/controller/TBookController.java | 18 +++++++ .../net/maku/maku/controller/TUserController.java | 58 +++++++++++++++++++++- .../java/net/maku/maku/service/TBookService.java | 1 + .../java/net/maku/maku/service/TUserService.java | 5 ++ .../maku/maku/service/impl/TUserServiceImpl.java | 27 ++++++++++ 6 files changed, 113 insertions(+), 2 deletions(-) diff --git a/maku-framework/src/main/resources/auth.yml b/maku-framework/src/main/resources/auth.yml index 12dbb99..00fcd50 100644 --- a/maku-framework/src/main/resources/auth.yml +++ b/maku-framework/src/main/resources/auth.yml @@ -8,4 +8,8 @@ auth: - /swagger-ui.html - /swagger-ui/** - /doc.html - - / \ No newline at end of file + - / + - /maku/t_user/login + - /maku/t_user/updateUser + - /maku/t_user/register + - /maku/t_user/logout \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java index 582b6e5..c1fb10f 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java @@ -1,6 +1,7 @@ package net.maku.maku.controller; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import net.maku.framework.common.utils.PageResult; @@ -30,6 +31,23 @@ import java.util.List; public class TBookController { private final TBookService tBookService; + @GetMapping("/list") + @Operation(summary = "列表") + public Result> list() { + List list = tBookService.list(); + + return Result.ok(list); + } + + @GetMapping("") + @Operation(summary = "书籍") + @Parameter + public Result getById(@PathVariable Long id){ + TBookEntity entity = tBookService.getById(id); + + return Result.ok(entity); + } + @GetMapping("page") @Operation(summary = "分页") @PreAuthorize("hasAuthority('maku:t_book:page')") diff --git a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java index 507c1b9..ff71544 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java @@ -1,8 +1,11 @@ package net.maku.maku.controller; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; +import net.maku.framework.common.cache.RedisCache; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.maku.convert.TUserConvert; @@ -10,7 +13,9 @@ import net.maku.maku.entity.TUserEntity; import net.maku.maku.service.TUserService; import net.maku.maku.query.TUserQuery; import net.maku.maku.vo.TUserVO; +import oracle.jdbc.proxy.annotation.Post; import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -18,7 +23,7 @@ import jakarta.validation.Valid; import java.util.List; /** -* +* * * @author 阿沐 babamu@126.com * @since 1.0.0 2024-07-16 @@ -29,6 +34,55 @@ import java.util.List; @AllArgsConstructor public class TUserController { private final TUserService tUserService; + private final RedisCache redisCache; + + @PostMapping("/register") + @Operation(summary = "注册") + public ResponseEntity> register(@RequestBody TUserEntity entity) { + TUserEntity existingUser = tUserService.login(entity); + if (existingUser != null) { + return ResponseEntity.badRequest().body(Result.error("用户名已存在")); + } else { + tUserService.save(entity); + return ResponseEntity.ok(Result.ok("注册成功")); + } + } + + + @PostMapping("/login") + @Operation(summary = "登录") + public Result login(@RequestBody TUserEntity entity){ + TUserEntity entity1 = tUserService.login(entity); + if(ObjectUtils.isNotNull(entity1)){ + return Result.ok(entity1); + }else { + return Result.error("登录失败"); + } + } + + + @GetMapping("/updateUser") + @Operation(summary = "修改") + public Result updateUser(@RequestBody TUserVO vo){ + TUserVO tUserVO = tUserService.updateUser(vo); + + return Result.ok(tUserVO); + } + + @PostMapping("/logout") + @Operation(summary = "退出登录") + public Result logout(HttpServletRequest request) { + String token = request.getHeader("token"); + if (token == null) { + return Result.error("token为空"); + } + Object o = redisCache.get(token); + if (o != null) { + redisCache.delete(token); + return Result.ok("退出登录"); + } + return Result.error("登录失败"); + } @GetMapping("page") @Operation(summary = "分页") @@ -74,4 +128,6 @@ public class TUserController { return Result.ok(); } + + } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/TBookService.java b/maku-server/src/main/java/net/maku/maku/service/TBookService.java index 96bdeed..896f5ca 100644 --- a/maku-server/src/main/java/net/maku/maku/service/TBookService.java +++ b/maku-server/src/main/java/net/maku/maku/service/TBookService.java @@ -23,4 +23,5 @@ public interface TBookService extends BaseService { void update(TBookVO vo); void delete(List idList); + } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/TUserService.java b/maku-server/src/main/java/net/maku/maku/service/TUserService.java index 9279f5c..5dbb763 100644 --- a/maku-server/src/main/java/net/maku/maku/service/TUserService.java +++ b/maku-server/src/main/java/net/maku/maku/service/TUserService.java @@ -23,4 +23,9 @@ public interface TUserService extends BaseService { void update(TUserVO vo); void delete(List idList); + + TUserEntity login(TUserEntity entity); + + TUserVO updateUser(TUserVO vo); + } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 36f00e8..38412d7 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.UUID; /** * @@ -27,6 +29,7 @@ import java.util.List; @AllArgsConstructor public class TUserServiceImpl extends BaseServiceImpl implements TUserService { + @Override public PageResult page(TUserQuery query) { IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); @@ -60,4 +63,28 @@ public class TUserServiceImpl extends BaseServiceImpl imp removeByIds(idList); } + public TUserEntity login(TUserEntity entity) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TUserEntity::getUsername, entity.getUsername()); + wrapper.eq(TUserEntity::getPassword, entity.getPassword()); + TUserEntity user = getOne(wrapper); + if (ObjectUtils.isNotNull(user)){ + UUID uuid = UUID.randomUUID(); + user.setAvatar(uuid.toString()); + updateById(user); + return user; + }else{ + return null; + } + } + + @Override + public TUserVO updateUser(TUserVO vo) { + TUserEntity entity =new TUserEntity(); + entity.setUsername(vo.getUsername()); + entity.setPassword(vo.getPassword()); + updateById(entity); + return vo; + } + } \ No newline at end of file From 1289e2a378a0ca435d6698bb35451203869c8303 Mon Sep 17 00:00:00 2001 From: xiaoqiantx223 <491437285@qq.com> Date: Wed, 17 Jul 2024 17:42:52 +0800 Subject: [PATCH 5/7] xiaoqiantx --- .../java/net/maku/maku/entity/TUserEntity.java | 1 - .../maku/maku/service/impl/TUserServiceImpl.java | 26 ++++++++++++++++++++++ maku-server/src/main/resources/application-dev.yml | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java b/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java index 8caa01e..0344b43 100644 --- a/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java +++ b/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java @@ -1,7 +1,6 @@ package net.maku.maku.entity; import lombok.Data; -import lombok.EqualsAndHashCode; import com.baomidou.mybatisplus.annotation.*; import java.math.BigDecimal; import java.util.Date; diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 36f00e8..3cea877 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.UUID; /** * @@ -60,4 +62,28 @@ public class TUserServiceImpl extends BaseServiceImpl imp removeByIds(idList); } + @Override + public TUserEntity login(TUserEntity entity) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TUserEntity::getUsername, entity.getUsername()); + wrapper.eq(TUserEntity::getPassword, entity.getPassword()); + TUserEntity one = getOne(wrapper); + if(ObjectUtils.isNotNull(one)) { + UUID uuid = UUID.randomUUID(); + one.setAvatar(uuid.toString()); + updateById(one); + return one; + } + return null; + } + + @Override + public TUserVO updateUser(TUserVO vo) { + TUserEntity entity = new TUserEntity(); + entity.setUsername(vo.getUsername()); + entity.setPassword(vo.getPassword()); + updateById(entity); + return vo; + } + } \ No newline at end of file diff --git a/maku-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml index cccf1ff..88c8b35 100644 --- a/maku-server/src/main/resources/application-dev.yml +++ b/maku-server/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: database: 0 host: 127.0.0.1 port: 6379 - # password: wxbc5b16589b8f183e + password: 123456 #timeout: 6000ms # 连接超时时长（毫秒） datasource: dynamic: From 94de3cd31280446767a9a471fcd9a6b487440cf0 Mon Sep 17 00:00:00 2001 From: zhao <2796247050@qq.com> Date: Wed, 17 Jul 2024 17:54:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java index 641a091..b6045f6 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java @@ -36,8 +36,8 @@ public class TBookServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TBookQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(TBookEntity::getBookName, query.getBookName()); - wrapper.eq(TBookEntity::getAuthor, query.getAuthor()); + wrapper.like(TBookEntity::getBookName, query.getBookName()); + wrapper.like(TBookEntity::getAuthor, query.getAuthor()); return wrapper; } From e4ffd2cce6fa158fd736a2749b8617c671d76805 Mon Sep 17 00:00:00 2001 From: zhao <2796247050@qq.com> Date: Wed, 17 Jul 2024 17:56:09 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 3cea877..daffc3e 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -1,5 +1,6 @@ package net.maku.maku.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -38,6 +39,8 @@ public class TUserServiceImpl extends BaseServiceImpl imp private LambdaQueryWrapper getWrapper(TUserQuery query){ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(TUserEntity::getUsername, query.getUsername()); + wrapper.eq(ObjectUtil.isNotNull(query.getStatus()), TUserEntity::getStatus, query.getStatus()); return wrapper; }