From ab663ebd21c1362bf47a0055ceb54adaeedf7b27 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Sun, 17 Mar 2024 22:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84oms-api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/common/pom.xml | 5 +++++ .../com/qihang/common}/common/PageQuery.java | 7 +++---- .../com/qihang/common}/common/PageResult.java | 2 +- .../jd/service/impl/SysUserServiceImpl.java | 5 +++++ .../com/qihang/oms/common/BaseController.java | 13 +++++++++++++ .../qihang/oms/config/MybatisPlusConfig.java | 19 +++++++++++++++++++ .../oms/controller/OrderController.java | 9 ++++++--- .../com/qihang/oms/service/OOrderService.java | 3 +++ .../oms/service/impl/OOrderServiceImpl.java | 11 +++++++++++ .../tao/controller/GoodsController.java | 8 ++------ .../qihang/tao/service/TaoGoodsService.java | 4 ++-- .../tao/service/impl/TaoGoodsServiceImpl.java | 4 ++-- 12 files changed, 72 insertions(+), 18 deletions(-) rename {tao-api/src/main/java/com/qihang/tao => core/common/src/main/java/com/qihang/common}/common/PageQuery.java (89%) rename {tao-api/src/main/java/com/qihang/tao => core/common/src/main/java/com/qihang/common}/common/PageResult.java (97%) create mode 100644 oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java diff --git a/core/common/pom.xml b/core/common/pom.xml index ced9c7b4..b5bd9fa5 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -25,6 +25,11 @@ spring-boot-starter-data-redis ${spring-boot.version} + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + io.jsonwebtoken diff --git a/tao-api/src/main/java/com/qihang/tao/common/PageQuery.java b/core/common/src/main/java/com/qihang/common/common/PageQuery.java similarity index 89% rename from tao-api/src/main/java/com/qihang/tao/common/PageQuery.java rename to core/common/src/main/java/com/qihang/common/common/PageQuery.java index 506aa69a..f091122f 100644 --- a/tao-api/src/main/java/com/qihang/tao/common/PageQuery.java +++ b/core/common/src/main/java/com/qihang/common/common/PageQuery.java @@ -1,8 +1,7 @@ -package com.qihang.tao.common; +package com.qihang.common.common; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.qihang.common.common.ServiceException; import lombok.Data; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -14,7 +13,7 @@ import java.util.List; @Data public class PageQuery implements Serializable { private Integer pageSize; - private Integer pageIndex; + private Integer pageNum; private String orderByColumn; private String isAsc; @@ -22,7 +21,7 @@ public class PageQuery implements Serializable { public static final int DEFAULT_PAGE_SIZE = 10; public Page build() { - Integer pageIndex = (getPageIndex() == null || getPageIndex() == 0) ? DEFAULT_PAGE_INDEX : getPageIndex(); + Integer pageIndex = (getPageNum() == null || getPageNum() == 0) ? DEFAULT_PAGE_INDEX : getPageNum(); Integer pageSize = (getPageSize() == null || getPageSize() == 0) ? DEFAULT_PAGE_SIZE : getPageSize(); if (pageIndex <= 0) { pageIndex = DEFAULT_PAGE_INDEX; diff --git a/tao-api/src/main/java/com/qihang/tao/common/PageResult.java b/core/common/src/main/java/com/qihang/common/common/PageResult.java similarity index 97% rename from tao-api/src/main/java/com/qihang/tao/common/PageResult.java rename to core/common/src/main/java/com/qihang/common/common/PageResult.java index 3e8db53a..a7ef9e46 100644 --- a/tao-api/src/main/java/com/qihang/tao/common/PageResult.java +++ b/core/common/src/main/java/com/qihang/common/common/PageResult.java @@ -1,4 +1,4 @@ -package com.qihang.tao.common; +package com.qihang.common.common; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qihang.common.enums.HttpStatus; diff --git a/jd-api/src/main/java/com/qihang/jd/service/impl/SysUserServiceImpl.java b/jd-api/src/main/java/com/qihang/jd/service/impl/SysUserServiceImpl.java index aa2b8a5b..9a2089c7 100644 --- a/jd-api/src/main/java/com/qihang/jd/service/impl/SysUserServiceImpl.java +++ b/jd-api/src/main/java/com/qihang/jd/service/impl/SysUserServiceImpl.java @@ -290,4 +290,9 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.deleteUserById(userId); } + @Override + public void checkUserDataScope(Long userId) { + + } + } diff --git a/oms-api/src/main/java/com/qihang/oms/common/BaseController.java b/oms-api/src/main/java/com/qihang/oms/common/BaseController.java index b81590a6..b7cdc172 100644 --- a/oms-api/src/main/java/com/qihang/oms/common/BaseController.java +++ b/oms-api/src/main/java/com/qihang/oms/common/BaseController.java @@ -1,9 +1,11 @@ package com.qihang.oms.common; import com.qihang.common.common.AjaxResult; +import com.qihang.common.common.PageResult; import com.qihang.common.common.TableDataInfo; import com.qihang.common.enums.HttpStatus; import com.qihang.common.utils.StringUtils; +import com.qihang.oms.domain.OOrder; import com.qihang.security.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -145,5 +147,16 @@ public class BaseController rspData.setTotal(list.size()); return rspData; } + protected TableDataInfo getDataTable(PageResult pageResult) + { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(pageResult.getRecords()); +// rspData.setTotal(new PageInfo(list).getTotal()); + rspData.setTotal(pageResult.getTotal()); + return rspData; + } + } diff --git a/oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java b/oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java new file mode 100644 index 00000000..8074cc71 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java @@ -0,0 +1,19 @@ +package com.qihang.oms.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@MapperScan("com.qihang.oms.mapper") +public class MybatisPlusConfig { + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //注意使用哪种数据库 + return interceptor; + } +} diff --git a/oms-api/src/main/java/com/qihang/oms/controller/OrderController.java b/oms-api/src/main/java/com/qihang/oms/controller/OrderController.java index 6d80c8be..4a34afa1 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/OrderController.java +++ b/oms-api/src/main/java/com/qihang/oms/controller/OrderController.java @@ -1,6 +1,7 @@ package com.qihang.oms.controller; +import com.qihang.common.common.PageQuery; import com.qihang.common.common.TableDataInfo; import com.qihang.oms.common.BaseController; import com.qihang.oms.domain.OOrder; @@ -28,10 +29,12 @@ public class OrderController extends BaseController */ @PreAuthorize("@ss.hasPermi('shop:order:list')") @GetMapping("/list") - public TableDataInfo list(OOrder order) + public TableDataInfo list(OOrder order,PageQuery pageQuery) { - List list = orderService.getList(order); - return getDataTable(list); +// PageQuery pageQuery = new PageQuery(); +// List list = orderService.getList(order); + var pageList = orderService.queryPageList(order,pageQuery); + return getDataTable(pageList); } diff --git a/oms-api/src/main/java/com/qihang/oms/service/OOrderService.java b/oms-api/src/main/java/com/qihang/oms/service/OOrderService.java index 8f2ff3bc..dff9ba5e 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/OOrderService.java +++ b/oms-api/src/main/java/com/qihang/oms/service/OOrderService.java @@ -1,6 +1,8 @@ package com.qihang.oms.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; import com.qihang.common.common.ResultVo; import com.qihang.oms.domain.OOrder; @@ -16,4 +18,5 @@ public interface OOrderService extends IService { ResultVo taoOrderMessage(String orderId); List getList(OOrder order); + PageResult queryPageList(OOrder bo, PageQuery pageQuery); } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java index 96837383..5ef42f05 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java @@ -1,7 +1,10 @@ package com.qihang.oms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; import com.qihang.common.common.ResultVo; import com.qihang.common.common.ResultVoEnum; import com.qihang.common.enums.EnumShopType; @@ -268,6 +271,14 @@ public class OOrderServiceImpl extends ServiceImpl public List getList(OOrder order) { return orderMapper.selectList(new LambdaQueryWrapper<>()); } + + @Override + public PageResult queryPageList(OOrder bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Page pages = orderMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } } diff --git a/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java b/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java index 56b2f609..612148df 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java @@ -1,10 +1,8 @@ package com.qihang.tao.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qihang.common.common.ApiResult; -import com.qihang.tao.common.PageQuery; -import com.qihang.tao.common.PageResult; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; import com.qihang.tao.domain.TaoGoods; import com.qihang.tao.domain.bo.TaoGoodsBo; import com.qihang.tao.service.TaoGoodsService; @@ -13,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RequestMapping("/goods") @RestController @AllArgsConstructor diff --git a/tao-api/src/main/java/com/qihang/tao/service/TaoGoodsService.java b/tao-api/src/main/java/com/qihang/tao/service/TaoGoodsService.java index c8b0cf2e..fee3edcb 100644 --- a/tao-api/src/main/java/com/qihang/tao/service/TaoGoodsService.java +++ b/tao-api/src/main/java/com/qihang/tao/service/TaoGoodsService.java @@ -1,7 +1,7 @@ package com.qihang.tao.service; -import com.qihang.tao.common.PageQuery; -import com.qihang.tao.common.PageResult; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; import com.qihang.tao.domain.TaoGoods; import com.baomidou.mybatisplus.extension.service.IService; import com.qihang.tao.domain.bo.TaoGoodsBo; diff --git a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java index 8ca5b0f6..39af6457 100644 --- a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java +++ b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qihang.common.common.ResultVoEnum; import com.qihang.common.utils.StringUtils; -import com.qihang.tao.common.PageQuery; -import com.qihang.tao.common.PageResult; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; import com.qihang.tao.domain.OGoodsSku; import com.qihang.tao.domain.TaoGoods; import com.qihang.tao.domain.TaoGoodsSku;