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;
}