huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善oms-api

This commit is contained in:
Richie 2024-03-17 22:32:29 +08:00
parent 1f6eb35fad
commit ab663ebd21
12 changed files with 72 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/common/pom.xml
View File

@ -25,6 +25,11 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>3.5.5</version>
</dependency>
<!-- Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>

7
tao-api/src/main/java/com/qihang/tao/common/PageQuery.java → core/common/src/main/java/com/qihang/common/common/PageQuery.java
View File

@ -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 <T> Page<T> 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;

2
tao-api/src/main/java/com/qihang/tao/common/PageResult.java → core/common/src/main/java/com/qihang/common/common/PageResult.java
View File

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

5
jd-api/src/main/java/com/qihang/jd/service/impl/SysUserServiceImpl.java
View File

@ -290,4 +290,9 @@ public class SysUserServiceImpl implements ISysUserService
return userMapper.deleteUserById(userId);
}
@Override
public void checkUserDataScope(Long userId) {
}
}

13
oms-api/src/main/java/com/qihang/oms/common/BaseController.java
View File

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

19
oms-api/src/main/java/com/qihang/oms/config/MybatisPlusConfig.java Normal file
View File

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

9
oms-api/src/main/java/com/qihang/oms/controller/OrderController.java
View File

@ -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<OOrder> list = orderService.getList(order);
return getDataTable(list);
// PageQuery pageQuery = new PageQuery();
// List<OOrder> list = orderService.getList(order);
var pageList = orderService.queryPageList(order,pageQuery);
return getDataTable(pageList);
}

3
oms-api/src/main/java/com/qihang/oms/service/OOrderService.java
View File

@ -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<OOrder> {
ResultVo<Integer> taoOrderMessage(String orderId);
List<OOrder> getList(OOrder order);
PageResult<OOrder> queryPageList(OOrder bo, PageQuery pageQuery);
}

11
oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java
View File

@ -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<OOrderMapper, OOrder>
public List<OOrder> getList(OOrder order) {
return orderMapper.selectList(new LambdaQueryWrapper<>());
}
@Override
public PageResult<OOrder> queryPageList(OOrder bo, PageQuery pageQuery) {
LambdaQueryWrapper<OOrder> queryWrapper = new LambdaQueryWrapper<>();
Page<OOrder> pages = orderMapper.selectPage(pageQuery.build(), queryWrapper);
return PageResult.build(pages);
}
}

8
tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java
View File

@ -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

4
tao-api/src/main/java/com/qihang/tao/service/TaoGoodsService.java
View File

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

4
tao-api/src/main/java/com/qihang/tao/service/impl/TaoGoodsServiceImpl.java
View File

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