diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsController.java index afca9b7bd..68760a72d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsController.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.controller.admin.funds.products; import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.funds.products.vo.product.ProductPageReqVO; @@ -12,7 +13,6 @@ import com.cf.imes.module.system.service.funds.products.ProductsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,14 +33,12 @@ public class ProductsController { @PutMapping("") @Operation(summary = "新建产品") - @PreAuthorize("@ss.hasPermission('base:products:create')") public CommonResult createProducts(@RequestParam("productName") String productName) { return success(productsService.create(productName)); } @PostMapping("") @Operation(summary = "更新产品") - @PreAuthorize("@ss.hasPermission('base:products:update')") public CommonResult updateProducts(@Valid @RequestBody ProductSaveReqVO updateReqVO) { ProductsDO productsDO = BeanUtils.toBean(updateReqVO, ProductsDO.class); productsService.update(productsDO); @@ -49,7 +47,6 @@ public class ProductsController { @PostMapping("/freeze") @Operation(summary = "下架产品") - @PreAuthorize("@ss.hasPermission('base:products:freeze')") public CommonResult freezeProducts(@Valid Long id) { ProductsDO productsDO = new ProductsDO().setId(id).setStatus(ProductStatusEnum.PRODUCT_DELIS.getStatus()); productsService.update(productsDO); @@ -58,7 +55,6 @@ public class ProductsController { @PostMapping("/melt") @Operation(summary = "上架产品") - @PreAuthorize("@ss.hasPermission('base:products:melt')") public CommonResult meltProducts(@Valid Long id) { ProductsDO productsDO = new ProductsDO().setId(id).setStatus(ProductStatusEnum.PRODUCT_UPDATES.getStatus()); productsService.update(productsDO); @@ -69,7 +65,6 @@ public class ProductsController { @DeleteMapping("") @Operation(summary = "删除产品") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('base:products:delete')") public CommonResult deleteProducts(@RequestParam("id") Long id) { productsService.delete(id); return success(true); @@ -78,7 +73,6 @@ public class ProductsController { @GetMapping("/{id}") @Operation(summary = "查询产品") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('base:products:query')") public CommonResult getProducts(@PathVariable("id") Long id) { ProductsDO productRespVO = productsService.get(id); return success(BeanUtils.toBean(productRespVO, ProductRespVO.class)); @@ -86,10 +80,18 @@ public class ProductsController { @GetMapping("/page") @Operation(summary = "查询产品分页") - @PreAuthorize("@ss.hasPermission('base:products:query')") public CommonResult> getProductsPage(@Valid ProductPageReqVO pageReqVO) { PageResult pageResult = productsService.getPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProductRespVO.class)); } + @GetMapping("/available") + @Operation(summary = "查询已上架产品列表") + public CommonResult> getAvailableProductsPage(@Valid ProductPageReqVO pageReqVO) { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + pageReqVO.setStatus(ProductStatusEnum.PRODUCT_UPDATES.getStatus()); + PageResult pageResult = productsService.getPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ProductRespVO.class)); + } + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsDetailController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsDetailController.java index db99cfe2d..25c0fa871 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsDetailController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/ProductsDetailController.java @@ -11,13 +11,11 @@ import com.cf.imes.module.system.service.funds.products.ProductsDetailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import jakarta.validation.Valid; -import java.util.List; import static com.cf.imes.framework.common.pojo.CommonResult.success; @@ -32,14 +30,12 @@ public class ProductsDetailController { @PutMapping("") @Operation(summary = "新建产品明细") - @PreAuthorize("@ss.hasPermission('base:productDetails:create')") public CommonResult createProductsDetails(@Valid @RequestBody ProductDetailsSaveReqVO createReqVO) { return success(productDetailsService.create(createReqVO)); } @PostMapping("") @Operation(summary = "更新产品明细") - @PreAuthorize("@ss.hasPermission('base:productDetails:update')") public CommonResult updateProductsDetails(@Valid @RequestBody ProductDetailsSaveReqVO updateReqVO) { productDetailsService.update(updateReqVO); return success(true); @@ -48,7 +44,6 @@ public class ProductsDetailController { @DeleteMapping("") @Operation(summary = "删除产品明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermissionDetails('base:productDetails:delete')") public CommonResult deleteProducts(@RequestParam("id") Long id) { productDetailsService.delete(id); return success(true); @@ -57,14 +52,12 @@ public class ProductsDetailController { @GetMapping("/{id}") @Operation(summary = "查询产品明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('base:productDetails:query')") public CommonResult getProductsDetail(@PathVariable("id") Long id) { return success(productDetailsService.get(id)); } @GetMapping("/page") @Operation(summary = "查询产品明细分页") - @PreAuthorize("@ss.hasPermission('base:productDetails:query')") public CommonResult> getProductsDetailsPage(@Valid ProductDetailsPageReqVO pageReqVO) { PageResult pageResult = productDetailsService.getPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProductDetailsRespVO.class));