work/book-api
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: work:aba833895e2c93cc7998f7f2f60dbb0cd9aec788
Branches Tags
work:master
work:main
work:xiaoqiantx
..
compare: work:1c8fba2849c5182bb32aeef8cfb0604d817e3e21
Branches Tags
work:master
work:main
work:xiaoqiantx

No commits in common. "aba833895e2c93cc7998f7f2f60dbb0cd9aec788" and "1c8fba2849c5182bb32aeef8cfb0604d817e3e21" have entirely different histories.
aba833895e ... 1c8fba2849

11 changed files with 17 additions and 42 deletions
Show Stats Expand all files Collapse all files

1
maku-server/src/main/java/net/maku/maku/controller/TBookController.java
View File

@ -35,6 +35,7 @@ public class TBookController {
@PreAuthorize("hasAuthority('maku:t_book:page')")
public Result<PageResult<TBookVO>> page(@ParameterObject @Valid TBookQuery query){
PageResult<TBookVO> page = tBookService.page(query);
return Result.ok(page);
}

3
maku-server/src/main/java/net/maku/maku/convert/TBookConvert.java
View File

@ -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<TBookVO> convertList(List<TBookEntity> list);
}

2
maku-server/src/main/java/net/maku/maku/query/TBookQuery.java
View File

@ -19,6 +19,4 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Schema(description = "查询")
public class TBookQuery extends Query {
private String author;
private String bookName;
}

2
maku-server/src/main/java/net/maku/maku/query/TPurchaseQuery.java
View File

@ -19,6 +19,4 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Schema(description = "查询")
public class TPurchaseQuery extends Query {
private Integer id;
private BigDecimal totalPrice;
}

3
maku-server/src/main/java/net/maku/maku/query/TShoppingTrolleyQuery.java
View File

@ -18,7 +18,4 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Schema(description = "查询")
public class TShoppingTrolleyQuery extends Query {
private Integer userId;
private Integer bookId;
}

5
maku-server/src/main/java/net/maku/maku/query/TUserQuery.java
View File

@ -19,9 +19,4 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Schema(description = "查询")
public class TUserQuery extends Query {
private String username;
private Integer status;
}

2
maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java
View File

@ -36,8 +36,6 @@ public class TBookServiceImpl extends BaseServiceImpl<TBookDao, TBookEntity> imp
private LambdaQueryWrapper<TBookEntity> getWrapper(TBookQuery query){
LambdaQueryWrapper<TBookEntity> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TBookEntity::getBookName, query.getBookName());
wrapper.eq(TBookEntity::getAuthor, query.getAuthor());
return wrapper;
}

3
maku-server/src/main/java/net/maku/maku/service/impl/TPurchaseServiceImpl.java
View File

@ -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<TPurchaseDao, TPurchas
private LambdaQueryWrapper<TPurchaseEntity> getWrapper(TPurchaseQuery query){
LambdaQueryWrapper<TPurchaseEntity> 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;
}

5
maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java
View File

@ -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<TShoppingTrolle
private LambdaQueryWrapper<TShoppingTrolleyEntity> getWrapper(TShoppingTrolleyQuery query){
LambdaQueryWrapper<TShoppingTrolleyEntity> 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;
}

3
maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java
View File

@ -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<TUserDao, TUserEntity> imp
private LambdaQueryWrapper<TUserEntity> getWrapper(TUserQuery query){
LambdaQueryWrapper<TUserEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(TUserEntity::getUsername, query.getUsername());
wrapper.eq(ObjectUtils.isNotNull(query.getStatus()),TUserEntity::getStatus, query.getStatus());
return wrapper;
}