From 13b4f0a7e2ebee4e980d3bd6048061f84a92eef7 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 10 May 2025 15:13:32 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E8=90=A5=E9=94=80=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysConfigController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../controller/system/SysMenuController.java | 2 +- .../system/SysNoticeController.java | 2 +- .../system/SysProductCategoryController.java | 2 +- .../system/SysProfileController.java | 2 +- .../controller/system/SysRoleController.java | 2 +- .../controller/system/SysUserController.java | 2 +- .../controller/xkt/AdvertRoundController.java | 4 +- .../xkt/PictureSearchController.java | 12 +-- .../xkt/PictureSearchHotController.java | 12 +-- .../xkt/PictureSearchResultController.java | 12 +-- .../xkt/QuickFunctionController.java | 4 +- .../xkt/ShoppingCartController.java | 10 +- .../xkt/StoreCertificateController.java | 6 +- .../controller/xkt/StoreColorController.java | 2 +- .../web/controller/xkt/StoreController.java | 14 +-- .../xkt/StoreCustomerController.java | 12 +-- ...toreCustomerProductDiscountController.java | 8 +- .../xkt/StoreFactoryController.java | 10 +- .../xkt/StoreHomepageController.java | 10 +- .../StoreProductBarcodeMatchController.java | 12 +-- .../StoreProductBarcodeRecordController.java | 12 +-- ...oreProductCategoryAttributeController.java | 12 +-- .../xkt/StoreProductColorController.java | 2 +- .../xkt/StoreProductColorSizeController.java | 12 +-- .../xkt/StoreProductController.java | 18 ++-- .../xkt/StoreProductDemandController.java | 12 +-- .../StoreProductDemandDetailController.java | 12 +-- .../xkt/StoreProductDetailController.java | 12 +-- .../xkt/StoreProductFileController.java | 12 +-- .../xkt/StoreProductProcessController.java | 12 +-- .../xkt/StoreProductServiceController.java | 12 +-- .../xkt/StoreProductStockController.java | 10 +- .../xkt/StoreProductStorageController.java | 8 +- .../StoreProductStorageDetailController.java | 12 +-- .../xkt/StoreRoleAccountController.java | 10 +- .../controller/xkt/StoreRoleController.java | 10 +- .../xkt/StoreRoleMenuController.java | 12 +-- .../controller/xkt/StoreSaleController.java | 14 +-- .../xkt/StoreSaleDetailController.java | 12 +-- .../xkt/StoreSaleRefundRecordController.java | 2 +- .../controller/xkt/UserAccountController.java | 12 +-- .../controller/xkt/UserAddressController.java | 12 +-- .../xkt/UserAuthenticationController.java | 12 +-- .../xkt/UserBillingStatementController.java | 12 +-- .../xkt/UserBrowsingHistoryController.java | 12 +-- .../xkt/UserFavoritesController.java | 8 +- .../controller/xkt/UserNoticeController.java | 12 +-- .../xkt/UserNoticeSettingController.java | 12 +-- .../xkt/UserQuickFunctionController.java | 12 +-- .../xkt/UserSubscriptionsController.java | 6 +- .../xkt/vo/advert/AdvertCreateVO.java | 6 ++ .../controller/xkt/vo/advert/AdvertResVO.java | 6 ++ .../xkt/vo/advert/AdvertUpdateVO.java | 9 ++ .../xkt/vo/advertRound/AdRoundStoreResVO.java | 14 ++- .../java/com/ruoyi/common/enums/AdType.java | 26 +++-- .../controller/DailyTaskController.java | 2 +- .../java/com/ruoyi/quartz/task/XktTask.java | 5 +- .../domain/StoreProductCategoryAttribute.java | 25 +++-- .../ruoyi/xkt/dto/advert/AdvertCreateDTO.java | 4 + .../ruoyi/xkt/dto/advert/AdvertResDTO.java | 6 ++ .../ruoyi/xkt/dto/advert/AdvertUpdateDTO.java | 6 ++ .../dto/advertRound/AdRoundStoreResDTO.java | 4 + .../java/com/ruoyi/xkt/enums/AdShowType.java | 1 + .../ruoyi/xkt/mapper/AdvertRoundMapper.java | 13 ++- .../xkt/mapper/AdvertRoundRecordMapper.java | 17 +++- .../service/impl/AdvertRoundServiceImpl.java | 94 +++++++++++++++---- .../xkt/service/impl/AdvertServiceImpl.java | 1 + .../resources/mapper/AdvertRoundMapper.xml | 7 +- .../mapper/AdvertRoundRecordMapper.xml | 28 +++++- 72 files changed, 450 insertions(+), 298 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 2803f4080..d4ee7dfc2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -22,7 +22,7 @@ import java.util.List; * @author ruoyi */ @RestController -@RequestMapping("/system/config") +@RequestMapping("/rest/v1/sys/config") public class SysConfigController extends BaseController { @Autowired private ISysConfigService configService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 15b0086ad..b37a0a36e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -45,7 +45,7 @@ import java.util.List; @RequiredArgsConstructor @Api(tags = "系统基础数据 - 字典数据明细") @RestController -@RequestMapping("/system/dict/data") +@RequestMapping("/rest/v1/sys/dict/data") public class SysDictDataController extends BaseController { final ISysDictDataService dictDataService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index b98c0ad3b..eaa2d6872 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; @Api(tags = "系统基础数据 - 字典类型") @RequiredArgsConstructor @RestController -@RequestMapping("/system/dict/type") +@RequestMapping("/rest/v1/sys/dict/type") public class SysDictTypeController extends BaseController { final ISysDictTypeService dictTypeService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 9b6a222ac..7d74b6a65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -26,7 +26,7 @@ import java.util.List; @Api(tags = "菜单信息") @RequiredArgsConstructor @RestController -@RequestMapping("/system/menu") +@RequestMapping("/rest/v1/sys/menu") public class SysMenuController extends XktBaseController { final ISysMenuService menuService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index d17060acd..7b7bbcb14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -20,7 +20,7 @@ import java.util.List; * @author ruoyi */ @RestController -@RequestMapping("/system/notice") +@RequestMapping("/rest/v1/sys/notice") public class SysNoticeController extends BaseController { @Autowired private ISysNoticeService noticeService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java index 0714eb57b..b2ad93b77 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProductCategoryController.java @@ -28,7 +28,7 @@ import java.util.List; @Api(tags = "系统基础数据 - 商品分类") @RequiredArgsConstructor @RestController -@RequestMapping("/system/prod-cate") +@RequestMapping("/rest/v1/sys/prod-cate") public class SysProductCategoryController extends XktBaseController { final ISysProductCategoryService prodCateService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 42cc16cec..7c0bd3f10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -25,7 +25,7 @@ import java.util.Map; * @author ruoyi */ @RestController -@RequestMapping("/system/user/profile") +@RequestMapping("/rest/v1/sys/user/profile") public class SysProfileController extends BaseController { @Autowired private ISysUserService userService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 7d24be853..df183bd78 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -44,7 +44,7 @@ import java.util.List; @Api(tags = "角色信息") @RequiredArgsConstructor @RestController -@RequestMapping("/system/role") +@RequestMapping("/rest/v1/sys/role") public class SysRoleController extends XktBaseController { final ISysRoleService roleService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index acc3527db..290cd8c27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; * @author ruoyi */ @RestController -@RequestMapping("/system/user") +@RequestMapping("/rest/v1/sys/user") public class SysUserController extends BaseController { @Autowired diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java index 819ae2951..489aad2bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java @@ -47,8 +47,8 @@ public class AdvertRoundController extends XktBaseController { */ @ApiOperation(value = "根据广告ID获取推广轮次列表，并返回当前档口在这些推广轮次的数据", httpMethod = "GET", response = R.class) @GetMapping(value = "/{advertId}/{storeId}/{showType}") - public R getStoreAdInfo(@PathVariable("advertId") Long advertId, @PathVariable("showType") Integer showType, - @PathVariable("storeId") Long storeId) { + public R getStoreAdInfo(@PathVariable("advertId") Long advertId, @PathVariable("storeId") Long storeId, + @PathVariable("showType") Integer showType) { return R.ok(BeanUtil.toBean(advertRoundService.getStoreAdInfo(storeId, advertId, showType), AdRoundStoreResVO.class)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchController.java index 7d399200d..bb13df9dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchController.java @@ -30,7 +30,7 @@ public class PictureSearchController extends XktBaseController { /** * 查询以图搜款列表 */ - @PreAuthorize("@ss.hasPermi('system:search:list')") + // @PreAuthorize("@ss.hasPermi('system:search:list')") @GetMapping("/list") public TableDataInfo list(PictureSearch pictureSearch) { startPage(); @@ -41,7 +41,7 @@ public class PictureSearchController extends XktBaseController { /** * 导出以图搜款列表 */ - @PreAuthorize("@ss.hasPermi('system:search:export')") + // @PreAuthorize("@ss.hasPermi('system:search:export')") @Log(title = "以图搜款", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, PictureSearch pictureSearch) { @@ -53,7 +53,7 @@ public class PictureSearchController extends XktBaseController { /** * 获取以图搜款详细信息 */ - @PreAuthorize("@ss.hasPermi('system:search:query')") + // @PreAuthorize("@ss.hasPermi('system:search:query')") @GetMapping(value = "/{picSearchId}") public R getInfo(@PathVariable("picSearchId") Long picSearchId) { return success(pictureSearchService.selectPictureSearchByPicSearchId(picSearchId)); @@ -62,7 +62,7 @@ public class PictureSearchController extends XktBaseController { /** * 新增以图搜款 */ - @PreAuthorize("@ss.hasPermi('system:search:add')") + // @PreAuthorize("@ss.hasPermi('system:search:add')") @Log(title = "以图搜款", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody PictureSearch pictureSearch) { @@ -72,7 +72,7 @@ public class PictureSearchController extends XktBaseController { /** * 修改以图搜款 */ - @PreAuthorize("@ss.hasPermi('system:search:edit')") + // @PreAuthorize("@ss.hasPermi('system:search:edit')") @Log(title = "以图搜款", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody PictureSearch pictureSearch) { @@ -82,7 +82,7 @@ public class PictureSearchController extends XktBaseController { /** * 删除以图搜款 */ - @PreAuthorize("@ss.hasPermi('system:search:remove')") + // @PreAuthorize("@ss.hasPermi('system:search:remove')") @Log(title = "以图搜款", businessType = BusinessType.DELETE) @DeleteMapping("/{picSearchIds}") public R remove(@PathVariable Long[] picSearchIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java index ef00d5181..1e754e6f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java @@ -30,7 +30,7 @@ public class PictureSearchHotController extends XktBaseController { /** * 查询图搜热款列表 */ - @PreAuthorize("@ss.hasPermi('system:hot:list')") + // @PreAuthorize("@ss.hasPermi('system:hot:list')") @GetMapping("/list") public TableDataInfo list(PictureSearchHot pictureSearchHot) { startPage(); @@ -41,7 +41,7 @@ public class PictureSearchHotController extends XktBaseController { /** * 导出图搜热款列表 */ - @PreAuthorize("@ss.hasPermi('system:hot:export')") + // @PreAuthorize("@ss.hasPermi('system:hot:export')") @Log(title = "图搜热款", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, PictureSearchHot pictureSearchHot) { @@ -53,7 +53,7 @@ public class PictureSearchHotController extends XktBaseController { /** * 获取图搜热款详细信息 */ - @PreAuthorize("@ss.hasPermi('system:hot:query')") + // @PreAuthorize("@ss.hasPermi('system:hot:query')") @GetMapping(value = "/{picSearchHotId}") public R getInfo(@PathVariable("picSearchHotId") Long picSearchHotId) { return success(pictureSearchHotService.selectPictureSearchHotByPicSearchHotId(picSearchHotId)); @@ -62,7 +62,7 @@ public class PictureSearchHotController extends XktBaseController { /** * 新增图搜热款 */ - @PreAuthorize("@ss.hasPermi('system:hot:add')") + // @PreAuthorize("@ss.hasPermi('system:hot:add')") @Log(title = "图搜热款", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody PictureSearchHot pictureSearchHot) { @@ -72,7 +72,7 @@ public class PictureSearchHotController extends XktBaseController { /** * 修改图搜热款 */ - @PreAuthorize("@ss.hasPermi('system:hot:edit')") + // @PreAuthorize("@ss.hasPermi('system:hot:edit')") @Log(title = "图搜热款", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody PictureSearchHot pictureSearchHot) { @@ -82,7 +82,7 @@ public class PictureSearchHotController extends XktBaseController { /** * 删除图搜热款 */ - @PreAuthorize("@ss.hasPermi('system:hot:remove')") + // @PreAuthorize("@ss.hasPermi('system:hot:remove')") @Log(title = "图搜热款", businessType = BusinessType.DELETE) @DeleteMapping("/{picSearchHotIds}") public R remove(@PathVariable Long[] picSearchHotIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java index fef3aab72..6cc76eb24 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java @@ -30,7 +30,7 @@ public class PictureSearchResultController extends XktBaseController { /** * 查询以图搜款结果列表 */ - @PreAuthorize("@ss.hasPermi('system:result:list')") + // @PreAuthorize("@ss.hasPermi('system:result:list')") @GetMapping("/list") public TableDataInfo list(PictureSearchResult pictureSearchResult) { startPage(); @@ -41,7 +41,7 @@ public class PictureSearchResultController extends XktBaseController { /** * 导出以图搜款结果列表 */ - @PreAuthorize("@ss.hasPermi('system:result:export')") + // @PreAuthorize("@ss.hasPermi('system:result:export')") @Log(title = "以图搜款结果", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, PictureSearchResult pictureSearchResult) { @@ -53,7 +53,7 @@ public class PictureSearchResultController extends XktBaseController { /** * 获取以图搜款结果详细信息 */ - @PreAuthorize("@ss.hasPermi('system:result:query')") + // @PreAuthorize("@ss.hasPermi('system:result:query')") @GetMapping(value = "/{picSearchResId}") public R getInfo(@PathVariable("picSearchResId") Long picSearchResId) { return success(pictureSearchResultService.selectPictureSearchResultByPicSearchResId(picSearchResId)); @@ -62,7 +62,7 @@ public class PictureSearchResultController extends XktBaseController { /** * 新增以图搜款结果 */ - @PreAuthorize("@ss.hasPermi('system:result:add')") + // @PreAuthorize("@ss.hasPermi('system:result:add')") @Log(title = "以图搜款结果", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody PictureSearchResult pictureSearchResult) { @@ -72,7 +72,7 @@ public class PictureSearchResultController extends XktBaseController { /** * 修改以图搜款结果 */ - @PreAuthorize("@ss.hasPermi('system:result:edit')") + // @PreAuthorize("@ss.hasPermi('system:result:edit')") @Log(title = "以图搜款结果", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody PictureSearchResult pictureSearchResult) { @@ -82,7 +82,7 @@ public class PictureSearchResultController extends XktBaseController { /** * 删除以图搜款结果 */ - @PreAuthorize("@ss.hasPermi('system:result:remove')") + // @PreAuthorize("@ss.hasPermi('system:result:remove')") @Log(title = "以图搜款结果", businessType = BusinessType.DELETE) @DeleteMapping("/{picSearchResIds}") public R remove(@PathVariable Long[] picSearchResIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java index af4671049..6d509527c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java @@ -39,7 +39,7 @@ public class QuickFunctionController extends XktBaseController { /** * 查看已绑定的所有快捷菜单 */ - @PreAuthorize("@ss.hasPermi('system:function:list')") + // @PreAuthorize("@ss.hasPermi('system:function:list')") @ApiOperation(value = "查看已绑定的所有快捷菜单", httpMethod = "GET", response = R.class) @GetMapping("/menus/{roleId}/{bizId}") public R getMenuList(@PathVariable("roleId") Long roleId, @PathVariable("bizId") Long bizId) { @@ -56,7 +56,7 @@ public class QuickFunctionController extends XktBaseController { /** * 修改快捷功能 */ - @PreAuthorize("@ss.hasPermi('system:function:edit')") + // @PreAuthorize("@ss.hasPermi('system:function:edit')") @ApiOperation(value = "修改快捷功能", httpMethod = "PUT", response = R.class) @Log(title = "修改快捷功能", businessType = BusinessType.UPDATE) @PutMapping("/checked") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ShoppingCartController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ShoppingCartController.java index 5a1ffd834..5631e2392 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ShoppingCartController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ShoppingCartController.java @@ -36,7 +36,7 @@ public class ShoppingCartController extends XktBaseController { /** * 电商卖家添加商品到进货车 */ -// @PreAuthorize("@ss.hasPermi('system:cart:add')") +// // @PreAuthorize("@ss.hasPermi('system:cart:add')") @ApiOperation(value = "电商卖家添加商品到进货车", httpMethod = "POST", response = R.class) @Log(title = "电商卖家添加商品到进货车", businessType = BusinessType.INSERT) @PostMapping @@ -47,7 +47,7 @@ public class ShoppingCartController extends XktBaseController { /** * 电商卖家编辑进货车商品 */ -// @PreAuthorize("@ss.hasPermi('system:store:edit')") +// // @PreAuthorize("@ss.hasPermi('system:store:edit')") @ApiOperation(value = "电商卖家编辑进货车商品", httpMethod = "PUT", response = R.class) @Log(title = "电商卖家编辑进货车商品", businessType = BusinessType.UPDATE) @PutMapping @@ -58,7 +58,7 @@ public class ShoppingCartController extends XktBaseController { /** * 获取用户进货车列表 */ -// @PreAuthorize("@ss.hasPermi('system:cart:list')") +// // @PreAuthorize("@ss.hasPermi('system:cart:list')") @ApiOperation(value = "获取用户进货车列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody ShopCartPageVO pageVO) { @@ -68,7 +68,7 @@ public class ShoppingCartController extends XktBaseController { /** * 用户进货车列表点击编辑获取数据 */ -// @PreAuthorize("@ss.hasPermi('system:cart:list')") +// // @PreAuthorize("@ss.hasPermi('system:cart:list')") @ApiOperation(value = "用户进货车列表点击编辑获取数据", httpMethod = "GET", response = R.class) @GetMapping("/edit/{shoppingCartId}") public R getEditInfo(@PathVariable Long shoppingCartId) { @@ -88,7 +88,7 @@ public class ShoppingCartController extends XktBaseController { /** * 用户删除进货车商品 */ -// @PreAuthorize("@ss.hasPermi('system:sale:remove')") +// // @PreAuthorize("@ss.hasPermi('system:sale:remove')") @ApiOperation(value = "用户进货车列表点击编辑", httpMethod = "DELETE", response = R.class) @Log(title = "用户删除进货车商品", businessType = BusinessType.DELETE) @DeleteMapping("/{shoppingCartId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java index 78abe1e92..824efd99e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java @@ -33,7 +33,7 @@ public class StoreCertificateController extends XktBaseController { /** * 新增档口认证 */ - @PreAuthorize("@ss.hasPermi('system:certificate:add')") +// // @PreAuthorize("@ss.hasPermi('system:certificate:add')") @ApiOperation(value = "新增档口认证", httpMethod = "POST", response = R.class) @Log(title = "新增档口认证", businessType = BusinessType.INSERT) @PostMapping @@ -44,7 +44,7 @@ public class StoreCertificateController extends XktBaseController { /** * 获取档口认证详细信息 */ - @PreAuthorize("@ss.hasPermi('system:certificate:query')") + // @PreAuthorize("@ss.hasPermi('system:certificate:query')") @ApiOperation(value = "获取档口认证详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeId}") public R getInfo(@PathVariable("storeId") Long storeId) { @@ -54,7 +54,7 @@ public class StoreCertificateController extends XktBaseController { /** * 修改档口认证 */ - @PreAuthorize("@ss.hasPermi('system:certificate:edit')") + // @PreAuthorize("@ss.hasPermi('system:certificate:edit')") @ApiOperation(value = "修改档口认证", httpMethod = "PUT", response = R.class) @Log(title = "修改档口认证", businessType = BusinessType.UPDATE) @PutMapping diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreColorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreColorController.java index 35319e116..b0ac1a60c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreColorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreColorController.java @@ -33,7 +33,7 @@ public class StoreColorController extends XktBaseController { /** * 查询档口颜色列表 */ - @PreAuthorize("@ss.hasPermi('system:product:list')") +// // @PreAuthorize("@ss.hasPermi('system:product:list')") @ApiOperation(value = "查询档口颜色列表", httpMethod = "GET", response = R.class) @GetMapping("/list/{storeId}") public R> list(@PathVariable Long storeId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java index 296732aa5..ad5e588bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreController.java @@ -33,7 +33,7 @@ public class StoreController extends XktBaseController { /** * 新增档口 */ -// @PreAuthorize("@ss.hasPermi('system:store:edit')") +// // @PreAuthorize("@ss.hasPermi('system:store:edit')") @Log(title = "新增档口", businessType = BusinessType.UPDATE) @PostMapping public R create(@Validated @RequestBody StoreCreateVO createVO) { @@ -43,7 +43,7 @@ public class StoreController extends XktBaseController { /** * 修改档口基本信息 */ -// @PreAuthorize("@ss.hasPermi('system:store:edit')") +// // @PreAuthorize("@ss.hasPermi('system:store:edit')") @ApiOperation(value = "修改档口基本信息", httpMethod = "PUT", response = R.class) @Log(title = "修改档口基本信息", businessType = BusinessType.UPDATE) @PutMapping @@ -54,7 +54,7 @@ public class StoreController extends XktBaseController { /** * 查询档口列表 */ -// @PreAuthorize("@ss.hasPermi('system:store:list')") +// // @PreAuthorize("@ss.hasPermi('system:store:list')") @ApiOperation(value = "查询档口列表 ", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody StorePageVO pageVO) { @@ -64,7 +64,7 @@ public class StoreController extends XktBaseController { /** * 档口启用/停用 */ -// @PreAuthorize("@ss.hasPermi('system:store:edit')") +// // @PreAuthorize("@ss.hasPermi('system:store:edit')") @ApiOperation(value = "档口启用/停用", httpMethod = "PUT", response = R.class) @Log(title = "档口启用/停用", businessType = BusinessType.UPDATE) @PutMapping("/del-flag") @@ -75,7 +75,7 @@ public class StoreController extends XktBaseController { /** * 档口审核 */ -// @PreAuthorize("@ss.hasPermi('system:store:edit')") +// // @PreAuthorize("@ss.hasPermi('system:store:edit')") @ApiOperation(value = "档口审核", httpMethod = "PUT", response = R.class) @Log(title = "档口审核", businessType = BusinessType.UPDATE) @PutMapping("/approve") @@ -86,7 +86,7 @@ public class StoreController extends XktBaseController { /** * 获取档口详细信息 */ -// @PreAuthorize("@ss.hasPermi('system:product:query')") +// // @PreAuthorize("@ss.hasPermi('system:product:query')") @ApiOperation(value = "获取档口详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeId}") public R getInfo(@PathVariable("storeId") Long storeId) { @@ -96,7 +96,7 @@ public class StoreController extends XktBaseController { /** * 档口审核是获取档口基本信息 */ -// @PreAuthorize("@ss.hasPermi('system:product:query')") +// // @PreAuthorize("@ss.hasPermi('system:product:query')") @ApiOperation(value = "档口审核是获取档口基本信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/approve/{storeId}") public R getApproveInfo(@PathVariable("storeId") Long storeId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java index 9dbccafd6..5ce8914eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java @@ -39,7 +39,7 @@ public class StoreCustomerController extends XktBaseController { /** * 模糊查询档口客户 */ - @PreAuthorize("@ss.hasPermi('system:customer:query')") +// // @PreAuthorize("@ss.hasPermi('system:customer:query')") @ApiOperation(value = "模糊查询档口客户", httpMethod = "GET", response = R.class) @GetMapping(value = "/fuzzy") public R> fuzzyQueryColorList(@RequestParam(value = "cusName", required = false) String cusName, @@ -51,7 +51,7 @@ public class StoreCustomerController extends XktBaseController { /** * 新增档口客户 */ - @PreAuthorize("@ss.hasPermi('system:customer:add')") +// // @PreAuthorize("@ss.hasPermi('system:customer:add')") @ApiOperation(value = "新增档口客户", httpMethod = "POST", response = R.class) @Log(title = "新增档口客户", businessType = BusinessType.INSERT) @PostMapping @@ -62,7 +62,7 @@ public class StoreCustomerController extends XktBaseController { /** * 修改档口客户 */ - @PreAuthorize("@ss.hasPermi('system:customer:edit')") +// // @PreAuthorize("@ss.hasPermi('system:customer:edit')") @ApiOperation(value = "修改档口客户", httpMethod = "PUT", response = R.class) @Log(title = "修改档口客户", businessType = BusinessType.UPDATE) @PutMapping @@ -73,7 +73,7 @@ public class StoreCustomerController extends XktBaseController { /** * 删除档口客户 */ - @PreAuthorize("@ss.hasPermi('system:customer:remove')") +// // @PreAuthorize("@ss.hasPermi('system:customer:remove')") @ApiOperation(value = "删除档口客户", httpMethod = "DELETE", response = R.class) @Log(title = "删除档口客户", businessType = BusinessType.DELETE) @DeleteMapping("/{storeCusId}") @@ -85,7 +85,7 @@ public class StoreCustomerController extends XktBaseController { /** * 获取档口客户详细信息 */ - @PreAuthorize("@ss.hasPermi('system:customer:query')") +// // @PreAuthorize("@ss.hasPermi('system:customer:query')") @ApiOperation(value = "获取档口客户详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeCusId}") public R getInfo(@PathVariable("storeCusId") Long storeCusId) { @@ -95,7 +95,7 @@ public class StoreCustomerController extends XktBaseController { /** * 查询档口客户列表 */ - @PreAuthorize("@ss.hasPermi('system:customer:list')") +// // @PreAuthorize("@ss.hasPermi('system:customer:list')") @ApiOperation(value = "查询档口客户列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> selectPage(@Validated @RequestBody StoreCusPageVO pageVO) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java index 0e145a0f0..0f8193975 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java @@ -38,7 +38,7 @@ public class StoreCustomerProductDiscountController extends XktBaseController { /** * 销售出库时，新增或修改档口客户优惠 */ -// @PreAuthorize("@ss.hasPermi('system:discount:edit')") +// // @PreAuthorize("@ss.hasPermi('system:discount:edit')") @ApiOperation(value = "销售出库时，新增或修改档口客户优惠", httpMethod = "PUT", response = R.class) @Log(title = "销售出库时，新增或修改档口客户优惠", businessType = BusinessType.UPDATE) @PutMapping @@ -49,7 +49,7 @@ public class StoreCustomerProductDiscountController extends XktBaseController { /** * 客户销售管理 批量减价、批量抹零减价、新增客户定价优惠 */ -// @PreAuthorize("@ss.hasPermi('system:discount:edit')") +// // @PreAuthorize("@ss.hasPermi('system:discount:edit')") @ApiOperation(value = "客户销售管理 批量减价、批量抹零减价、新增客户定价优惠", httpMethod = "PUT", response = R.class) @Log(title = "客户销售管理 批量减价、批量抹零减价、新增客户定价优惠", businessType = BusinessType.UPDATE) @PutMapping("/batch") @@ -60,7 +60,7 @@ public class StoreCustomerProductDiscountController extends XktBaseController { /** * 查询客户销售管理列表 */ -// @PreAuthorize("@ss.hasPermi('system:customer:list')") +// // @PreAuthorize("@ss.hasPermi('system:customer:list')") @ApiOperation(value = "查询客户销售管理列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> selectPage(@Validated @RequestBody StoreCusProdDiscPageVO pageVO) { @@ -70,7 +70,7 @@ public class StoreCustomerProductDiscountController extends XktBaseController { /** * 新增客户销售定价时，根据入参查询是否已存在优惠 */ -// @PreAuthorize("@ss.hasPermi('system:customer:list')") +// // @PreAuthorize("@ss.hasPermi('system:customer:list')") @ApiOperation(value = "新增客户销售定价时，根据入参查询是否已存在优惠", httpMethod = "POST", response = R.class) @PostMapping("/exists") public R> discountExist(@Validated @RequestBody StoreCusProdDiscExistVO existVO) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreFactoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreFactoryController.java index a529120b1..f5612d8ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreFactoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreFactoryController.java @@ -41,7 +41,7 @@ public class StoreFactoryController extends XktBaseController { /** * 新增档口合作工厂 */ - @PreAuthorize("@ss.hasPermi('system:factory:add')") +// // @PreAuthorize("@ss.hasPermi('system:factory:add')") @ApiOperation(value = "新增档口合作工厂", httpMethod = "POST", response = R.class) @Log(title = "新增档口合作工厂", businessType = BusinessType.INSERT) @PostMapping @@ -53,7 +53,7 @@ public class StoreFactoryController extends XktBaseController { /** * 修改档口合作工厂 */ - @PreAuthorize("@ss.hasPermi('system:factory:edit')") +// // @PreAuthorize("@ss.hasPermi('system:factory:edit')") @ApiOperation(value = "修改档口合作工厂", httpMethod = "PUT", response = R.class) @Log(title = "修改档口合作工厂", businessType = BusinessType.UPDATE) @PutMapping @@ -64,7 +64,7 @@ public class StoreFactoryController extends XktBaseController { /** * 查询档口合作工厂列表 */ - @PreAuthorize("@ss.hasPermi('system:customer:list')") +// // @PreAuthorize("@ss.hasPermi('system:customer:list')") @ApiOperation(value = "查询档口合作工厂列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> selectPage(@Validated @RequestBody StoreFactoryPageVO pageVO) { @@ -74,7 +74,7 @@ public class StoreFactoryController extends XktBaseController { /** * 获取档口合作工厂详细信息 */ - @PreAuthorize("@ss.hasPermi('system:factory:query')") +// // @PreAuthorize("@ss.hasPermi('system:factory:query')") @ApiOperation(value = "获取档口合作工厂详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeId}/{storeFactoryId}") public R getInfo(@PathVariable("storeId") Long storeId, @PathVariable("storeFactoryId") Long storeFactoryId) { @@ -85,7 +85,7 @@ public class StoreFactoryController extends XktBaseController { /** * 导出档口合作工厂列表 */ - @PreAuthorize("@ss.hasPermi('system:factory:export')") +// // @PreAuthorize("@ss.hasPermi('system:factory:export')") @Log(title = "档口合作工厂", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreFactory storeFactory) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java index b6c8ad844..1eb79ca8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java @@ -34,7 +34,7 @@ public class StoreHomepageController extends XktBaseController { /** * 新增档口装修数据 */ - @PreAuthorize("@ss.hasPermi('system:homepage:add')") +// // @PreAuthorize("@ss.hasPermi('system:homepage:add')") @ApiOperation(value = "新增档口装修数据", httpMethod = "POST", response = R.class) @Log(title = "新增档口装修数据", businessType = BusinessType.INSERT) @PostMapping("/decoration/{storeId}/{templateNum}") @@ -46,7 +46,7 @@ public class StoreHomepageController extends XktBaseController { /** * 查询档口装修数据 */ - @PreAuthorize("@ss.hasPermi('system:sale:query')") +// // @PreAuthorize("@ss.hasPermi('system:sale:query')") @ApiOperation(value = "查询档口装修数据", httpMethod = "GET", response = R.class) @GetMapping(value = "/decoration/{storeId}") public R getDecorationInfo(@PathVariable("storeId") Long storeId) { @@ -56,7 +56,7 @@ public class StoreHomepageController extends XktBaseController { /** * 修改档口装修数据 */ - @PreAuthorize("@ss.hasPermi('system:homepage:edit')") + // @PreAuthorize("@ss.hasPermi('system:homepage:edit')") @ApiOperation(value = "修改档口装修数据", httpMethod = "PUT", response = R.class) @Log(title = "修改档口装修数据", businessType = BusinessType.UPDATE) @PutMapping("/decoration/{storeId}/{templateNum}") @@ -68,7 +68,7 @@ public class StoreHomepageController extends XktBaseController { /** * 查询档口首页 */ - @PreAuthorize("@ss.hasPermi('system:sale:query')") + // @PreAuthorize("@ss.hasPermi('system:sale:query')") @ApiOperation(value = "查询档口首页", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeId}") public R getHomepageInfo(@PathVariable("storeId") Long storeId) { @@ -78,7 +78,7 @@ public class StoreHomepageController extends XktBaseController { /** * 查询档口商品详情 */ - @PreAuthorize("@ss.hasPermi('system:sale:query')") + // @PreAuthorize("@ss.hasPermi('system:sale:query')") @ApiOperation(value = "查询档口商品详情", httpMethod = "GET", response = R.class) @GetMapping(value = "/store-prod/{storeId}/{storeProdId}") public R getStoreProdInfo(@PathVariable("storeId") Long storeId, @PathVariable("storeProdId") Long storeProdId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java index 1e9b34e84..3fedcd67d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java @@ -35,7 +35,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController { /** * 修改档口条形码和第三方系统条形码匹配结果 */ - @PreAuthorize("@ss.hasPermi('system:match:edit')") + // @PreAuthorize("@ss.hasPermi('system:match:edit')") @Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.UPDATE) @PutMapping public R updateBarcodeMatch(@Validated @RequestBody BarcodeMatchVO barcodeMatchVO) { @@ -46,7 +46,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController { /** * 查询档口条形码和第三方系统条形码匹配结果列表 */ - @PreAuthorize("@ss.hasPermi('system:match:list')") + // @PreAuthorize("@ss.hasPermi('system:match:list')") @GetMapping("/list") public TableDataInfo list(StoreProductBarcodeMatch storeProductBarcodeMatch) { startPage(); @@ -57,7 +57,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController { /** * 导出档口条形码和第三方系统条形码匹配结果列表 */ - @PreAuthorize("@ss.hasPermi('system:match:export')") + // @PreAuthorize("@ss.hasPermi('system:match:export')") @Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductBarcodeMatch storeProductBarcodeMatch) { @@ -69,7 +69,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController { /** * 获取档口条形码和第三方系统条形码匹配结果详细信息 */ - @PreAuthorize("@ss.hasPermi('system:match:query')") + // @PreAuthorize("@ss.hasPermi('system:match:query')") @GetMapping(value = "/{storeProdBarcodeMatchId}") public R getInfo(@PathVariable("storeProdBarcodeMatchId") Long storeProdBarcodeMatchId) { return success(barcodeMatchService.selectStoreProductBarcodeMatchByStoreProdBarcodeMatchId(storeProdBarcodeMatchId)); @@ -78,7 +78,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController { /** * 新增档口条形码和第三方系统条形码匹配结果 */ - @PreAuthorize("@ss.hasPermi('system:match:add')") + // @PreAuthorize("@ss.hasPermi('system:match:add')") @Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) { @@ -88,7 +88,7 @@ public class StoreProductBarcodeMatchController extends XktBaseController { /** * 删除档口条形码和第三方系统条形码匹配结果 */ - @PreAuthorize("@ss.hasPermi('system:match:remove')") + // @PreAuthorize("@ss.hasPermi('system:match:remove')") @Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdBarcodeMatchIds}") public R remove(@PathVariable Long[] storeProdBarcodeMatchIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java index 91743f423..1c33fa6b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java @@ -34,7 +34,7 @@ public class StoreProductBarcodeRecordController extends XktBaseController { /** * 查询档口打印条形码记录列表 */ - @PreAuthorize("@ss.hasPermi('system:record:list')") + // @PreAuthorize("@ss.hasPermi('system:record:list')") @GetMapping("/list") public TableDataInfo list(StoreProductBarcodeRecord storeProductBarcodeRecord) { startPage(); @@ -45,7 +45,7 @@ public class StoreProductBarcodeRecordController extends XktBaseController { /** * 导出档口打印条形码记录列表 */ - @PreAuthorize("@ss.hasPermi('system:record:export')") + // @PreAuthorize("@ss.hasPermi('system:record:export')") @Log(title = "档口打印条形码记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductBarcodeRecord storeProductBarcodeRecord) { @@ -57,7 +57,7 @@ public class StoreProductBarcodeRecordController extends XktBaseController { /** * 获取档口打印条形码记录详细信息 */ - @PreAuthorize("@ss.hasPermi('system:record:query')") + // @PreAuthorize("@ss.hasPermi('system:record:query')") @GetMapping(value = "/{storeProdBarcodeRecordId}") public R getInfo(@PathVariable("storeProdBarcodeRecordId") Long storeProdBarcodeRecordId) { return success(storeProductBarcodeRecordService.selectStoreProductBarcodeRecordByStoreProdBarcodeRecordId(storeProdBarcodeRecordId)); @@ -66,7 +66,7 @@ public class StoreProductBarcodeRecordController extends XktBaseController { /** * 新增档口打印条形码记录 */ - @PreAuthorize("@ss.hasPermi('system:record:add')") + // @PreAuthorize("@ss.hasPermi('system:record:add')") @Log(title = "档口打印条形码记录", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductBarcodeRecord storeProductBarcodeRecord) { @@ -76,7 +76,7 @@ public class StoreProductBarcodeRecordController extends XktBaseController { /** * 修改档口打印条形码记录 */ - @PreAuthorize("@ss.hasPermi('system:record:edit')") + // @PreAuthorize("@ss.hasPermi('system:record:edit')") @Log(title = "档口打印条形码记录", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductBarcodeRecord storeProductBarcodeRecord) { @@ -86,7 +86,7 @@ public class StoreProductBarcodeRecordController extends XktBaseController { /** * 删除档口打印条形码记录 */ - @PreAuthorize("@ss.hasPermi('system:record:remove')") + // @PreAuthorize("@ss.hasPermi('system:record:remove')") @Log(title = "档口打印条形码记录", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdBarcodeRecordIds}") public R remove(@PathVariable Long[] storeProdBarcodeRecordIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductCategoryAttributeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductCategoryAttributeController.java index 87c22c938..66c30be4b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductCategoryAttributeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductCategoryAttributeController.java @@ -30,7 +30,7 @@ public class StoreProductCategoryAttributeController extends XktBaseController { /** * 查询档口商品类目信息列表 */ - @PreAuthorize("@ss.hasPermi('system:attribute:list')") + // @PreAuthorize("@ss.hasPermi('system:attribute:list')") @GetMapping("/list") public TableDataInfo list(StoreProductCategoryAttribute storeProductCategoryAttribute) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductCategoryAttributeController extends XktBaseController { /** * 导出档口商品类目信息列表 */ - @PreAuthorize("@ss.hasPermi('system:attribute:export')") + // @PreAuthorize("@ss.hasPermi('system:attribute:export')") @Log(title = "档口商品类目信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductCategoryAttribute storeProductCategoryAttribute) { @@ -53,7 +53,7 @@ public class StoreProductCategoryAttributeController extends XktBaseController { /** * 获取档口商品类目信息详细信息 */ - @PreAuthorize("@ss.hasPermi('system:attribute:query')") + // @PreAuthorize("@ss.hasPermi('system:attribute:query')") @GetMapping(value = "/{storeProdAttrId}") public R getInfo(@PathVariable("storeProdAttrId") Long storeProdAttrId) { return success(storeProductCategoryAttributeService.selectStoreProductCategoryAttributeByStoreProdAttrId(storeProdAttrId)); @@ -62,7 +62,7 @@ public class StoreProductCategoryAttributeController extends XktBaseController { /** * 新增档口商品类目信息 */ - @PreAuthorize("@ss.hasPermi('system:attribute:add')") + // @PreAuthorize("@ss.hasPermi('system:attribute:add')") @Log(title = "档口商品类目信息", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductCategoryAttribute storeProductCategoryAttribute) { @@ -72,7 +72,7 @@ public class StoreProductCategoryAttributeController extends XktBaseController { /** * 修改档口商品类目信息 */ - @PreAuthorize("@ss.hasPermi('system:attribute:edit')") + // @PreAuthorize("@ss.hasPermi('system:attribute:edit')") @Log(title = "档口商品类目信息", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductCategoryAttribute storeProductCategoryAttribute) { @@ -82,7 +82,7 @@ public class StoreProductCategoryAttributeController extends XktBaseController { /** * 删除档口商品类目信息 */ - @PreAuthorize("@ss.hasPermi('system:attribute:remove')") + // @PreAuthorize("@ss.hasPermi('system:attribute:remove')") @Log(title = "档口商品类目信息", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdAttrIds}") public R remove(@PathVariable Long[] storeProdAttrIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java index cef09fe78..403aa68a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java @@ -33,7 +33,7 @@ public class StoreProductColorController extends XktBaseController { /** * 模糊查询档口所有的商品颜色分类 */ - @PreAuthorize("@ss.hasPermi('system:color:query')") + // @PreAuthorize("@ss.hasPermi('system:color:query')") @ApiOperation(value = "模糊查询档口所有的商品颜色分类", httpMethod = "GET", response = R.class) @GetMapping(value = "/fuzzy") public R> fuzzyQueryColorList(@RequestParam(value = "prodArtNum", required = false) String prodArtNum, diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorSizeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorSizeController.java index 32a3ca153..7fd23e23b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorSizeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorSizeController.java @@ -30,7 +30,7 @@ public class StoreProductColorSizeController extends XktBaseController { /** * 查询档口商品颜色的尺码列表 */ - @PreAuthorize("@ss.hasPermi('system:size:list')") + // @PreAuthorize("@ss.hasPermi('system:size:list')") @GetMapping("/list") public TableDataInfo list(StoreProductColorSize storeProductColorSize) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductColorSizeController extends XktBaseController { /** * 导出档口商品颜色的尺码列表 */ - @PreAuthorize("@ss.hasPermi('system:size:export')") + // @PreAuthorize("@ss.hasPermi('system:size:export')") @Log(title = "档口商品颜色的尺码", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductColorSize storeProductColorSize) { @@ -53,7 +53,7 @@ public class StoreProductColorSizeController extends XktBaseController { /** * 获取档口商品颜色的尺码详细信息 */ - @PreAuthorize("@ss.hasPermi('system:size:query')") + // @PreAuthorize("@ss.hasPermi('system:size:query')") @GetMapping(value = "/{storeProdColorSizeId}") public R getInfo(@PathVariable("storeProdColorSizeId") Long storeProdColorSizeId) { return success(storeProductColorSizeService.selectStoreProductColorSizeByStoreProdColorSizeId(storeProdColorSizeId)); @@ -62,7 +62,7 @@ public class StoreProductColorSizeController extends XktBaseController { /** * 新增档口商品颜色的尺码 */ - @PreAuthorize("@ss.hasPermi('system:size:add')") + // @PreAuthorize("@ss.hasPermi('system:size:add')") @Log(title = "档口商品颜色的尺码", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductColorSize storeProductColorSize) { @@ -72,7 +72,7 @@ public class StoreProductColorSizeController extends XktBaseController { /** * 修改档口商品颜色的尺码 */ - @PreAuthorize("@ss.hasPermi('system:size:edit')") + // @PreAuthorize("@ss.hasPermi('system:size:edit')") @Log(title = "档口商品颜色的尺码", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductColorSize storeProductColorSize) { @@ -82,7 +82,7 @@ public class StoreProductColorSizeController extends XktBaseController { /** * 删除档口商品颜色的尺码 */ - @PreAuthorize("@ss.hasPermi('system:size:remove')") + // @PreAuthorize("@ss.hasPermi('system:size:remove')") @Log(title = "档口商品颜色的尺码", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdColorSizeIds}") public R remove(@PathVariable Long[] storeProdColorSizeIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java index e56477170..bcc57e6e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java @@ -51,7 +51,7 @@ public class StoreProductController extends XktBaseController { /** * 模糊查询档口商品 */ -// @PreAuthorize("@ss.hasPermi('system:product:query')") +// // @PreAuthorize("@ss.hasPermi('system:product:query')") @ApiOperation(value = "模糊查询档口商品", httpMethod = "GET", response = R.class) @GetMapping(value = "/fuzzy") public R> fuzzyQueryColorList(@RequestParam(value = "prodArtNum", required = false) String prodArtNum, @@ -62,7 +62,7 @@ public class StoreProductController extends XktBaseController { /** * 模糊查询档口商品 */ -// @PreAuthorize("@ss.hasPermi('system:product:query')") +// // @PreAuthorize("@ss.hasPermi('system:product:query')") @ApiOperation(value = "模糊查询档口商品", httpMethod = "GET", response = R.class) @GetMapping(value = "/fuzzy/pic") public R> fuzzyQueryResPicList(@RequestParam(value = "prodArtNum", required = false) String prodArtNum, @@ -74,7 +74,7 @@ public class StoreProductController extends XktBaseController { /** * 查询档口商品列表 */ -// @PreAuthorize("@ss.hasPermi('system:product:list')") +// // @PreAuthorize("@ss.hasPermi('system:product:list')") @ApiOperation(value = "查询档口商品列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody StoreProdPageVO pageVO) { @@ -84,7 +84,7 @@ public class StoreProductController extends XktBaseController { /** * 获取档口商品详细信息 */ -// @PreAuthorize("@ss.hasPermi('system:product:query')") +// // @PreAuthorize("@ss.hasPermi('system:product:query')") @ApiOperation(value = "获取档口商品详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/detail/{storeProdId}") public R getInfo(@PathVariable("storeProdId") Long storeProdId) { @@ -116,14 +116,14 @@ public class StoreProductController extends XktBaseController { @Log(title = "档口商品", businessType = BusinessType.INSERT) @ApiOperation(value = "新增档口商品", httpMethod = "POST", response = R.class) @PostMapping - public R add(@Validated @RequestBody StoreProdVO storeProdVO) throws IOException { + public R create(@Validated @RequestBody StoreProdVO storeProdVO) throws IOException { return R.ok(storeProdService.insertStoreProduct(BeanUtil.toBean(storeProdVO, StoreProdDTO.class))); } /** * 修改档口商品 */ -// @PreAuthorize("@ss.hasPermi('system:product:edit')") +// // @PreAuthorize("@ss.hasPermi('system:product:edit')") @ApiOperation(value = "修改档口商品", httpMethod = "PUT", response = R.class) @Log(title = "档口商品", businessType = BusinessType.UPDATE) @PutMapping("/{storeProdId}") @@ -134,7 +134,7 @@ public class StoreProductController extends XktBaseController { /** * 修改档口商品状态 */ -// @PreAuthorize("@ss.hasPermi('system:product:edit')") +// // @PreAuthorize("@ss.hasPermi('system:product:edit')") @Log(title = "修改档口商品状态", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改档口商品状态", httpMethod = "PUT", response = R.class) @PutMapping("/prod-status") @@ -146,7 +146,7 @@ public class StoreProductController extends XktBaseController { /** * 获取档口图片空间 */ -// @PreAuthorize("@ss.hasPermi('system:product:query')") +// // @PreAuthorize("@ss.hasPermi('system:product:query')") @ApiOperation(value = "获取档口图片空间", httpMethod = "GET", response = R.class) @GetMapping(value = "/pic-space/{storeId}") public R getStoreProductPicSpace(@PathVariable("storeId") Long storeId) { @@ -157,7 +157,7 @@ public class StoreProductController extends XktBaseController { /** * 导出档口商品列表 */ -// @PreAuthorize("@ss.hasPermi('system:product:export')") +// // @PreAuthorize("@ss.hasPermi('system:product:export')") @Log(title = "档口商品", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProduct storeProduct) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandController.java index 94736ecb3..82394bfdc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandController.java @@ -35,7 +35,7 @@ public class StoreProductDemandController extends XktBaseController { /** * 商品入库校验是否存在需求单 */ - @PreAuthorize("@ss.hasPermi('system:demand:query')") + // @PreAuthorize("@ss.hasPermi('system:demand:query')") @ApiOperation(value = "商品入库校验是否存在需求单", httpMethod = "POST", response = R.class) @Log(title = "商品入库校验是否存在需求单", businessType = BusinessType.INSERT) @PostMapping("/verify") @@ -48,7 +48,7 @@ public class StoreProductDemandController extends XktBaseController { * 根据货号获取所有颜色的库存数量、在产数量 */ @ApiOperation(value = "根据货号获取所有颜色的库存数量、在产数量", httpMethod = "GET", response = R.class) - @PreAuthorize("@ss.hasPermi('system:demand:query')") + // @PreAuthorize("@ss.hasPermi('system:demand:query')") @GetMapping(value = "/exists-quantity/{storeId}/{storeProdId}") public R> getStockAndProduceQuantity(@PathVariable("storeId") Long storeId, @PathVariable("storeProdId") Long storeProdId) { return R.ok(BeanUtil.copyToList(storeProdDemandService.getStockAndProduceQuantity(storeId, storeProdId), StoreProdDemandQuantityVO.class)); @@ -57,7 +57,7 @@ public class StoreProductDemandController extends XktBaseController { /** * 新增档口商品需求单 */ - @PreAuthorize("@ss.hasPermi('system:demand:add')") + // @PreAuthorize("@ss.hasPermi('system:demand:add')") @ApiOperation(value = "新增档口商品需求单", httpMethod = "POST", response = R.class) @Log(title = "新增档口商品需求单", businessType = BusinessType.INSERT) @PostMapping("") @@ -68,7 +68,7 @@ public class StoreProductDemandController extends XktBaseController { /** * 查询档口商品需求单列表 */ - @PreAuthorize("@ss.hasPermi('system:customer:list')") + // @PreAuthorize("@ss.hasPermi('system:customer:list')") @ApiOperation(value = "查询档口商品需求单列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> selectPage(@Validated @RequestBody StoreProdDemandPageVO pageVO) { @@ -78,7 +78,7 @@ public class StoreProductDemandController extends XktBaseController { /** * 点击安排生产 */ - @PreAuthorize("@ss.hasPermi('system:demand:edit')") + // @PreAuthorize("@ss.hasPermi('system:demand:edit')") @ApiOperation(value = "点击安排生产", httpMethod = "PUT", response = R.class) @Log(title = "点击安排生产", businessType = BusinessType.UPDATE) @PutMapping @@ -94,7 +94,7 @@ public class StoreProductDemandController extends XktBaseController { /** * 删除档口商品需求单 */ - @PreAuthorize("@ss.hasPermi('system:demand:remove')") + // @PreAuthorize("@ss.hasPermi('system:demand:remove')") @ApiOperation(value = "删除档口商品需求单", httpMethod = "DELETE", response = R.class) @Log(title = "删除档口商品需求单", businessType = BusinessType.DELETE) @DeleteMapping("") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandDetailController.java index 5d064bfb5..c01306578 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDemandDetailController.java @@ -30,7 +30,7 @@ public class StoreProductDemandDetailController extends XktBaseController { /** * 查询档口商品需求单明细列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:list')") + // @PreAuthorize("@ss.hasPermi('system:detail:list')") @GetMapping("/list") public TableDataInfo list(StoreProductDemandDetail storeProductDemandDetail) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductDemandDetailController extends XktBaseController { /** * 导出档口商品需求单明细列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:export')") + // @PreAuthorize("@ss.hasPermi('system:detail:export')") @Log(title = "档口商品需求单明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductDemandDetail storeProductDemandDetail) { @@ -53,7 +53,7 @@ public class StoreProductDemandDetailController extends XktBaseController { /** * 获取档口商品需求单明细详细信息 */ - @PreAuthorize("@ss.hasPermi('system:detail:query')") + // @PreAuthorize("@ss.hasPermi('system:detail:query')") @GetMapping(value = "/{storeProdDemaDetailId}") public R getInfo(@PathVariable("storeProdDemaDetailId") Long storeProdDemaDetailId) { return success(storeProductDemandDetailService.selectStoreProductDemandDetailByStoreProdDemaDetailId(storeProdDemaDetailId)); @@ -62,7 +62,7 @@ public class StoreProductDemandDetailController extends XktBaseController { /** * 新增档口商品需求单明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:add')") + // @PreAuthorize("@ss.hasPermi('system:detail:add')") @Log(title = "档口商品需求单明细", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductDemandDetail storeProductDemandDetail) { @@ -72,7 +72,7 @@ public class StoreProductDemandDetailController extends XktBaseController { /** * 修改档口商品需求单明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:edit')") + // @PreAuthorize("@ss.hasPermi('system:detail:edit')") @Log(title = "档口商品需求单明细", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductDemandDetail storeProductDemandDetail) { @@ -82,7 +82,7 @@ public class StoreProductDemandDetailController extends XktBaseController { /** * 删除档口商品需求单明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:remove')") + // @PreAuthorize("@ss.hasPermi('system:detail:remove')") @Log(title = "档口商品需求单明细", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdDemaDetailIds}") public R remove(@PathVariable Long[] storeProdDemaDetailIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDetailController.java index d383bb6df..d73ca39fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductDetailController.java @@ -30,7 +30,7 @@ public class StoreProductDetailController extends XktBaseController { /** * 查询档口商品详情内容列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:list')") + // @PreAuthorize("@ss.hasPermi('system:detail:list')") @GetMapping("/list") public TableDataInfo list(StoreProductDetail storeProductDetail) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductDetailController extends XktBaseController { /** * 导出档口商品详情内容列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:export')") + // @PreAuthorize("@ss.hasPermi('system:detail:export')") @Log(title = "档口商品详情内容", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductDetail storeProductDetail) { @@ -53,7 +53,7 @@ public class StoreProductDetailController extends XktBaseController { /** * 获取档口商品详情内容详细信息 */ - @PreAuthorize("@ss.hasPermi('system:detail:query')") + // @PreAuthorize("@ss.hasPermi('system:detail:query')") @GetMapping(value = "/{storeProdDetailId}") public R getInfo(@PathVariable("storeProdDetailId") Long storeProdDetailId) { return success(storeProductDetailService.selectStoreProductDetailByStoreProdDetailId(storeProdDetailId)); @@ -62,7 +62,7 @@ public class StoreProductDetailController extends XktBaseController { /** * 新增档口商品详情内容 */ - @PreAuthorize("@ss.hasPermi('system:detail:add')") + // @PreAuthorize("@ss.hasPermi('system:detail:add')") @Log(title = "档口商品详情内容", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductDetail storeProductDetail) { @@ -72,7 +72,7 @@ public class StoreProductDetailController extends XktBaseController { /** * 修改档口商品详情内容 */ - @PreAuthorize("@ss.hasPermi('system:detail:edit')") + // @PreAuthorize("@ss.hasPermi('system:detail:edit')") @Log(title = "档口商品详情内容", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductDetail storeProductDetail) { @@ -82,7 +82,7 @@ public class StoreProductDetailController extends XktBaseController { /** * 删除档口商品详情内容 */ - @PreAuthorize("@ss.hasPermi('system:detail:remove')") + // @PreAuthorize("@ss.hasPermi('system:detail:remove')") @Log(title = "档口商品详情内容", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdDetailIds}") public R remove(@PathVariable Long[] storeProdDetailIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductFileController.java index 53cba7095..956e17b0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductFileController.java @@ -30,7 +30,7 @@ public class StoreProductFileController extends XktBaseController { /** * 查询档口商品文件列表 */ - @PreAuthorize("@ss.hasPermi('system:file:list')") + // @PreAuthorize("@ss.hasPermi('system:file:list')") @GetMapping("/list") public TableDataInfo list(StoreProductFile storeProductFile) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductFileController extends XktBaseController { /** * 导出档口商品文件列表 */ - @PreAuthorize("@ss.hasPermi('system:file:export')") + // @PreAuthorize("@ss.hasPermi('system:file:export')") @Log(title = "档口商品文件", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductFile storeProductFile) { @@ -53,7 +53,7 @@ public class StoreProductFileController extends XktBaseController { /** * 获取档口商品文件详细信息 */ - @PreAuthorize("@ss.hasPermi('system:file:query')") + // @PreAuthorize("@ss.hasPermi('system:file:query')") @GetMapping(value = "/{storeProdFileId}") public R getInfo(@PathVariable("storeProdFileId") Long storeProdFileId) { return success(storeProductFileService.selectStoreProductFileByStoreProdFileId(storeProdFileId)); @@ -62,7 +62,7 @@ public class StoreProductFileController extends XktBaseController { /** * 新增档口商品文件 */ - @PreAuthorize("@ss.hasPermi('system:file:add')") + // @PreAuthorize("@ss.hasPermi('system:file:add')") @Log(title = "档口商品文件", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductFile storeProductFile) { @@ -72,7 +72,7 @@ public class StoreProductFileController extends XktBaseController { /** * 修改档口商品文件 */ - @PreAuthorize("@ss.hasPermi('system:file:edit')") + // @PreAuthorize("@ss.hasPermi('system:file:edit')") @Log(title = "档口商品文件", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductFile storeProductFile) { @@ -82,7 +82,7 @@ public class StoreProductFileController extends XktBaseController { /** * 删除档口商品文件 */ - @PreAuthorize("@ss.hasPermi('system:file:remove')") + // @PreAuthorize("@ss.hasPermi('system:file:remove')") @Log(title = "档口商品文件", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdFileIds}") public R remove(@PathVariable Long[] storeProdFileIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductProcessController.java index c15a16fc9..fdc0752f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductProcessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductProcessController.java @@ -30,7 +30,7 @@ public class StoreProductProcessController extends XktBaseController { /** * 查询档口商品工艺信息列表 */ - @PreAuthorize("@ss.hasPermi('system:process:list')") + // @PreAuthorize("@ss.hasPermi('system:process:list')") @GetMapping("/list") public TableDataInfo list(StoreProductProcess storeProductProcess) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductProcessController extends XktBaseController { /** * 导出档口商品工艺信息列表 */ - @PreAuthorize("@ss.hasPermi('system:process:export')") + // @PreAuthorize("@ss.hasPermi('system:process:export')") @Log(title = "档口商品工艺信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductProcess storeProductProcess) { @@ -53,7 +53,7 @@ public class StoreProductProcessController extends XktBaseController { /** * 获取档口商品工艺信息详细信息 */ - @PreAuthorize("@ss.hasPermi('system:process:query')") + // @PreAuthorize("@ss.hasPermi('system:process:query')") @GetMapping(value = "/{storeProdProcessId}") public R getInfo(@PathVariable("storeProdProcessId") Long storeProdProcessId) { return success(storeProductProcessService.selectStoreProductProcessByStoreProdProcessId(storeProdProcessId)); @@ -62,7 +62,7 @@ public class StoreProductProcessController extends XktBaseController { /** * 新增档口商品工艺信息 */ - @PreAuthorize("@ss.hasPermi('system:process:add')") + // @PreAuthorize("@ss.hasPermi('system:process:add')") @Log(title = "档口商品工艺信息", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductProcess storeProductProcess) { @@ -72,7 +72,7 @@ public class StoreProductProcessController extends XktBaseController { /** * 修改档口商品工艺信息 */ - @PreAuthorize("@ss.hasPermi('system:process:edit')") + // @PreAuthorize("@ss.hasPermi('system:process:edit')") @Log(title = "档口商品工艺信息", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductProcess storeProductProcess) { @@ -82,7 +82,7 @@ public class StoreProductProcessController extends XktBaseController { /** * 删除档口商品工艺信息 */ - @PreAuthorize("@ss.hasPermi('system:process:remove')") + // @PreAuthorize("@ss.hasPermi('system:process:remove')") @Log(title = "档口商品工艺信息", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdProcessIds}") public R remove(@PathVariable Long[] storeProdProcessIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductServiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductServiceController.java index 0f6474b9a..ed3a98a5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductServiceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductServiceController.java @@ -30,7 +30,7 @@ public class StoreProductServiceController extends XktBaseController { /** * 查询档口商品服务列表 */ - @PreAuthorize("@ss.hasPermi('system:service:list')") + // @PreAuthorize("@ss.hasPermi('system:service:list')") @GetMapping("/list") public TableDataInfo list(StoreProductService storeProductService) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductServiceController extends XktBaseController { /** * 导出档口商品服务列表 */ - @PreAuthorize("@ss.hasPermi('system:service:export')") + // @PreAuthorize("@ss.hasPermi('system:service:export')") @Log(title = "档口商品服务", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductService storeProductService) { @@ -53,7 +53,7 @@ public class StoreProductServiceController extends XktBaseController { /** * 获取档口商品服务详细信息 */ - @PreAuthorize("@ss.hasPermi('system:service:query')") + // @PreAuthorize("@ss.hasPermi('system:service:query')") @GetMapping(value = "/{storeProdSvcId}") public R getInfo(@PathVariable("storeProdSvcId") Long storeProdSvcId) { return success(storeProductServiceService.selectStoreProductServiceByStoreProdSvcId(storeProdSvcId)); @@ -62,7 +62,7 @@ public class StoreProductServiceController extends XktBaseController { /** * 新增档口商品服务 */ - @PreAuthorize("@ss.hasPermi('system:service:add')") + // @PreAuthorize("@ss.hasPermi('system:service:add')") @Log(title = "档口商品服务", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductService storeProductService) { @@ -72,7 +72,7 @@ public class StoreProductServiceController extends XktBaseController { /** * 修改档口商品服务 */ - @PreAuthorize("@ss.hasPermi('system:service:edit')") + // @PreAuthorize("@ss.hasPermi('system:service:edit')") @Log(title = "档口商品服务", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductService storeProductService) { @@ -82,7 +82,7 @@ public class StoreProductServiceController extends XktBaseController { /** * 删除档口商品服务 */ - @PreAuthorize("@ss.hasPermi('system:service:remove')") + // @PreAuthorize("@ss.hasPermi('system:service:remove')") @Log(title = "档口商品服务", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdSvcIds}") public R remove(@PathVariable Long[] storeProdSvcIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java index df08cf8dc..2899849f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java @@ -49,7 +49,7 @@ public class StoreProductStockController extends XktBaseController { /** * 查询档口库存列表 */ - @PreAuthorize("@ss.hasPermi('system:stock:list')") + // @PreAuthorize("@ss.hasPermi('system:stock:list')") @ApiOperation(value = "查询档口库存列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> selectPage(@Validated @RequestBody StoreProdStockPageVO pageVO) { @@ -60,7 +60,7 @@ public class StoreProductStockController extends XktBaseController { /** * 档口商品库存清零 */ - @PreAuthorize("@ss.hasPermi('system:stock:edit')") + // @PreAuthorize("@ss.hasPermi('system:stock:edit')") @ApiOperation(value = "档口商品库存清零", httpMethod = "PUT", response = R.class) @Log(title = "档口商品库存清零", businessType = BusinessType.UPDATE) @PutMapping("/clear-zero/{storeId}/{storeProdStockId}") @@ -71,7 +71,7 @@ public class StoreProductStockController extends XktBaseController { /** * 直接调整档口商品库存值 */ - @PreAuthorize("@ss.hasPermi('system:stock:edit')") + // @PreAuthorize("@ss.hasPermi('system:stock:edit')") @ApiOperation(value = "直接调整档口商品库存值", httpMethod = "PUT", response = R.class) @Log(title = "直接调整档口商品库存值", businessType = BusinessType.UPDATE) @PutMapping("/update-stock/{storeId}") @@ -82,7 +82,7 @@ public class StoreProductStockController extends XktBaseController { /** * 查询档口商品库存详情 */ - @PreAuthorize("@ss.hasPermi('system:stock:query')") + // @PreAuthorize("@ss.hasPermi('system:stock:query')") @ApiOperation(value = "查询档口商品库存详情", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeId}/{storeProdStockId}") public R getInfo(@PathVariable("storeId") Long storeId, @PathVariable("storeProdStockId") Long storeProdStockId) { @@ -92,7 +92,7 @@ public class StoreProductStockController extends XktBaseController { /** * 根据货号查询档口商品库存 */ - @PreAuthorize("@ss.hasPermi('system:stock:query')") + // @PreAuthorize("@ss.hasPermi('system:stock:query')") @ApiOperation(value = "根据货号查询档口商品库存", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeId}/prod-art-num/{prodArtNum}") public R> getInfo(@PathVariable("storeId") Long storeId, @PathVariable("prodArtNum") String prodArtNum) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java index d8bef0332..01e79d598 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java @@ -37,7 +37,7 @@ public class StoreProductStorageController extends XktBaseController { /** * 新增档口商品入库 */ - @PreAuthorize("@ss.hasPermi('system:storage:add')") + // @PreAuthorize("@ss.hasPermi('system:storage:add')") @ApiOperation(value = "新增档口商品入库", httpMethod = "POST", response = R.class) @Log(title = "新增档口商品入库", businessType = BusinessType.INSERT) @PostMapping @@ -48,7 +48,7 @@ public class StoreProductStorageController extends XktBaseController { /** * 查询档口商品入库列表 */ - @PreAuthorize("@ss.hasPermi('system:product:list')") + // @PreAuthorize("@ss.hasPermi('system:product:list')") @ApiOperation(value = "查询档口商品入库列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody StoreProdStoragePageVO pageVO) { @@ -58,7 +58,7 @@ public class StoreProductStorageController extends XktBaseController { /** * 获取档口商品入库详细信息 */ - @PreAuthorize("@ss.hasPermi('system:storage:query')") + // @PreAuthorize("@ss.hasPermi('system:storage:query')") @ApiOperation(value = "获取档口商品入库详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeProdStorageId}") public R getInfo(@PathVariable("storeProdStorageId") Long storeProdStorageId) { @@ -68,7 +68,7 @@ public class StoreProductStorageController extends XktBaseController { /** * 撤销档口商品入库 */ - @PreAuthorize("@ss.hasPermi('system:storage:remove')") + // @PreAuthorize("@ss.hasPermi('system:storage:remove')") @ApiOperation(value = "撤销档口商品入库", httpMethod = "DELETE", response = R.class) @Log(title = "撤销档口商品入库", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdStorageId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java index 10daddd92..b67dbd9d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java @@ -30,7 +30,7 @@ public class StoreProductStorageDetailController extends XktBaseController { /** * 查询档口商品入库明细列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:list')") + // @PreAuthorize("@ss.hasPermi('system:detail:list')") @GetMapping("/list") public TableDataInfo list(StoreProductStorageDetail storeProductStorageDetail) { startPage(); @@ -41,7 +41,7 @@ public class StoreProductStorageDetailController extends XktBaseController { /** * 导出档口商品入库明细列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:export')") + // @PreAuthorize("@ss.hasPermi('system:detail:export')") @Log(title = "档口商品入库明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreProductStorageDetail storeProductStorageDetail) { @@ -53,7 +53,7 @@ public class StoreProductStorageDetailController extends XktBaseController { /** * 获取档口商品入库明细详细信息 */ - @PreAuthorize("@ss.hasPermi('system:detail:query')") + // @PreAuthorize("@ss.hasPermi('system:detail:query')") @GetMapping(value = "/{storeProdStorDetailId}") public R getInfo(@PathVariable("storeProdStorDetailId") Long storeProdStorDetailId) { return success(storeProductStorageDetailService.selectStoreProductStorageDetailByStoreProdStorDetailId(storeProdStorDetailId)); @@ -62,7 +62,7 @@ public class StoreProductStorageDetailController extends XktBaseController { /** * 新增档口商品入库明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:add')") + // @PreAuthorize("@ss.hasPermi('system:detail:add')") @Log(title = "档口商品入库明细", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreProductStorageDetail storeProductStorageDetail) { @@ -72,7 +72,7 @@ public class StoreProductStorageDetailController extends XktBaseController { /** * 修改档口商品入库明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:edit')") + // @PreAuthorize("@ss.hasPermi('system:detail:edit')") @Log(title = "档口商品入库明细", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreProductStorageDetail storeProductStorageDetail) { @@ -82,7 +82,7 @@ public class StoreProductStorageDetailController extends XktBaseController { /** * 删除档口商品入库明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:remove')") + // @PreAuthorize("@ss.hasPermi('system:detail:remove')") @Log(title = "档口商品入库明细", businessType = BusinessType.DELETE) @DeleteMapping("/{storeProdStorDetailIds}") public R remove(@PathVariable Long[] storeProdStorDetailIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java index 2ef5eeef2..6a4eb45e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java @@ -37,7 +37,7 @@ public class StoreRoleAccountController extends XktBaseController { /** * 新增档口子账号 */ - @PreAuthorize("@ss.hasPermi('system:account:add')") + // @PreAuthorize("@ss.hasPermi('system:account:add')") @ApiOperation(value = "新增档口子账号", httpMethod = "POST", response = R.class) @Log(title = "新增档口子账号", businessType = BusinessType.INSERT) @PostMapping @@ -48,7 +48,7 @@ public class StoreRoleAccountController extends XktBaseController { /** * 修改档口子账号 */ - @PreAuthorize("@ss.hasPermi('system:account:edit')") + // @PreAuthorize("@ss.hasPermi('system:account:edit')") @ApiOperation(value = "修改档口子账号", httpMethod = "PUT", response = R.class) @Log(title = "修改档口子账号", businessType = BusinessType.UPDATE) @PutMapping @@ -59,7 +59,7 @@ public class StoreRoleAccountController extends XktBaseController { /** * 获取档口子账号列表 */ - @PreAuthorize("@ss.hasPermi('system:role:list')") + // @PreAuthorize("@ss.hasPermi('system:role:list')") @ApiOperation(value = "获取档口子账号列表", httpMethod = "POST", response = R.class) @PostMapping("/list") public R> list(@Validated @RequestBody StoreRoleAccListVO accListVO) { @@ -69,7 +69,7 @@ public class StoreRoleAccountController extends XktBaseController { /** * 获取档口子账号详情 */ - @PreAuthorize("@ss.hasPermi('system:account:query')") + // @PreAuthorize("@ss.hasPermi('system:account:query')") @ApiOperation(value = "获取档口子账号详情", httpMethod = "POST", response = R.class) @GetMapping(value = "/{storeRoleAccId}") public R getInfo(@PathVariable("storeRoleAccId") Long storeRoleAccId) { @@ -79,7 +79,7 @@ public class StoreRoleAccountController extends XktBaseController { /** * 停用/启用档口子账号 */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") + // @PreAuthorize("@ss.hasPermi('system:role:edit')") @ApiOperation(value = "停用/启用档口子账号", httpMethod = "PUT", response = R.class) @Log(title = "停用/启用档口子账号", businessType = BusinessType.UPDATE) @PutMapping("/status") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java index 218ce509e..4d4d6d12a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java @@ -44,7 +44,7 @@ public class StoreRoleController extends XktBaseController { /** * 新增档口子角色 */ - @PreAuthorize("@ss.hasPermi('system:role:add')") + // @PreAuthorize("@ss.hasPermi('system:role:add')") @ApiOperation(value = "新增档口子角色", httpMethod = "POST", response = R.class) @Log(title = "新增档口子角色", businessType = BusinessType.INSERT) @PostMapping @@ -56,7 +56,7 @@ public class StoreRoleController extends XktBaseController { /** * 编辑档口子角色 */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") + // @PreAuthorize("@ss.hasPermi('system:role:edit')") @ApiOperation(value = "编辑档口子角色", httpMethod = "PUT", response = R.class) @Log(title = "编辑档口子角色", businessType = BusinessType.UPDATE) @PutMapping @@ -67,7 +67,7 @@ public class StoreRoleController extends XktBaseController { /** * 获取档口子角色详细信息 */ - @PreAuthorize("@ss.hasPermi('system:role:query')") + // @PreAuthorize("@ss.hasPermi('system:role:query')") @ApiOperation(value = "获取档口子角色详细信息", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeRoleId}") public R getInfo(@PathVariable("storeRoleId") Long storeRoleId) { @@ -83,7 +83,7 @@ public class StoreRoleController extends XktBaseController { /** * 获取档口子角色列表 */ - @PreAuthorize("@ss.hasPermi('system:role:list')") + // @PreAuthorize("@ss.hasPermi('system:role:list')") @ApiOperation(value = "查询档口销售出库列表", httpMethod = "POST", response = R.class) @PostMapping("/list") public R> list(@Validated @RequestBody StoreRoleListVO roleListVO) { @@ -93,7 +93,7 @@ public class StoreRoleController extends XktBaseController { /** * 停用/启用档口子角色 */ - @PreAuthorize("@ss.hasPermi('system:role:edit')") + // @PreAuthorize("@ss.hasPermi('system:role:edit')") @ApiOperation(value = "停用/启用档口子角色", httpMethod = "PUT", response = R.class) @Log(title = "停用/启用档口子角色", businessType = BusinessType.UPDATE) @PutMapping("/status") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java index 2fdbdac21..33a98c06c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java @@ -30,7 +30,7 @@ public class StoreRoleMenuController extends XktBaseController { /** * 查询档口子角色菜单列表 */ - @PreAuthorize("@ss.hasPermi('system:menu:list')") +// // @PreAuthorize("@ss.hasPermi('system:menu:list')") @GetMapping("/list") public TableDataInfo list(StoreRoleMenu storeRoleMenu) { startPage(); @@ -41,7 +41,7 @@ public class StoreRoleMenuController extends XktBaseController { /** * 导出档口子角色菜单列表 */ - @PreAuthorize("@ss.hasPermi('system:menu:export')") +// // @PreAuthorize("@ss.hasPermi('system:menu:export')") @Log(title = "档口子角色菜单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreRoleMenu storeRoleMenu) { @@ -53,7 +53,7 @@ public class StoreRoleMenuController extends XktBaseController { /** * 获取档口子角色菜单详细信息 */ - @PreAuthorize("@ss.hasPermi('system:menu:query')") +// // @PreAuthorize("@ss.hasPermi('system:menu:query')") @GetMapping(value = "/{storeRoleMenuId}") public R getInfo(@PathVariable("storeRoleMenuId") Long storeRoleMenuId) { return success(storeRoleMenuService.selectStoreRoleMenuByStoreRoleMenuId(storeRoleMenuId)); @@ -62,7 +62,7 @@ public class StoreRoleMenuController extends XktBaseController { /** * 新增档口子角色菜单 */ - @PreAuthorize("@ss.hasPermi('system:menu:add')") +// // @PreAuthorize("@ss.hasPermi('system:menu:add')") @Log(title = "档口子角色菜单", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreRoleMenu storeRoleMenu) { @@ -72,7 +72,7 @@ public class StoreRoleMenuController extends XktBaseController { /** * 修改档口子角色菜单 */ - @PreAuthorize("@ss.hasPermi('system:menu:edit')") +// // @PreAuthorize("@ss.hasPermi('system:menu:edit')") @Log(title = "档口子角色菜单", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreRoleMenu storeRoleMenu) { @@ -82,7 +82,7 @@ public class StoreRoleMenuController extends XktBaseController { /** * 删除档口子角色菜单 */ - @PreAuthorize("@ss.hasPermi('system:menu:remove')") +// // @PreAuthorize("@ss.hasPermi('system:menu:remove')") @Log(title = "档口子角色菜单", businessType = BusinessType.DELETE) @DeleteMapping("/{storeRoleMenuIds}") public R remove(@PathVariable Long[] storeRoleMenuIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java index fb1400ceb..97dc7fc0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java @@ -39,7 +39,7 @@ public class StoreSaleController extends XktBaseController { /** * 根据当前客户查询最近的销售业绩，以及欠款金额 */ - @PreAuthorize("@ss.hasPermi('system:sale:list')") + // @PreAuthorize("@ss.hasPermi('system:sale:list')") @ApiOperation(value = "根据当前客户查询最近的销售业绩，以及欠款金额", httpMethod = "GET", response = R.class) @GetMapping("/cus-overall") public R getCusGeneralSale(@RequestParam("days") Integer days, @RequestParam("storeId") Long storeId, @@ -50,7 +50,7 @@ public class StoreSaleController extends XktBaseController { /** * 查询档口销售出库列表 */ - @PreAuthorize("@ss.hasPermi('system:sale:list')") + // @PreAuthorize("@ss.hasPermi('system:sale:list')") @ApiOperation(value = "查询档口销售出库列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody StoreSalePageVO salePageVO) { @@ -60,7 +60,7 @@ public class StoreSaleController extends XktBaseController { /** * 新增档口销售出库 */ - @PreAuthorize("@ss.hasPermi('system:sale:add')") + // @PreAuthorize("@ss.hasPermi('system:sale:add')") @ApiOperation(value = "新增档口销售出库", httpMethod = "POST", response = R.class) @Log(title = "档口销售出库", businessType = BusinessType.INSERT) @PostMapping @@ -71,7 +71,7 @@ public class StoreSaleController extends XktBaseController { /** * 返单后，更新档口销售出库 */ - @PreAuthorize("@ss.hasPermi('system:sale:edit')") + // @PreAuthorize("@ss.hasPermi('system:sale:edit')") @Log(title = "修改档口销售出库", businessType = BusinessType.UPDATE) @ApiOperation(value = "返单后，更新档口销售出库", httpMethod = "PUT", response = R.class) @PutMapping @@ -82,7 +82,7 @@ public class StoreSaleController extends XktBaseController { /** * 查询档口销售出库详情 */ - @PreAuthorize("@ss.hasPermi('system:sale:query')") + // @PreAuthorize("@ss.hasPermi('system:sale:query')") @ApiOperation(value = "查询档口销售出库详情", httpMethod = "GET", response = R.class) @GetMapping(value = "/{storeSaleId}") public R getInfo(@PathVariable("storeSaleId") Long storeSaleId) { @@ -92,7 +92,7 @@ public class StoreSaleController extends XktBaseController { /** * 客户欠款结算 */ - @PreAuthorize("@ss.hasPermi('system:sale:edit')") + // @PreAuthorize("@ss.hasPermi('system:sale:edit')") @Log(title = "客户欠款结算", businessType = BusinessType.UPDATE) @ApiOperation(value = "客户欠款结算", httpMethod = "PUT", response = R.class) @PutMapping("/clear-debt") @@ -103,7 +103,7 @@ public class StoreSaleController extends XktBaseController { /** * 删除档口销售出库 */ - @PreAuthorize("@ss.hasPermi('system:sale:remove')") + // @PreAuthorize("@ss.hasPermi('system:sale:remove')") @Log(title = "档口销售出库", businessType = BusinessType.DELETE) @DeleteMapping("/{storeSaleId}") public R remove(@PathVariable Long storeSaleId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleDetailController.java index 2ce7d6f23..ee690803b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleDetailController.java @@ -30,7 +30,7 @@ public class StoreSaleDetailController extends XktBaseController { /** * 查询档口销售明细列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:list')") + // @PreAuthorize("@ss.hasPermi('system:detail:list')") @GetMapping("/list") public TableDataInfo list(StoreSaleDetail storeSaleDetail) { startPage(); @@ -41,7 +41,7 @@ public class StoreSaleDetailController extends XktBaseController { /** * 导出档口销售明细列表 */ - @PreAuthorize("@ss.hasPermi('system:detail:export')") + // @PreAuthorize("@ss.hasPermi('system:detail:export')") @Log(title = "档口销售明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, StoreSaleDetail storeSaleDetail) { @@ -53,7 +53,7 @@ public class StoreSaleDetailController extends XktBaseController { /** * 获取档口销售明细详细信息 */ - @PreAuthorize("@ss.hasPermi('system:detail:query')") + // @PreAuthorize("@ss.hasPermi('system:detail:query')") @GetMapping(value = "/{storeSaleDetailId}") public R getInfo(@PathVariable("storeSaleDetailId") Long storeSaleDetailId) { return success(storeSaleDetailService.selectStoreSaleDetailByStoreSaleDetailId(storeSaleDetailId)); @@ -62,7 +62,7 @@ public class StoreSaleDetailController extends XktBaseController { /** * 新增档口销售明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:add')") + // @PreAuthorize("@ss.hasPermi('system:detail:add')") @Log(title = "档口销售明细", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody StoreSaleDetail storeSaleDetail) { @@ -72,7 +72,7 @@ public class StoreSaleDetailController extends XktBaseController { /** * 修改档口销售明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:edit')") + // @PreAuthorize("@ss.hasPermi('system:detail:edit')") @Log(title = "档口销售明细", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody StoreSaleDetail storeSaleDetail) { @@ -82,7 +82,7 @@ public class StoreSaleDetailController extends XktBaseController { /** * 删除档口销售明细 */ - @PreAuthorize("@ss.hasPermi('system:detail:remove')") + // @PreAuthorize("@ss.hasPermi('system:detail:remove')") @Log(title = "档口销售明细", businessType = BusinessType.DELETE) @DeleteMapping("/{storeSaleDetailIds}") public R remove(@PathVariable Long[] storeSaleDetailIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java index 91afed679..05da2a07a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java @@ -34,7 +34,7 @@ public class StoreSaleRefundRecordController extends XktBaseController { /** * 查询档口销售出库返单记录 */ - @PreAuthorize("@ss.hasPermi('system:refund:list')") + // @PreAuthorize("@ss.hasPermi('system:refund:list')") @ApiOperation(value = "查询档口销售出库返单记录", httpMethod = "POST", response = R.class) @GetMapping("/list/{storeId}/{storeSaleId}") public R> selectPage(@PathVariable("storeId") Long storeId, @PathVariable("storeSaleId") Long storeSaleId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java index af84ceeaf..e71c96399 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java @@ -30,7 +30,7 @@ public class UserAccountController extends XktBaseController { /** * 查询用户账户（支付宝、微信等）列表 */ - @PreAuthorize("@ss.hasPermi('system:account:list')") + // @PreAuthorize("@ss.hasPermi('system:account:list')") @GetMapping("/list") public TableDataInfo list(UserAccount userAccount) { startPage(); @@ -41,7 +41,7 @@ public class UserAccountController extends XktBaseController { /** * 导出用户账户（支付宝、微信等）列表 */ - @PreAuthorize("@ss.hasPermi('system:account:export')") + // @PreAuthorize("@ss.hasPermi('system:account:export')") @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserAccount userAccount) { @@ -53,7 +53,7 @@ public class UserAccountController extends XktBaseController { /** * 获取用户账户（支付宝、微信等）详细信息 */ - @PreAuthorize("@ss.hasPermi('system:account:query')") + // @PreAuthorize("@ss.hasPermi('system:account:query')") @GetMapping(value = "/{userAccId}") public R getInfo(@PathVariable("userAccId") Long userAccId) { return success(userAccountService.selectUserAccountByUserAccId(userAccId)); @@ -62,7 +62,7 @@ public class UserAccountController extends XktBaseController { /** * 新增用户账户（支付宝、微信等） */ - @PreAuthorize("@ss.hasPermi('system:account:add')") + // @PreAuthorize("@ss.hasPermi('system:account:add')") @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserAccount userAccount) { @@ -72,7 +72,7 @@ public class UserAccountController extends XktBaseController { /** * 修改用户账户（支付宝、微信等） */ - @PreAuthorize("@ss.hasPermi('system:account:edit')") + // @PreAuthorize("@ss.hasPermi('system:account:edit')") @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserAccount userAccount) { @@ -82,7 +82,7 @@ public class UserAccountController extends XktBaseController { /** * 删除用户账户（支付宝、微信等） */ - @PreAuthorize("@ss.hasPermi('system:account:remove')") + // @PreAuthorize("@ss.hasPermi('system:account:remove')") @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.DELETE) @DeleteMapping("/{userAccIds}") public R remove(@PathVariable Long[] userAccIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAddressController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAddressController.java index a5df6ba5f..102a49a00 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAddressController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAddressController.java @@ -30,7 +30,7 @@ public class UserAddressController extends XktBaseController { /** * 查询用户收货地址列表 */ - @PreAuthorize("@ss.hasPermi('system:address:list')") + // @PreAuthorize("@ss.hasPermi('system:address:list')") @GetMapping("/list") public TableDataInfo list(UserAddress userAddress) { startPage(); @@ -41,7 +41,7 @@ public class UserAddressController extends XktBaseController { /** * 导出用户收货地址列表 */ - @PreAuthorize("@ss.hasPermi('system:address:export')") + // @PreAuthorize("@ss.hasPermi('system:address:export')") @Log(title = "用户收货地址", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserAddress userAddress) { @@ -53,7 +53,7 @@ public class UserAddressController extends XktBaseController { /** * 获取用户收货地址详细信息 */ - @PreAuthorize("@ss.hasPermi('system:address:query')") + // @PreAuthorize("@ss.hasPermi('system:address:query')") @GetMapping(value = "/{userAddrId}") public R getInfo(@PathVariable("userAddrId") Long userAddrId) { return success(userAddressService.selectUserAddressByUserAddrId(userAddrId)); @@ -62,7 +62,7 @@ public class UserAddressController extends XktBaseController { /** * 新增用户收货地址 */ - @PreAuthorize("@ss.hasPermi('system:address:add')") + // @PreAuthorize("@ss.hasPermi('system:address:add')") @Log(title = "用户收货地址", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserAddress userAddress) { @@ -72,7 +72,7 @@ public class UserAddressController extends XktBaseController { /** * 修改用户收货地址 */ - @PreAuthorize("@ss.hasPermi('system:address:edit')") + // @PreAuthorize("@ss.hasPermi('system:address:edit')") @Log(title = "用户收货地址", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserAddress userAddress) { @@ -82,7 +82,7 @@ public class UserAddressController extends XktBaseController { /** * 删除用户收货地址 */ - @PreAuthorize("@ss.hasPermi('system:address:remove')") + // @PreAuthorize("@ss.hasPermi('system:address:remove')") @Log(title = "用户收货地址", businessType = BusinessType.DELETE) @DeleteMapping("/{userAddrIds}") public R remove(@PathVariable Long[] userAddrIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java index 53cc43ccc..b347f391f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAuthenticationController.java @@ -30,7 +30,7 @@ public class UserAuthenticationController extends XktBaseController { /** * 查询用户代发认证列表 */ - @PreAuthorize("@ss.hasPermi('system:authentication:list')") + // @PreAuthorize("@ss.hasPermi('system:authentication:list')") @GetMapping("/list") public TableDataInfo list(UserAuthentication userAuthentication) { startPage(); @@ -41,7 +41,7 @@ public class UserAuthenticationController extends XktBaseController { /** * 导出用户代发认证列表 */ - @PreAuthorize("@ss.hasPermi('system:authentication:export')") + // @PreAuthorize("@ss.hasPermi('system:authentication:export')") @Log(title = "用户代发认证", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserAuthentication userAuthentication) { @@ -53,7 +53,7 @@ public class UserAuthenticationController extends XktBaseController { /** * 获取用户代发认证详细信息 */ - @PreAuthorize("@ss.hasPermi('system:authentication:query')") + // @PreAuthorize("@ss.hasPermi('system:authentication:query')") @GetMapping(value = "/{userAuthId}") public R getInfo(@PathVariable("userAuthId") Long userAuthId) { return success(userAuthenticationService.selectUserAuthenticationByUserAuthId(userAuthId)); @@ -62,7 +62,7 @@ public class UserAuthenticationController extends XktBaseController { /** * 新增用户代发认证 */ - @PreAuthorize("@ss.hasPermi('system:authentication:add')") + // @PreAuthorize("@ss.hasPermi('system:authentication:add')") @Log(title = "用户代发认证", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserAuthentication userAuthentication) { @@ -72,7 +72,7 @@ public class UserAuthenticationController extends XktBaseController { /** * 修改用户代发认证 */ - @PreAuthorize("@ss.hasPermi('system:authentication:edit')") + // @PreAuthorize("@ss.hasPermi('system:authentication:edit')") @Log(title = "用户代发认证", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserAuthentication userAuthentication) { @@ -82,7 +82,7 @@ public class UserAuthenticationController extends XktBaseController { /** * 删除用户代发认证 */ - @PreAuthorize("@ss.hasPermi('system:authentication:remove')") + // @PreAuthorize("@ss.hasPermi('system:authentication:remove')") @Log(title = "用户代发认证", businessType = BusinessType.DELETE) @DeleteMapping("/{userAuthIds}") public R remove(@PathVariable Long[] userAuthIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java index dcda71b01..9d0c156a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java @@ -30,7 +30,7 @@ public class UserBillingStatementController extends XktBaseController { /** * 查询用户对账明细列表 */ - @PreAuthorize("@ss.hasPermi('system:statement:list')") + // @PreAuthorize("@ss.hasPermi('system:statement:list')") @GetMapping("/list") public TableDataInfo list(UserBillingStatement userBillingStatement) { startPage(); @@ -41,7 +41,7 @@ public class UserBillingStatementController extends XktBaseController { /** * 导出用户对账明细列表 */ - @PreAuthorize("@ss.hasPermi('system:statement:export')") + // @PreAuthorize("@ss.hasPermi('system:statement:export')") @Log(title = "用户对账明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserBillingStatement userBillingStatement) { @@ -53,7 +53,7 @@ public class UserBillingStatementController extends XktBaseController { /** * 获取用户对账明细详细信息 */ - @PreAuthorize("@ss.hasPermi('system:statement:query')") + // @PreAuthorize("@ss.hasPermi('system:statement:query')") @GetMapping(value = "/{userBillStatId}") public R getInfo(@PathVariable("userBillStatId") Long userBillStatId) { return success(userBillingStatementService.selectUserBillingStatementByUserBillStatId(userBillStatId)); @@ -62,7 +62,7 @@ public class UserBillingStatementController extends XktBaseController { /** * 新增用户对账明细 */ - @PreAuthorize("@ss.hasPermi('system:statement:add')") + // @PreAuthorize("@ss.hasPermi('system:statement:add')") @Log(title = "用户对账明细", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserBillingStatement userBillingStatement) { @@ -72,7 +72,7 @@ public class UserBillingStatementController extends XktBaseController { /** * 修改用户对账明细 */ - @PreAuthorize("@ss.hasPermi('system:statement:edit')") + // @PreAuthorize("@ss.hasPermi('system:statement:edit')") @Log(title = "用户对账明细", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserBillingStatement userBillingStatement) { @@ -82,7 +82,7 @@ public class UserBillingStatementController extends XktBaseController { /** * 删除用户对账明细 */ - @PreAuthorize("@ss.hasPermi('system:statement:remove')") + // @PreAuthorize("@ss.hasPermi('system:statement:remove')") @Log(title = "用户对账明细", businessType = BusinessType.DELETE) @DeleteMapping("/{userBillStatIds}") public R remove(@PathVariable Long[] userBillStatIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBrowsingHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBrowsingHistoryController.java index 92f9d6837..aa94733c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBrowsingHistoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBrowsingHistoryController.java @@ -30,7 +30,7 @@ public class UserBrowsingHistoryController extends XktBaseController { /** * 查询用户浏览历史列表 */ - @PreAuthorize("@ss.hasPermi('system:history:list')") + // @PreAuthorize("@ss.hasPermi('system:history:list')") @GetMapping("/list") public TableDataInfo list(UserBrowsingHistory userBrowsingHistory) { startPage(); @@ -41,7 +41,7 @@ public class UserBrowsingHistoryController extends XktBaseController { /** * 导出用户浏览历史列表 */ - @PreAuthorize("@ss.hasPermi('system:history:export')") + // @PreAuthorize("@ss.hasPermi('system:history:export')") @Log(title = "用户浏览历史", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserBrowsingHistory userBrowsingHistory) { @@ -53,7 +53,7 @@ public class UserBrowsingHistoryController extends XktBaseController { /** * 获取用户浏览历史详细信息 */ - @PreAuthorize("@ss.hasPermi('system:history:query')") + // @PreAuthorize("@ss.hasPermi('system:history:query')") @GetMapping(value = "/{userBrowHisId}") public R getInfo(@PathVariable("userBrowHisId") Long userBrowHisId) { return success(userBrowsingHistoryService.selectUserBrowsingHistoryByUserBrowHisId(userBrowHisId)); @@ -62,7 +62,7 @@ public class UserBrowsingHistoryController extends XktBaseController { /** * 新增用户浏览历史 */ - @PreAuthorize("@ss.hasPermi('system:history:add')") + // @PreAuthorize("@ss.hasPermi('system:history:add')") @Log(title = "用户浏览历史", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserBrowsingHistory userBrowsingHistory) { @@ -72,7 +72,7 @@ public class UserBrowsingHistoryController extends XktBaseController { /** * 修改用户浏览历史 */ - @PreAuthorize("@ss.hasPermi('system:history:edit')") + // @PreAuthorize("@ss.hasPermi('system:history:edit')") @Log(title = "用户浏览历史", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserBrowsingHistory userBrowsingHistory) { @@ -82,7 +82,7 @@ public class UserBrowsingHistoryController extends XktBaseController { /** * 删除用户浏览历史 */ - @PreAuthorize("@ss.hasPermi('system:history:remove')") + // @PreAuthorize("@ss.hasPermi('system:history:remove')") @Log(title = "用户浏览历史", businessType = BusinessType.DELETE) @DeleteMapping("/{userBrowHisIds}") public R remove(@PathVariable Long[] userBrowHisIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java index 9ecb9b0c6..4c2aa5682 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java @@ -36,7 +36,7 @@ public class UserFavoritesController extends XktBaseController { /** * 新增用户收藏商品 */ - @PreAuthorize("@ss.hasPermi('system:favorites:add')") + // @PreAuthorize("@ss.hasPermi('system:favorites:add')") @ApiOperation(value = "用户收藏商品", httpMethod = "POST", response = R.class) @Log(title = "用户收藏商品", businessType = BusinessType.INSERT) @PostMapping @@ -47,7 +47,7 @@ public class UserFavoritesController extends XktBaseController { /** * 获取用户收藏列表 */ - @PreAuthorize("@ss.hasPermi('system:favorites:list')") + // @PreAuthorize("@ss.hasPermi('system:favorites:list')") @ApiOperation(value = "获取用户收藏列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody UserFavoritePageVO pageVO) { @@ -58,7 +58,7 @@ public class UserFavoritesController extends XktBaseController { /** * 批量加入进货车 */ - @PreAuthorize("@ss.hasPermi('system:favorites:add')") + // @PreAuthorize("@ss.hasPermi('system:favorites:add')") @ApiOperation(value = "批量加入进货车", httpMethod = "POST", response = R.class) @Log(title = "批量加入进货车", businessType = BusinessType.INSERT) @PostMapping("/batch/shopping-cart") @@ -70,7 +70,7 @@ public class UserFavoritesController extends XktBaseController { /** * 批量取消收藏 */ - @PreAuthorize("@ss.hasPermi('system:favorites:add')") + // @PreAuthorize("@ss.hasPermi('system:favorites:add')") @ApiOperation(value = "批量取消收藏", httpMethod = "DELETE", response = R.class) @Log(title = "批量取消收藏", businessType = BusinessType.INSERT) @DeleteMapping("/batch") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java index 633f97608..3fa427aea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeController.java @@ -30,7 +30,7 @@ public class UserNoticeController extends XktBaseController { /** * 查询用户所有通知列表 */ - @PreAuthorize("@ss.hasPermi('system:notice:list')") + // @PreAuthorize("@ss.hasPermi('system:notice:list')") @GetMapping("/list") public TableDataInfo list(UserNotice userNotice) { startPage(); @@ -41,7 +41,7 @@ public class UserNoticeController extends XktBaseController { /** * 导出用户所有通知列表 */ - @PreAuthorize("@ss.hasPermi('system:notice:export')") + // @PreAuthorize("@ss.hasPermi('system:notice:export')") @Log(title = "用户所有通知", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserNotice userNotice) { @@ -53,7 +53,7 @@ public class UserNoticeController extends XktBaseController { /** * 获取用户所有通知详细信息 */ - @PreAuthorize("@ss.hasPermi('system:notice:query')") + // @PreAuthorize("@ss.hasPermi('system:notice:query')") @GetMapping(value = "/{userNoticeId}") public R getInfo(@PathVariable("userNoticeId") Long userNoticeId) { return success(userNoticeService.selectUserNoticeByUserNoticeId(userNoticeId)); @@ -62,7 +62,7 @@ public class UserNoticeController extends XktBaseController { /** * 新增用户所有通知 */ - @PreAuthorize("@ss.hasPermi('system:notice:add')") + // @PreAuthorize("@ss.hasPermi('system:notice:add')") @Log(title = "用户所有通知", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserNotice userNotice) { @@ -72,7 +72,7 @@ public class UserNoticeController extends XktBaseController { /** * 修改用户所有通知 */ - @PreAuthorize("@ss.hasPermi('system:notice:edit')") + // @PreAuthorize("@ss.hasPermi('system:notice:edit')") @Log(title = "用户所有通知", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserNotice userNotice) { @@ -82,7 +82,7 @@ public class UserNoticeController extends XktBaseController { /** * 删除用户所有通知 */ - @PreAuthorize("@ss.hasPermi('system:notice:remove')") + // @PreAuthorize("@ss.hasPermi('system:notice:remove')") @Log(title = "用户所有通知", businessType = BusinessType.DELETE) @DeleteMapping("/{userNoticeIds}") public R remove(@PathVariable Long[] userNoticeIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java index cb29888f1..1527035e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java @@ -30,7 +30,7 @@ public class UserNoticeSettingController extends XktBaseController { /** * 查询用户通知接收设置列表 */ - @PreAuthorize("@ss.hasPermi('system:setting:list')") + // @PreAuthorize("@ss.hasPermi('system:setting:list')") @GetMapping("/list") public TableDataInfo list(UserNoticeSetting userNoticeSetting) { startPage(); @@ -41,7 +41,7 @@ public class UserNoticeSettingController extends XktBaseController { /** * 导出用户通知接收设置列表 */ - @PreAuthorize("@ss.hasPermi('system:setting:export')") + // @PreAuthorize("@ss.hasPermi('system:setting:export')") @Log(title = "用户通知接收设置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserNoticeSetting userNoticeSetting) { @@ -53,7 +53,7 @@ public class UserNoticeSettingController extends XktBaseController { /** * 获取用户通知接收设置详细信息 */ - @PreAuthorize("@ss.hasPermi('system:setting:query')") + // @PreAuthorize("@ss.hasPermi('system:setting:query')") @GetMapping(value = "/{userNoticeSetId}") public R getInfo(@PathVariable("userNoticeSetId") Long userNoticeSetId) { return success(userNoticeSettingService.selectUserNoticeSettingByUserNoticeSetId(userNoticeSetId)); @@ -62,7 +62,7 @@ public class UserNoticeSettingController extends XktBaseController { /** * 新增用户通知接收设置 */ - @PreAuthorize("@ss.hasPermi('system:setting:add')") + // @PreAuthorize("@ss.hasPermi('system:setting:add')") @Log(title = "用户通知接收设置", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserNoticeSetting userNoticeSetting) { @@ -72,7 +72,7 @@ public class UserNoticeSettingController extends XktBaseController { /** * 修改用户通知接收设置 */ - @PreAuthorize("@ss.hasPermi('system:setting:edit')") + // @PreAuthorize("@ss.hasPermi('system:setting:edit')") @Log(title = "用户通知接收设置", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserNoticeSetting userNoticeSetting) { @@ -82,7 +82,7 @@ public class UserNoticeSettingController extends XktBaseController { /** * 删除用户通知接收设置 */ - @PreAuthorize("@ss.hasPermi('system:setting:remove')") + // @PreAuthorize("@ss.hasPermi('system:setting:remove')") @Log(title = "用户通知接收设置", businessType = BusinessType.DELETE) @DeleteMapping("/{userNoticeSetIds}") public R remove(@PathVariable Long[] userNoticeSetIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserQuickFunctionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserQuickFunctionController.java index cbe54066d..c0c87f26d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserQuickFunctionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserQuickFunctionController.java @@ -30,7 +30,7 @@ public class UserQuickFunctionController extends XktBaseController { /** * 查询用户快捷功能列表 */ - @PreAuthorize("@ss.hasPermi('system:function:list')") + // @PreAuthorize("@ss.hasPermi('system:function:list')") @GetMapping("/list") public TableDataInfo list(UserQuickFunction userQuickFunction) { startPage(); @@ -41,7 +41,7 @@ public class UserQuickFunctionController extends XktBaseController { /** * 导出用户快捷功能列表 */ - @PreAuthorize("@ss.hasPermi('system:function:export')") + // @PreAuthorize("@ss.hasPermi('system:function:export')") @Log(title = "用户快捷功能", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UserQuickFunction userQuickFunction) { @@ -53,7 +53,7 @@ public class UserQuickFunctionController extends XktBaseController { /** * 获取用户快捷功能详细信息 */ - @PreAuthorize("@ss.hasPermi('system:function:query')") + // @PreAuthorize("@ss.hasPermi('system:function:query')") @GetMapping(value = "/{userQuickFuncId}") public R getInfo(@PathVariable("userQuickFuncId") Long userQuickFuncId) { return success(userQuickFunctionService.selectUserQuickFunctionByUserQuickFuncId(userQuickFuncId)); @@ -62,7 +62,7 @@ public class UserQuickFunctionController extends XktBaseController { /** * 新增用户快捷功能 */ - @PreAuthorize("@ss.hasPermi('system:function:add')") + // @PreAuthorize("@ss.hasPermi('system:function:add')") @Log(title = "用户快捷功能", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody UserQuickFunction userQuickFunction) { @@ -72,7 +72,7 @@ public class UserQuickFunctionController extends XktBaseController { /** * 修改用户快捷功能 */ - @PreAuthorize("@ss.hasPermi('system:function:edit')") + // @PreAuthorize("@ss.hasPermi('system:function:edit')") @Log(title = "用户快捷功能", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody UserQuickFunction userQuickFunction) { @@ -82,7 +82,7 @@ public class UserQuickFunctionController extends XktBaseController { /** * 删除用户快捷功能 */ - @PreAuthorize("@ss.hasPermi('system:function:remove')") + // @PreAuthorize("@ss.hasPermi('system:function:remove')") @Log(title = "用户快捷功能", businessType = BusinessType.DELETE) @DeleteMapping("/{userQuickFuncIds}") public R remove(@PathVariable Long[] userQuickFuncIds) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserSubscriptionsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserSubscriptionsController.java index a155af914..8f8f5da10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserSubscriptionsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserSubscriptionsController.java @@ -38,7 +38,7 @@ public class UserSubscriptionsController extends XktBaseController { /** * 新增用户关注档口 */ - @PreAuthorize("@ss.hasPermi('system:subscriptions:add')") + // @PreAuthorize("@ss.hasPermi('system:subscriptions:add')") @ApiOperation(value = "新增用户关注档口", httpMethod = "POST", response = R.class) @Log(title = "新增用户关注档口", businessType = BusinessType.INSERT) @PostMapping @@ -49,7 +49,7 @@ public class UserSubscriptionsController extends XktBaseController { /** * 用户关注档口列表 */ - @PreAuthorize("@ss.hasPermi('system:favorites:list')") + // @PreAuthorize("@ss.hasPermi('system:favorites:list')") @ApiOperation(value = "用户关注档口列表", httpMethod = "POST", response = R.class) @PostMapping("/page") public R> page(@Validated @RequestBody UserSubscPageVO pageVO) { @@ -60,7 +60,7 @@ public class UserSubscriptionsController extends XktBaseController { /** * 用户取消关注档口 */ - @PreAuthorize("@ss.hasPermi('system:subscriptions:remove')") + // @PreAuthorize("@ss.hasPermi('system:subscriptions:remove')") @ApiOperation(value = "用户取消关注档口", httpMethod = "DELETE", response = R.class) @Log(title = "用户取消关注档口", businessType = BusinessType.DELETE) @DeleteMapping("/batch") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertCreateVO.java index 2bb2870a4..e690612c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertCreateVO.java @@ -30,9 +30,15 @@ public class AdvertCreateVO { @NotNull(message = "推广tab不能为空!") @ApiModelProperty(value = "推广tab") private Integer tabId; + @NotNull(message = "每个档口可以购买当前广告位数量限制不能为空!") + @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") + private Integer storeBuyLimit; @NotNull(message = "播放轮次展示类型不能为空!") @ApiModelProperty(value = "播放轮次展示类型 1 时间范围or 2位置枚举") private Integer showType; + @NotNull(message = "prodMaxNum不能为空!") + @ApiModelProperty(value = "播放商品，或者图及商品 最多可容纳的商品数量") + private Integer prodMaxNum; @NotNull(message = "展示类型不能为空!") @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品") private Integer displayType; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java index 12422d3b3..63f971c9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java @@ -27,6 +27,12 @@ public class AdvertResVO { private Integer typeId; @ApiModelProperty(value = "推广tab") private Integer tabId; + @ApiModelProperty(value = "播放商品，或者图及商品 最多可容纳的商品数量") + private Integer prodMaxNum; + @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") + private Integer storeBuyLimit; + @ApiModelProperty(value = "播放轮次展示类型 1 时间范围or 2位置枚举") + private Integer showType; @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品") private Integer displayType; @ApiModelProperty(value = "起拍价格") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java index 4900514ef..2e35ddd98 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java @@ -33,6 +33,15 @@ public class AdvertUpdateVO { @NotNull(message = "推广tab不能为空!") @ApiModelProperty(value = "推广tab") private Integer tabId; + @NotNull(message = "每个档口可以购买当前广告位数量限制不能为空!") + @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") + private Integer storeBuyLimit; + @NotNull(message = "播放轮次展示类型不能为空!") + @ApiModelProperty(value = "播放轮次展示类型 1 时间范围or 2位置枚举") + private Integer showType; + @NotNull(message = "prodMaxNum不能为空!") + @ApiModelProperty(value = "播放商品，或者图及商品 最多可容纳的商品数量") + private Integer prodMaxNum; @NotNull(message = "展示类型不能为空!") @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品") private Integer displayType; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreResVO.java index 0ba5bfa40..7e4a65a50 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreResVO.java @@ -67,13 +67,21 @@ public class AdRoundStoreResVO { @ApiModelProperty(value = "广告ID") private Long advertId; @ApiModelProperty(value = "广告轮次ID") - private Long roundId; + private Integer roundId; @ApiModelProperty(value = "typeId") private Integer typeId; @ApiModelProperty(value = "广告位置 A B C D E") private String position; -// @ApiModelProperty(value = "推广档口ID") -// private Long storeId; + @ApiModelProperty(value = "投放开始时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startTime; + @ApiModelProperty(value = "投放结束时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endTime; + @ApiModelProperty(value = "竞价状态") + private Integer biddingStatus; + @ApiModelProperty(value = "竞价状态名称") + private String biddingStatusName; @ApiModelProperty(value = "对象锁符号") private String symbol; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java index dd4489206..279f01b60 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java @@ -20,28 +20,24 @@ public enum AdType { PC_HOME_TOP_RIGHT_BANNER(2, "顶部纵向小图", "/url"), // 人气榜左侧大图 PC_HOME_POP_LEFT_BANNER(3, "人气榜左大图", "/url"), - // 人气榜中上侧 - PC_HOME_POP_MID_TOP(4, "人气榜中上侧", "/url"), - // 人气榜中下侧 - PC_HOME_POP_MID_BOTTOM(5, "人气榜中下侧", "/url"), - // 人气榜右上侧 - PC_HOME_POP_RIGHT_TOP(6, "人气榜右上侧", "/url"), - // 人气榜右下侧 - PC_HOME_POP_RIGHT_BOTTOM(7, "人气榜右下侧", "/url"), + // 人气榜中间图 + PC_HOME_POP_MID_TOP(4, "人气榜中间图", "/url"), + // 人气榜右侧图 + PC_HOME_POP_RIGHT_TOP(5, "人气榜右侧图", "/url"), // 首页档口横幅 - PC_HOME_SINGLE_BANNER(8, "首页档口横幅", "/url"), + PC_HOME_SINGLE_BANNER(6, "首页档口横幅", "/url"), // 首页商品列表 - PC_HOME_PRODUCT_LIST(9, "首页商品列表", "/url"), + PC_HOME_PRODUCT_LIST(7, "首页商品列表", "/url"), // 首页两侧固定挂耳 - PC_HOME_FIXED_EAR(10, "首页两侧固定挂耳", "/url"), + PC_HOME_FIXED_EAR(8, "首页两侧固定挂耳", "/url"), // 首页搜索框下名称 - PC_HOME_SEARCH_DOWN_NAME(11, "首页搜索框下名称", "/url"), + PC_HOME_SEARCH_DOWN_NAME(9, "首页搜索框下名称", "/url"), // 首页搜索框商品 - PC_HOME_SEARCH_PRODUCT(12, "首页搜索框商品", "/url"), + PC_HOME_SEARCH_PRODUCT(10, "首页搜索框商品", "/url"), // 首页搜索框档口 - PC_HOME_SEARCH_STORE(13, "首页搜索框档口", "/url"), + PC_HOME_SEARCH_STORE(11, "首页搜索框档口", "/url"), // 首页以图搜款商品 - PC_HOME_PIC_SEARCH_PRODUCT(14, "首页以图搜款商品", "/url"), + PC_HOME_PIC_SEARCH_PRODUCT(12, "首页以图搜款商品", "/url"), // 新品馆顶部横向大图 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java index 596662df4..c0974a3a5 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java @@ -67,7 +67,7 @@ public class DailyTaskController extends BaseController { } @PostMapping("/advert-round") - public R dailyRound(SysJob sysJob) { + public R dailyRound(SysJob sysJob) throws ParseException { task.dailyAdvertRound(); return R.ok(); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java index 1c9391bfe..1cd304f2b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java @@ -300,7 +300,7 @@ public class XktTask { * 每晚定时任务更新推广的播放轮次，这个要次日凌晨更新 */ @Transactional - public void dailyAdvertRound() { + public void dailyAdvertRound() throws ParseException { List advertList = this.advertMapper.selectList(new LambdaQueryWrapper() .eq(Advert::getDelFlag, Constants.UNDELETED).eq(Advert::getOnlineStatus, AdOnlineStatus.ONLINE.getValue())); if (CollectionUtils.isEmpty(advertList)) { @@ -397,6 +397,9 @@ public class XktTask { if (CollectionUtils.isNotEmpty(updateList)) { this.advertRoundMapper.insertOrUpdate(updateList); } + + // 更新推广轮次截止时间到redis + this.saveAdvertDeadlineToRedis(); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java index 8eb1c4b94..ba92917b6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java @@ -33,6 +33,17 @@ public class StoreProductCategoryAttribute extends XktBaseEntity { @Excel(name = "档口商品ID") private Long storeProdId; + + + + + + + + + + + /** * 系统设置类目ID */ @@ -46,18 +57,4 @@ public class StoreProductCategoryAttribute extends XktBaseEntity { private String dictValue; - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeProdId", getStoreProdId()) - .append("dictType", getDictType()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertCreateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertCreateDTO.java index 9a55d8078..b761bc5e8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertCreateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertCreateDTO.java @@ -30,6 +30,10 @@ public class AdvertCreateDTO { private Integer tabId; @ApiModelProperty(value = "播放轮次展示类型 1 时间范围or 2位置枚举") private Integer showType; + @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") + private Integer storeBuyLimit; + @ApiModelProperty(value = "播放商品，或者图及商品 最多可容纳的商品数量") + private Integer prodMaxNum; @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品") private Integer displayType; @ApiModelProperty(value = "起拍价格") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertResDTO.java index 791526aff..73d88c3ed 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertResDTO.java @@ -25,6 +25,12 @@ public class AdvertResDTO { private Integer typeId; @ApiModelProperty(value = "推广tab") private Integer tabId; + @ApiModelProperty(value = "播放商品，或者图及商品 最多可容纳的商品数量") + private Integer prodMaxNum; + @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") + private Integer storeBuyLimit; + @ApiModelProperty(value = "播放轮次展示类型 1 时间范围or 2位置枚举") + private Integer showType; @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品") private Integer displayType; @ApiModelProperty(value = "起拍价格") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertUpdateDTO.java index bbb30a4e1..b74ddbb16 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advert/AdvertUpdateDTO.java @@ -29,6 +29,12 @@ public class AdvertUpdateDTO { private Integer typeId; @ApiModelProperty(value = "推广tab") private Integer tabId; + @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") + private Integer storeBuyLimit; + @ApiModelProperty(value = "播放轮次展示类型 1 时间范围or 2位置枚举") + private Integer showType; + @ApiModelProperty(value = "播放商品，或者图及商品 最多可容纳的商品数量") + private Integer prodMaxNum; @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品") private Integer displayType; @ApiModelProperty(value = "起拍价格") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreResDTO.java index 1463c504d..53a5a7f0f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreResDTO.java @@ -82,6 +82,10 @@ public class AdRoundStoreResDTO { @ApiModelProperty(value = "投放结束时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endTime; + @ApiModelProperty(value = "竞价状态") + private Integer biddingStatus; + @ApiModelProperty(value = "竞价状态名称") + private String biddingStatusName; // @ApiModelProperty(value = "推广档口ID") // private Long storeId; @ApiModelProperty(value = "对象锁符号") diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/AdShowType.java b/xkt/src/main/java/com/ruoyi/xkt/enums/AdShowType.java index 4c338e579..4ba4f117d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/enums/AdShowType.java +++ b/xkt/src/main/java/com/ruoyi/xkt/enums/AdShowType.java @@ -7,6 +7,7 @@ import lombok.Getter; /** * 推广营销展示类型 + * * @author liujiang * @date 2025-04-02 23:42 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java index 084675106..c40545406 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java @@ -5,6 +5,8 @@ import com.ruoyi.xkt.domain.AdvertRound; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 推广营销轮次Mapper接口 * @@ -17,12 +19,13 @@ public interface AdvertRoundMapper extends BaseMapper { /** * 判断当前档口是否超买广告位 * - * @param advertId 推广位ID - * @param roundId 播放轮次ID - * @param storeId 档口ID - * @param position 位置 + * @param advertId 推广位ID + * @param roundId 播放轮次ID + * @param storeId 档口ID + * @param launchStatusList 播放的轮次状态 * @return true 已超 false 未超 */ - boolean isStallOverBuy(@Param("advertId") Long advertId, @Param("roundId") Long roundId, @Param("storeId") Long storeId, @Param("position") String position); + boolean isStallOverBuy(@Param("advertId") Long advertId, @Param("roundId") Long roundId, @Param("storeId") Long storeId, + @Param("launchStatusList") List launchStatusList); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundRecordMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundRecordMapper.java index afc5356ce..bc0b2ba9b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundRecordMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundRecordMapper.java @@ -2,7 +2,6 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.AdvertRoundRecord; -import com.ruoyi.xkt.dto.advertRoundRecord.AdRoundRecordDTO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -28,7 +27,19 @@ public interface AdvertRoundRecordMapper extends BaseMapper { * @param roundIdSet 未购买的轮次ID * @return */ - List selectRecordList(@Param("advertId") Long advertId, @Param("storeId") Long storeId, - @Param("voucherDate") Date voucherDate, @Param("roundIdSet") Set roundIdSet); + List selectListByRoundId(@Param("advertId") Long advertId, @Param("storeId") Long storeId, + @Param("voucherDate") Date voucherDate, @Param("roundIdSet") Set roundIdSet); + + /** + * 获取档口在某个广告位具体位置的推广记录 + * + * @param advertId 广告ID + * @param storeId 档口ID + * @param voucherDate 单据日期 + * @param positionList 位置列表 + * @return + */ + List selectListByPosition(@Param("advertId") Long advertId, @Param("storeId") Long storeId, + @Param("voucherDate") Date voucherDate, @Param("positionList") List positionList); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java index 201bf9fac..36765e3c2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java @@ -41,6 +41,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import java.util.function.BinaryOperator; import java.util.function.Function; import java.util.stream.Collectors; @@ -175,18 +176,39 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { advertRoundList = voucherDate.before(firstRoundEndTime) ? advertRoundList.stream().filter(x -> !Objects.equals(x.getRoundId(), AdRoundType.FIFTH_ROUND.getValue())).collect(Collectors.toList()) : advertRoundList.stream().filter(x -> !Objects.equals(x.getRoundId(), AdRoundType.PLAY_ROUND.getValue())).collect(Collectors.toList()); - // 有档口购买的所有轮次 - Set roundIdSet = advertRoundList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getPayPrice())).map(AdvertRound::getRoundId).collect(Collectors.toSet()); - // 当前档口购买的轮次 - Set boughtIdSet = advertRoundList.stream().filter(x -> Objects.equals(x.getStoreId(), storeId)).map(AdvertRound::getRoundId).collect(Collectors.toSet()); - // 当前档口未购买的轮次 - roundIdSet.removeAll(boughtIdSet); - List recordList = CollectionUtils.isNotEmpty(roundIdSet) - ? this.advertRoundRecordMapper.selectRecordList(advertId, storeId, voucherDate, roundIdSet) : new ArrayList<>(); - // 获取已抢购推广位列表 - AdRoundStoreResDTO roundResDTO = AdRoundStoreResDTO.builder().boughtRoundList(this.getStoreBoughtList(storeId, advertRoundList, recordList)).build(); + + AdRoundStoreResDTO roundResDTO = AdRoundStoreResDTO.builder().build(); + // 如果投放类型是：时间范围，则只需要返回每一轮的开始时间和结束时间；如果投放类型是：位置枚举，则需要返回每一个位置的详细情况 if (Objects.equals(showType, AdShowType.TIME_RANGE.getValue())) { + + + + + + // 有档口购买的所有轮次 + Set roundIdSet = advertRoundList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getPayPrice())).map(AdvertRound::getRoundId).collect(Collectors.toSet()); + // 当前档口购买的轮次 + Set boughtIdSet = advertRoundList.stream().filter(x -> Objects.equals(x.getStoreId(), storeId)).map(AdvertRound::getRoundId).collect(Collectors.toSet()); + // 当前档口未购买的轮次 + roundIdSet.removeAll(boughtIdSet); + List recordList = CollectionUtils.isNotEmpty(roundIdSet) + ? this.advertRoundRecordMapper.selectListByRoundId(advertId, storeId, voucherDate, roundIdSet) : new ArrayList<>(); + // 获取已抢购推广位列表 +// AdRoundStoreResDTO roundResDTO = AdRoundStoreResDTO.builder().boughtRoundList().build(); + + roundResDTO.setBoughtRoundList(this.getStoreBoughtList(storeId, advertRoundList, recordList)); + + + + + + + + + + + // 构建当前round基础数据 List rangeDTOList = advertRoundList.stream().map(x -> new AdRoundStoreResDTO.ADRSRoundTimeRangeDTO() .setAdvertId(x.getAdvertId()).setRoundId(x.getRoundId()).setSymbol(x.getSymbol()).setStartTime(x.getStartTime()).setEndTime(x.getEndTime()) @@ -222,13 +244,49 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { } }); return roundResDTO.setTimeRangeList(rangeDTOList); - } else { // 位置枚举 - + } else { + // 单纯的位置枚举 只展示一轮，主要用于：首页商品推广、下载竞价推广 + Integer minRoundId = advertRoundList.stream().min(Comparator.comparing(AdvertRound::getRoundId)).orElseThrow(() -> new ServiceException("当前播放轮次不存在!请联系客服", HttpStatus.ERROR)).getRoundId(); + // 找到roundId最小的播放轮列表 + List minRoundList = advertRoundList.stream().filter(x -> Objects.equals(x.getRoundId(), minRoundId)).collect(Collectors.toList()); + // 当前轮次所有的位置 + List positionList = minRoundList.stream().map(AdvertRound::getPosition).collect(Collectors.toList()); + // 当前轮次已购买的位置 + final List boughtPositionList = minRoundList.stream().filter(x -> Objects.equals(x.getStoreId(), storeId)).map(AdvertRound::getPosition).collect(Collectors.toList()); + // 该轮次 剩下的未购买的位置 + positionList.removeAll(boughtPositionList); + List recordList = CollectionUtils.isNotEmpty(positionList) + ? this.advertRoundRecordMapper.selectListByPosition(advertId, storeId, voucherDate, positionList ) : new ArrayList<>(); + // 从recordList中筛选出当前轮其它位置 未竞价成功 的数据 + Map unBoughtRecordMap = recordList.stream().filter(x -> Objects.equals(x.getRoundId(), minRoundId) + && Objects.equals(x.getStoreId(), storeId) && Objects.equals(x.getVoucherDate(), voucherDate) && Objects.equals(x.getAdvertId(), advertId) + // 排除掉已购买过的位置 + && (CollectionUtils.isEmpty(boughtPositionList) || !boughtPositionList.contains(x.getPosition()))) + .collect(Collectors.toMap(AdvertRoundRecord::getPosition, Function.identity(), + // 从unBoughtRecordList中取出每个位置最大createTime的数据，仅取一条 + BinaryOperator.maxBy(Comparator.comparing(AdvertRoundRecord::getCreateTime)))); + List positionDTOList = minRoundList.stream().map(x -> { + // 当前轮次有购买记录 + if (Objects.equals(x.getStoreId(), storeId)) { + return BeanUtil.toBean(x, AdRoundStoreResDTO.ADRSRoundPositionDTO.class) + .setBiddingStatusName(Objects.requireNonNull(AdBiddingStatus.of(x.getBiddingStatus())).getLabel()); + } + // 其它轮次有购买轮次 + if (ObjectUtils.isNotEmpty(unBoughtRecordMap.get(x.getPosition()))) { + return BeanUtil.toBean(unBoughtRecordMap.get(x.getPosition()), AdRoundStoreResDTO.ADRSRoundPositionDTO.class) + .setBiddingStatusName(Objects.requireNonNull(AdBiddingStatus.of(unBoughtRecordMap.get(x.getPosition()).getBiddingStatus())).getLabel()); + } + // 其它轮次没有购买轮次 + return BeanUtil.toBean(x, AdRoundStoreResDTO.ADRSRoundPositionDTO.class).setBiddingStatus(null); + }).filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()); + return roundResDTO.setPositionList(positionDTOList); } - + // TODO 返回 biddingTempStatus + // TODO 返回 biddingTempStatus + // TODO 返回 biddingTempStatus @@ -264,7 +322,6 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { // 再判断当前当前与每一轮推广营销中的关系，已出价、竞价失败、竞价成功等 - return null; } @@ -306,13 +363,18 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { Object lockObj = Optional.ofNullable(advertLockMap.get(createDTO.getSymbol())).orElseThrow(() -> new ServiceException("symbol不存在!", HttpStatus.ERROR)); synchronized (lockObj) { // 判断当前推广位的这一轮每个档口可以买几个，不可超买 - boolean isOverBuy = this.advertRoundMapper.isStallOverBuy(createDTO.getAdvertId(), createDTO.getRoundId(), createDTO.getStoreId(), createDTO.getPosition()); + boolean isOverBuy = this.advertRoundMapper.isStallOverBuy(createDTO.getAdvertId(), createDTO.getRoundId(), createDTO.getStoreId(), + Arrays.asList(AdLaunchStatus.LAUNCHING.getValue(), AdLaunchStatus.UN_LAUNCH.getValue())); if (isOverBuy) { - throw new ServiceException("已购买过该推广位，不可超买哦!", HttpStatus.ERROR); + throw new ServiceException("已达到该推广位最大购买额度，不可超买哦!", HttpStatus.ERROR); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(AdvertRound::getAdvertId, createDTO.getAdvertId()).eq(AdvertRound::getRoundId, createDTO.getRoundId()) .eq(AdvertRound::getDelFlag, Constants.UNDELETED).orderByAsc(AdvertRound::getPayPrice).last("LIMIT 1"); + // 位置枚举类型的广告位，则 需要 查询具体的位置 + if (StringUtils.isNotBlank(createDTO.getPosition())) { + queryWrapper.eq(AdvertRound::getPosition, createDTO.getPosition()); + } AdvertRound minPriceAdvert = Optional.ofNullable(this.advertRoundMapper.selectOne(queryWrapper)).orElseThrow(() -> new ServiceException("获取推广营销位置失败，请联系客服!", HttpStatus.ERROR)); // 判断当前档口出价是否低于该推广位最低价格，若是，则提示:"已经有档口出价更高了噢，请重新出价!". if (createDTO.getPayPrice().compareTo(ObjectUtils.defaultIfNull(minPriceAdvert.getPayPrice(), BigDecimal.ZERO)) <= 0) { diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java index 1b11da63b..11ef33515 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java @@ -69,6 +69,7 @@ public class AdvertServiceImpl implements IAdvertService { advert.setOnlineStatus(AdOnlineStatus.ONLINE.getValue()); advert.setExamplePicId(file.getId()); return this.advertMapper.insert(advert); + // 更新档口推广营销截止时间 } diff --git a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml index ae45ce7a6..7e75224de 100644 --- a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml +++ b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml @@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT CASE WHEN - COUNT( id ) >= ( SELECT IFNULL( store_buy_limit, 0 ) FROM advert WHERE id = 1 ) THEN + COUNT( id ) >= ( SELECT IFNULL( store_buy_limit, 0 ) FROM advert WHERE id = #{advertId} ) THEN TRUE ELSE FALSE END AS isOverBuy FROM @@ -18,7 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND advert_id = #{advertId} AND store_id = #{storeId} AND del_flag = 0 - and position = #{position} + AND launch_status IN + + #{launchStatus} + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/AdvertRoundRecordMapper.xml b/xkt/src/main/resources/mapper/AdvertRoundRecordMapper.xml index 567152414..7345da6fc 100644 --- a/xkt/src/main/resources/mapper/AdvertRoundRecordMapper.xml +++ b/xkt/src/main/resources/mapper/AdvertRoundRecordMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT * FROM @@ -29,4 +29,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + + \ No newline at end of file