diff --git a/tashow-module/tashow-module-product/pom.xml b/tashow-module/tashow-module-product/pom.xml index 2096593..24b9ddb 100644 --- a/tashow-module/tashow-module-product/pom.xml +++ b/tashow-module/tashow-module-product/pom.xml @@ -42,11 +42,11 @@ 2.2.20 - - com.github.jsqlparser - jsqlparser - 4.5 - + + + + + diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java index 969623d..d74f92c 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java @@ -10,8 +10,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; * 应用服务启动类 */ @SpringBootApplication -@EnableScheduling -@MapperScan("com.tashow.cloud.product.mapper") public class ProductServerApplication { public static void main(String[] args) { diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java index 79aeea8..c4f4e03 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/ProdController.java @@ -66,12 +66,11 @@ public class ProdController { return success(BeanUtils.toBean(prod, ProdRespVO.class)); } + @PermitAll @GetMapping("/page") @Operation(summary = "获得商品分页") - @PreAuthorize("@ss.hasPermission('tashow-module-product:prod:query')") - @PermitAll - public CommonResult> getProdPage(@Valid ProdPageReqVO pageReqVO) { - PageResult pageResult = prodService.getProdPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ProdRespVO.class)); + public CommonResult>> getProdPage(@Valid ProdPageReqVO pageReqVO) { + PageResult> pageResult = prodService.getProdPage(pageReqVO); + return success(pageResult); } } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java index ce403c8..71e94bb 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/mapper/ProdMapper.java @@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ProdMapper extends BaseMapperX { -// PageResult getProdPage1(ProdPageReqVO reqVO); + PageResult> getProdPageList(ProdPageReqVO reqVO); } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java index 7550b55..37bf98b 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/ProdService.java @@ -52,6 +52,6 @@ public interface ProdService { * @param pageReqVO 分页查询 * @return 商品分页 */ - PageResult getProdPage(ProdPageReqVO pageReqVO); + PageResult> getProdPage(ProdPageReqVO pageReqVO); } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java index c2eb3ee..c6e2156 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/ProdServiceImpl.java @@ -68,8 +68,8 @@ public class ProdServiceImpl implements ProdService { } @Override - public PageResult getProdPage(ProdPageReqVO pageReqVO) { - return null;// prodMapper.getProdPage1(pageReqVO); + public PageResult> getProdPage(ProdPageReqVO pageReqVO) { + return prodMapper.getProdPageList(pageReqVO); } } \ No newline at end of file diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml deleted file mode 100644 index c1a9fc1..0000000 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/CategoryMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml index 144eef5..2d68480 100644 --- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml +++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml @@ -8,7 +8,7 @@ 代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。 文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - + \ No newline at end of file