From 5f3d052b4a0028d163df3ec56ab3bfece8a356a4 Mon Sep 17 00:00:00 2001 From: Penny <2500338766@qq.com> Date: Sun, 19 Mar 2023 18:18:37 +0800 Subject: [PATCH] =?UTF-8?q?feature-img-1.0:=E6=96=B0=E5=A2=9E=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E7=B4=A0=E6=9D=90=E5=BA=93=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=B3=BB=E7=BB=9F=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer/common/core/domain/CommonImgs.java | 7 -- .../bnyer/common/core/dto/CommonImgsDto.java | 10 +-- .../common/core/dto/CommonImgsPageDto.java | 19 ++++ .../system/controller/BannerController.java | 11 ++- .../controller/CommonImgsController.java | 89 ++++++++++--------- .../controller/CreatorAccountController.java | 11 ++- .../system/controller/CreatorController.java | 17 ++-- .../controller/CreatorProfitController.java | 9 +- .../system/controller/FeedBackController.java | 9 +- .../system/controller/FhUserController.java | 9 +- .../controller/InviteLogController.java | 6 +- .../system/controller/NoticeController.java | 11 ++- .../ProfitVerifyOrderController.java | 13 ++- .../system/controller/SignController.java | 11 ++- .../controller/TiktokImgController.java | 14 ++- .../controller/TiktokUserController.java | 9 +- .../system/controller/TypeController.java | 12 ++- .../controller/VerifyLogController.java | 4 +- .../controller/WithdrawLogController.java | 6 +- .../system/controller/WxUserController.java | 9 +- .../bnyer/system/mapper/CommonImgsMapper.java | 8 ++ .../system/service/ICommonImgsService.java | 23 ++--- .../service/impl/CommonImgsServiceImpl.java | 38 +++++--- .../bnyer/system/mapper/CommonImgsMapper.xml | 9 ++ 24 files changed, 200 insertions(+), 164 deletions(-) create mode 100644 bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsPageDto.java diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CommonImgs.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CommonImgs.java index f32197b..86de9a1 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CommonImgs.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CommonImgs.java @@ -30,13 +30,6 @@ public class CommonImgs extends BaseDomain { @ApiModelProperty(value="图片地址") private String imgUrl; - /** - * 是否显示 (0->隐藏；1->显示) - */ - @TableField(value = "is_show") - @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)") - private String isShow; - /** * 图片类型(0->头像;1->壁纸;2->插画) */ diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsDto.java index 8b91932..9469c1a 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsDto.java @@ -7,6 +7,7 @@ import lombok.Setter; import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import java.util.List; @Getter @@ -18,10 +19,7 @@ public class CommonImgsDto implements Serializable { @ApiModelProperty(value="类型") private String type; - @ApiModelProperty(value="第几页") - private String page; - - @ApiModelProperty(value="每页条数") - private String pageSize; - + @NotEmpty(message = "图片地址不能为空!") + @ApiModelProperty(value="图片地址") + private List imgUrls; } diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsPageDto.java new file mode 100644 index 0000000..1feb0f6 --- /dev/null +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CommonImgsPageDto.java @@ -0,0 +1,19 @@ +package com.bnyer.common.core.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + + +@Getter +@Setter +@ApiModel("公共素材库图片分页接收类") +public class CommonImgsPageDto extends BasePageDto { + + @ApiModelProperty(value="图片类型(0->头像;1->壁纸;2->插画)") + private String type; + + @ApiModelProperty(value="是否显示 (0->隐藏；1->显示)") + private String isShow; +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java index fd6ffec..828fe34 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IBannerService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class BannerController extends BaseController { @Autowired private IBannerService bannerService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询banner分页") @PostMapping("/page") public TableDataInfo pageBanner(@RequestBody @ApiParam("分页对象") BannerPageDto dto){ @@ -38,7 +38,7 @@ public class BannerController extends BaseController { return getDataTable(banners); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:banner:add") @ApiOperation(value="新增banner") @PostMapping(value = "/insert") public AjaxResult insertBanner(@Validated @RequestBody @ApiParam("banner对象")BannerDto dto){ @@ -46,7 +46,7 @@ public class BannerController extends BaseController { return AjaxResult.success(bannerService.insert(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:banner:edit") @ApiOperation(value="修改banner") @PostMapping(value = "/update") public AjaxResult updateBanner(@Validated @RequestBody @ApiParam("banner对象") BannerDto dto){ @@ -54,7 +54,7 @@ public class BannerController extends BaseController { return AjaxResult.success(bannerService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:banner:delete") @ApiOperation(value="删除banner") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteBanner(@PathVariable @ApiParam("主键ids") List ids){ @@ -62,7 +62,6 @@ public class BannerController extends BaseController { return AjaxResult.success(bannerService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询banner详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsBanner(@PathVariable @ApiParam("主键id") Long id){ @@ -70,7 +69,7 @@ public class BannerController extends BaseController { return AjaxResult.success(bannerService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:banner:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CommonImgsController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CommonImgsController.java index db8618d..6dbdc64 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CommonImgsController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CommonImgsController.java @@ -1,12 +1,25 @@ package com.bnyer.system.controller; +import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.CommonImgs; +import com.bnyer.common.core.dto.BatchStatusDto; +import com.bnyer.common.core.dto.CommonImgsDto; +import com.bnyer.common.core.dto.CommonImgsPageDto; import com.bnyer.common.core.web.controller.BaseController; +import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ICommonImgsService; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @Api(value = "【图文平台】公共素材库接口",tags = "【图文平台】公共素材库接口") @RestController @@ -17,44 +30,36 @@ public class CommonImgsController extends BaseController { @Autowired private ICommonImgsService commonImgsService; - //@RequiresPermissions("system:config:list") -// @ApiOperation(value="查询commonImgs分页") -// @PostMapping("/page") -// public TableDataInfo pageCommonImgs(@RequestBody @ApiParam("分页对象") CommonImgsPageDto dto){ -// PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); -// List commonImgss = commonImgsService.queryPage(dto); -// return getDataTable(commonImgss); -// } - - //@RequiresPermissions("system:config:list") -// @ApiOperation(value="修改commonImgs") -// @PostMapping(value = "/update") -// public AjaxResult updateCommonImgs(@Validated @RequestBody @ApiParam("commonImgs对象") CommonImgsDto dto){ -// log.debug("【图文平台后台】修改commonImgs参数为:{}", JSON.toJSONString(dto)); -// return AjaxResult.success(commonImgsService.update(dto.extractParam())); -// } -// -// //@RequiresPermissions("system:config:list") -// @ApiOperation(value="删除commonImgs") -// @DeleteMapping(value = "/delete/{ids}") -// public AjaxResult deleteCommonImgs(@PathVariable @ApiParam("主键ids") List ids){ -// log.debug("【图文平台后台】删除commonImgs参数为:{}", JSON.toJSONString(ids)); -// return AjaxResult.success(commonImgsService.delete(ids)); -// } -// -// //@RequiresPermissions("system:config:list") -// @ApiOperation(value="查询commonImgs详情") -// @GetMapping(value = "/details/{id}") -// public AjaxResult detailsCommonImgs(@PathVariable @ApiParam("主键id") Long id){ -// log.debug("【图文平台后台】查询commonImgs详情参数为:{}", id); -// return AjaxResult.success(commonImgsService.queryDetails(id)); -// } -// -// //@RequiresPermissions("system:config:list") -// @ApiOperation(value="变更type显示状态") -// @PostMapping(value = "/changeStatus") -// public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ -// log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); -// return AjaxResult.success(commonImgsService.changeStatus(dto.getId(),dto.getStatus())); -// } + @ApiOperation(value="查询公共素材库图片分页") + @PostMapping("/page") + public TableDataInfo pageCommonImgs(@RequestBody @ApiParam("分页对象") CommonImgsPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List commonImgss = commonImgsService.queryPage(dto); + return getDataTable(commonImgss); + } + + @RequiresPermissions("img:commonImgs:delete") + @ApiOperation(value="删除公共素材库图片") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult deleteCommonImgs(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("【图文平台后台】删除公共素材库图片参数为:{}", JSON.toJSONString(ids)); + return AjaxResult.success(commonImgsService.delete(ids)); + } + + @RequiresPermissions("img:commonImgs:edit") + @ApiOperation(value="批量变更公共素材库图片显示状态") + @PostMapping(value = "/changeStatus") + public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") BatchStatusDto dto){ + log.debug("【图文平台后台】批量变更公共素材库图片状态参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(commonImgsService.changeStatus(dto.getIds(),dto.getStatus())); + } + + @RequiresPermissions("img:commonImgs:add") + @ApiOperation(value="批量新增公共素材库图片") + @PostMapping(value = "/batchInsert") + public AjaxResult insertCommonImgs(@Validated @RequestBody @ApiParam("公共素材库图片对象") CommonImgsDto dto){ + log.debug("【图文平台后台】新增公共素材库图片状态参数为:{}", JSON.toJSONString(dto)); + commonImgsService.insert(dto.getImgUrls(),dto.getType()); + return AjaxResult.success(); + } } diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java index 4a774bf..ce04099 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java @@ -9,6 +9,7 @@ import com.bnyer.common.core.utils.DesensitizedUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ICreatorAccountService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -30,7 +31,6 @@ public class CreatorAccountController extends BaseController { @Autowired private ICreatorAccountService creatorAccountService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询creatorAccount分页") @PostMapping("/page") public TableDataInfo pageCreatorAccount(@RequestBody @ApiParam("分页对象") CreatorAccountPageDto dto){ @@ -39,7 +39,7 @@ public class CreatorAccountController extends BaseController { return getDataTable(creatorAccounts); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorAccount:add") @ApiOperation(value="新增creatorAccount") @PostMapping(value = "/insert") public AjaxResult insertCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象") CreatorAccountDto dto){ @@ -47,7 +47,7 @@ public class CreatorAccountController extends BaseController { return AjaxResult.success(creatorAccountService.insert(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorAccount:edit") @ApiOperation(value="修改creatorAccount") @PostMapping(value = "/update") public AjaxResult updateCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象")CreatorAccountDto dto){ @@ -55,7 +55,7 @@ public class CreatorAccountController extends BaseController { return AjaxResult.success(creatorAccountService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorAccount:delete") @ApiOperation(value="删除creatorAccount") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteCreatorAccount(@PathVariable @ApiParam("主键ids") List ids){ @@ -63,7 +63,6 @@ public class CreatorAccountController extends BaseController { return AjaxResult.success(creatorAccountService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询creatorAccount详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsCreatorAccount(@PathVariable @ApiParam("主键id") Long id){ @@ -71,7 +70,7 @@ public class CreatorAccountController extends BaseController { return AjaxResult.success(creatorAccountService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorAccount:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java index d9425ef..8b9366d 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ICreatorService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class CreatorController extends BaseController { @Autowired private ICreatorService creatorService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询艺术家分页") @PostMapping("/page") public TableDataInfo pageCreators(@RequestBody @ApiParam("分页对象") CreatorPageDto dto){ @@ -50,7 +50,7 @@ public class CreatorController extends BaseController { return getDataTable(creators); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:add") @ApiOperation(value="成为艺术家") @PostMapping(value = "/insert") public AjaxResult insert(@Validated @RequestBody @ApiParam("艺术家对象") CreatorDto dto){ @@ -58,7 +58,7 @@ public class CreatorController extends BaseController { return AjaxResult.success(creatorService.insertCreator(dto)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:add") @ApiOperation(value="批量生成机器人艺术家") @GetMapping(value = "/insertRobot") public AjaxResult insertRobot(){ @@ -66,7 +66,7 @@ public class CreatorController extends BaseController { return AjaxResult.success(); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:edit") @ApiOperation(value="修改艺术家") @PostMapping(value = "/update") public AjaxResult update(@RequestBody @ApiParam("艺术家对象") CreatorUpdateDto dto){ @@ -74,7 +74,7 @@ public class CreatorController extends BaseController { return AjaxResult.success(creatorService.updateCreator(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:delete") @ApiOperation(value="删除艺术家") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteTiktokUser(@PathVariable @ApiParam("主键ids") List ids){ @@ -82,14 +82,13 @@ public class CreatorController extends BaseController { return AjaxResult.success(creatorService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询艺术家详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsTiktokUser(@PathVariable @ApiParam("主键id") Long id){ return AjaxResult.success(creatorService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ @@ -97,7 +96,7 @@ public class CreatorController extends BaseController { return AjaxResult.success(creatorService.changeStatus(dto.getId(),dto.getStatus())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:verify") @ApiOperation(value="审核通过") @PostMapping(value = "/verifyPass") public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyCreatorDto dto){ @@ -105,7 +104,7 @@ public class CreatorController extends BaseController { return AjaxResult.success(creatorService.verifyPass(dto)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creator:verify") @ApiOperation(value="审核拒绝") @PostMapping(value = "/verifyUnPass") public AjaxResult verifyUnPass(@Validated @RequestBody @ApiParam("审核对象") VerifyCreatorDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java index 63312b6..cbcb4b7 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.vo.CreatorProfitVo; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ICreatorProfitService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class CreatorProfitController extends BaseController { @Autowired private ICreatorProfitService creatorProfitService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询creatorProfit分页") @PostMapping("/page") public TableDataInfo pageCreatorProfit(@RequestBody @ApiParam("分页对象") CreatorProfitPageDto dto){ @@ -38,7 +38,7 @@ public class CreatorProfitController extends BaseController { return getDataTable(creatorProfits); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorProfit:edit") @ApiOperation(value="修改creatorProfit") @PostMapping(value = "/update") public AjaxResult updateCreatorProfit(@Validated @RequestBody @ApiParam("creatorProfit对象") CreatorProfitUpdateDto dto){ @@ -46,7 +46,7 @@ public class CreatorProfitController extends BaseController { return AjaxResult.success(creatorProfitService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorProfit:delete") @ApiOperation(value="删除creatorProfit") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteCreatorProfit(@PathVariable @ApiParam("主键ids") List ids){ @@ -54,7 +54,6 @@ public class CreatorProfitController extends BaseController { return AjaxResult.success(creatorProfitService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询creatorProfit详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsCreatorProfit(@PathVariable @ApiParam("主键id") Long id){ @@ -62,7 +61,7 @@ public class CreatorProfitController extends BaseController { return AjaxResult.success(creatorProfitService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorProfit:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java index 2543aa1..625ffbc 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IFeedBackService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class FeedBackController extends BaseController { @Autowired private IFeedBackService feedBackService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询feedback分页") @PostMapping("/page") public TableDataInfo listFeedBack(@RequestBody @ApiParam("feedback分页对象") FeedBackPageDto dto){ @@ -38,7 +38,7 @@ public class FeedBackController extends BaseController { return getDataTable(feedback); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:feedback:edit") @ApiOperation(value="修改feedback") @PostMapping(value = "/update") public AjaxResult updateFeedBack(@Validated @RequestBody @ApiParam("feedback对象") FeedBackDto dto){ @@ -46,7 +46,7 @@ public class FeedBackController extends BaseController { return AjaxResult.success(feedBackService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:feedback:edit") @ApiOperation(value="变更feedback显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("feedback状态对象") StatusDto dto){ @@ -54,7 +54,7 @@ public class FeedBackController extends BaseController { return AjaxResult.success(feedBackService.changeStatus(dto.getId(),dto.getStatus())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:feedback:delete") @ApiOperation(value="删除feedback") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteFeedBack(@PathVariable @ApiParam("主键ids") List ids){ @@ -62,7 +62,6 @@ public class FeedBackController extends BaseController { return AjaxResult.success(feedBackService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询feedback详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsFeedBack(@PathVariable @ApiParam("主键ids") Long id){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java index 3120cf8..285c584 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java @@ -10,6 +10,7 @@ import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IFhUserService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -31,7 +32,6 @@ public class FhUserController extends BaseController { @Autowired private IFhUserService fhUserService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询快手用户分页") @PostMapping("/page") public TableDataInfo pageFhUser(@RequestBody @ApiParam("分页对象") FhUserPageDto dto){ @@ -40,7 +40,7 @@ public class FhUserController extends BaseController { return getDataTable(fhUsers); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:fhUser:edit") @ApiOperation(value="修改快手用户") @PostMapping(value = "/update") public AjaxResult update(@RequestBody @ApiParam("user对象") FhUserDto dto){ @@ -48,7 +48,7 @@ public class FhUserController extends BaseController { return AjaxResult.success(fhUserService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:fhUser:delete") @ApiOperation(value="删除快手用户") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteFhUser(@PathVariable @ApiParam("主键ids") List ids){ @@ -56,7 +56,6 @@ public class FhUserController extends BaseController { return AjaxResult.success(fhUserService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询快手用户详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsFhUser(@PathVariable @ApiParam("主键id") Long id){ @@ -67,7 +66,7 @@ public class FhUserController extends BaseController { return AjaxResult.success(fhUser); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:fhUser:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java index 65f0daf..f598b46 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java @@ -5,6 +5,7 @@ import com.bnyer.common.core.dto.InviteLogPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IInviteLogService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -25,7 +26,6 @@ public class InviteLogController extends BaseController { @Autowired private IInviteLogService inviteLogService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询邀请记录分页") @PostMapping("/page") public TableDataInfo pageInviteLog(@RequestBody @ApiParam("分页对象") InviteLogPageDto dto){ @@ -34,10 +34,10 @@ public class InviteLogController extends BaseController { return getDataTable(inviteLogs); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:inviteLog:delete") @ApiOperation(value="删除邀请记录") @DeleteMapping(value = "/delete/{ids}") - public AjaxResult deleteVerifyLog(@PathVariable @ApiParam("主键ids") List ids){ + public AjaxResult deleteInviteLog(@PathVariable @ApiParam("主键ids") List ids){ log.debug("【图文平台后台】删除邀请记录参数为:{}", ids); return AjaxResult.success(inviteLogService.delete(ids)); } diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java index 879a2f9..f2fd7fc 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.INoticeService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class NoticeController extends BaseController { @Autowired private INoticeService noticeService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询notice分页") @PostMapping("/page") public TableDataInfo pageNotice(@RequestBody @ApiParam("分页对象") NoticePageDto dto){ @@ -38,7 +38,7 @@ public class NoticeController extends BaseController { return getDataTable(notices); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:notice:add") @ApiOperation(value="新增notice") @PostMapping(value = "/insert") public AjaxResult insertNotice(@Validated @RequestBody @ApiParam("notice对象") NoticeDto dto){ @@ -46,7 +46,7 @@ public class NoticeController extends BaseController { return AjaxResult.success(noticeService.insert(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:notice:edit") @ApiOperation(value="修改notice") @PostMapping(value = "/update") public AjaxResult updateNotice(@Validated @RequestBody @ApiParam("notice对象")NoticeDto dto){ @@ -54,7 +54,7 @@ public class NoticeController extends BaseController { return AjaxResult.success(noticeService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:notice:delete") @ApiOperation(value="删除notice") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteNotice(@PathVariable @ApiParam("主键ids") List ids){ @@ -62,7 +62,6 @@ public class NoticeController extends BaseController { return AjaxResult.success(noticeService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询notice详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsNotice(@PathVariable @ApiParam("主键id") Long id){ @@ -70,7 +69,7 @@ public class NoticeController extends BaseController { return AjaxResult.success(noticeService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:notice:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java index b482481..89da013 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java @@ -9,6 +9,7 @@ import com.bnyer.common.core.dto.ProfitVerifyOrderUpdateDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IProfitVerifyOrderService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -30,7 +31,6 @@ public class ProfitVerifyOrderController extends BaseController { @Autowired private IProfitVerifyOrderService profitVerifyOrderService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询收益审核单分页") @PostMapping("/page") public TableDataInfo pageProfitVerifyOrder(@RequestBody @ApiParam("分页对象") ProfitVerifyOrderPageDto dto){ @@ -39,7 +39,7 @@ public class ProfitVerifyOrderController extends BaseController { return getDataTable(profitVerifyOrders); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:profit:add") @ApiOperation(value="新增收益审核单") @PostMapping(value = "/insert") public AjaxResult insertProfitVerifyOrder(@Validated @RequestBody @ApiParam("收益审核单对象") ProfitVerifyOrderInsertDto dto){ @@ -47,7 +47,7 @@ public class ProfitVerifyOrderController extends BaseController { return AjaxResult.success(profitVerifyOrderService.insert(dto)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:profit:edit") @ApiOperation(value="修改收益审核单") @PostMapping(value = "/update") public AjaxResult updateProfitVerifyOrder(@Validated @RequestBody @ApiParam("收益审核单对象") ProfitVerifyOrderUpdateDto dto){ @@ -55,7 +55,7 @@ public class ProfitVerifyOrderController extends BaseController { return AjaxResult.success(profitVerifyOrderService.update(dto)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:profit:delete") @ApiOperation(value="删除收益审核单") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteProfitVerifyOrder(@PathVariable @ApiParam("主键ids") List ids){ @@ -63,7 +63,6 @@ public class ProfitVerifyOrderController extends BaseController { return AjaxResult.success(profitVerifyOrderService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询收益审核单详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsProfitVerifyOrder(@PathVariable @ApiParam("主键id") Long id){ @@ -71,7 +70,7 @@ public class ProfitVerifyOrderController extends BaseController { return AjaxResult.success(profitVerifyOrderService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:profit:verify") @ApiOperation(value="审核") @PostMapping(value = "/verify") public AjaxResult verify(@Validated @RequestBody @ApiParam("收益审核单对象") ProfitVerifyOrderDto dto){ @@ -79,7 +78,7 @@ public class ProfitVerifyOrderController extends BaseController { return AjaxResult.success(profitVerifyOrderService.verify(dto)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:profit:trans") @ApiOperation(value="转入钱包") @GetMapping(value = "/transInfoWallet") public AjaxResult transInfoWallet(){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java index a3d52f0..68b0963 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ISignService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class SignController extends BaseController { @Autowired private ISignService signService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询sign分页") @PostMapping("/page") public TableDataInfo pageSign(@RequestBody @ApiParam("分页对象") SignPageDto dto){ @@ -38,7 +38,7 @@ public class SignController extends BaseController { return getDataTable(signs); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:sign:add") @ApiOperation(value="新增sign") @PostMapping(value = "/insert") public AjaxResult insertSign(@Validated @RequestBody @ApiParam("sign对象") SignDto dto){ @@ -46,7 +46,7 @@ public class SignController extends BaseController { return AjaxResult.success(signService.insert(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:sign:edit") @ApiOperation(value="修改sign") @PostMapping(value = "/update") public AjaxResult updateSign(@Validated @RequestBody @ApiParam("sign对象")SignDto dto){ @@ -54,7 +54,7 @@ public class SignController extends BaseController { return AjaxResult.success(signService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:sign:delete") @ApiOperation(value="删除sign") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteSign(@PathVariable @ApiParam("主键ids") List ids){ @@ -62,7 +62,6 @@ public class SignController extends BaseController { return AjaxResult.success(signService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询sign详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsSign(@PathVariable @ApiParam("主键id") Long id){ @@ -70,7 +69,7 @@ public class SignController extends BaseController { return AjaxResult.success(signService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:sign:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java index ad30606..7026c38 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java @@ -6,6 +6,7 @@ import com.bnyer.common.core.dto.*; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ITiktokImgService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -27,7 +28,6 @@ public class TiktokImgController extends BaseController { @Autowired private ITiktokImgService tiktokImgService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询TiktokImg分页") @PostMapping("/page") public TableDataInfo pageTiktokImg(@RequestBody @ApiParam("分页对象") TiktokImgPageDto dto){ @@ -36,7 +36,6 @@ public class TiktokImgController extends BaseController { return getDataTable(tiktokImg); } -// @RequiresPermissions("system:config:list") @ApiOperation(value="根据分类id查询未审核图片分业") @PostMapping(value = "/pageUnVerifyImgs") public TableDataInfo pageUnVerifyImgs(@RequestBody @ApiParam("图片分类对象") TiktokImgTypeDto dto){ @@ -45,7 +44,7 @@ public class TiktokImgController extends BaseController { return getDataTable(tiktokImgs); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokImg:edit") @ApiOperation(value="修改TiktokImg") @PostMapping(value = "/update") public AjaxResult editTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){ @@ -53,7 +52,7 @@ public class TiktokImgController extends BaseController { return AjaxResult.success(tiktokImgService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokImg:delete") @ApiOperation(value="删除TiktokImg") @DeleteMapping(value = "/delete/{ids}") public AjaxResult delTiktokImg(@PathVariable @ApiParam("主键ids") List ids){ @@ -61,7 +60,6 @@ public class TiktokImgController extends BaseController { return AjaxResult.success(tiktokImgService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询TiktokImg详情") @GetMapping(value = "/details/{id}") public AjaxResult detailTiktokImg(@PathVariable @ApiParam("主键id") Long id){ @@ -69,7 +67,7 @@ public class TiktokImgController extends BaseController { return AjaxResult.success(tiktokImgService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokImg:edit") @ApiOperation(value="变更图片显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("img状态对象") StatusDto dto){ @@ -77,7 +75,7 @@ public class TiktokImgController extends BaseController { return AjaxResult.success(tiktokImgService.changeStatus(dto.getId(),dto.getStatus())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokImg:verify") @ApiOperation(value="批量变更图片审核状态") @PostMapping(value = "/changeJudge") public AjaxResult changeJudge(@Validated @RequestBody @ApiParam("img状态对象") BatchStatusDto dto){ @@ -85,7 +83,7 @@ public class TiktokImgController extends BaseController { return AjaxResult.success(tiktokImgService.changeJudge(dto.getIds(),dto.getStatus())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokImg:edit") @ApiOperation(value="变更图片热门状态") @PostMapping(value = "/changeHot") public AjaxResult changeHot(@Validated @RequestBody @ApiParam("img状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java index 585a05e..d83dbaa 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java @@ -10,6 +10,7 @@ import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ITiktokUserService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -31,7 +32,6 @@ public class TiktokUserController extends BaseController { @Autowired private ITiktokUserService tiktokUserService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询抖音用户分页") @PostMapping("/page") public TableDataInfo pageTiktokUser(@RequestBody @ApiParam("分页对象") TiktokUserPageDto dto){ @@ -40,7 +40,7 @@ public class TiktokUserController extends BaseController { return getDataTable(tiktokUsers); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokUser:edit") @ApiOperation(value="修改抖音用户") @PostMapping(value = "/update") public AjaxResult update(@RequestBody @ApiParam("user对象") TiktokUserDto dto){ @@ -48,7 +48,7 @@ public class TiktokUserController extends BaseController { return AjaxResult.success(tiktokUserService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokUser:delete") @ApiOperation(value="删除抖音用户") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteTiktokUser(@PathVariable @ApiParam("主键ids") List ids){ @@ -56,7 +56,6 @@ public class TiktokUserController extends BaseController { return AjaxResult.success(tiktokUserService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询抖音用户详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsTiktokUser(@PathVariable @ApiParam("主键id") Long id){ @@ -67,7 +66,7 @@ public class TiktokUserController extends BaseController { return AjaxResult.success(user); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:tiktokUser:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java index 020582f..f61739b 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.dto.TypePageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.ITypeService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -29,7 +30,6 @@ public class TypeController extends BaseController { @Autowired private ITypeService typeService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询图片分类分页") @PostMapping("/page") public TableDataInfo pageType(@RequestBody @ApiParam("分页对象") TypePageDto dto){ @@ -38,7 +38,6 @@ public class TypeController extends BaseController { return getDataTable(types); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询图片分类列表") @GetMapping("/list") public AjaxResult listType(){ @@ -46,7 +45,7 @@ public class TypeController extends BaseController { } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:type:add") @ApiOperation(value="新增图片分类") @PostMapping(value = "/insert") public AjaxResult insertType(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){ @@ -54,7 +53,7 @@ public class TypeController extends BaseController { return AjaxResult.success(typeService.insert(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:type:edit") @ApiOperation(value="修改图片分类") @PostMapping(value = "/update") public AjaxResult updateType(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){ @@ -62,7 +61,7 @@ public class TypeController extends BaseController { return AjaxResult.success(typeService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:type:delete") @ApiOperation(value="删除图片分类") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteType(@PathVariable @ApiParam("主键ids") List ids){ @@ -70,7 +69,6 @@ public class TypeController extends BaseController { return AjaxResult.success(typeService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询图片分类详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsType(@PathVariable @ApiParam("主键id") Long id){ @@ -78,7 +76,7 @@ public class TypeController extends BaseController { return AjaxResult.success(typeService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:type:edit") @ApiOperation(value="变更图片分类显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java index 642e2e5..b672e89 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java @@ -5,6 +5,7 @@ import com.bnyer.common.core.dto.VerifyPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IVerifyLogService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -25,7 +26,6 @@ public class VerifyLogController extends BaseController { @Autowired private IVerifyLogService verifyLogService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询审核记录分页") @PostMapping("/page") public TableDataInfo pageVerifyLog(@RequestBody @ApiParam("分页对象") VerifyPageDto dto){ @@ -34,7 +34,7 @@ public class VerifyLogController extends BaseController { return getDataTable(verifyLogs); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:creatorVerifyLog:delete") @ApiOperation(value="删除审核记录") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteVerifyLog(@PathVariable @ApiParam("主键ids") List ids){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java index bbf33ce..fc8ab24 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java @@ -7,6 +7,7 @@ import com.bnyer.common.core.dto.WithdrawPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IWithdrawLogService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -28,7 +29,6 @@ public class WithdrawLogController extends BaseController { @Autowired private IWithdrawLogService withdrawLogService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询提现记录分页") @PostMapping("/page") public TableDataInfo pageWithdrawLog(@RequestBody @ApiParam("分页对象") WithdrawPageDto dto){ @@ -37,7 +37,7 @@ public class WithdrawLogController extends BaseController { return getDataTable(withdrawLogs); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:withdraw:delete") @ApiOperation(value="删除提现记录") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteWithdrawLog(@PathVariable @ApiParam("主键ids") List ids){ @@ -52,7 +52,7 @@ public class WithdrawLogController extends BaseController { return AjaxResult.success(withdrawLogService.queryDetails(id)); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:withdraw:verify") @ApiOperation(value="审核提现") @PostMapping(value = "/verify") public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java index 97e7c41..e10c2b8 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java @@ -10,6 +10,7 @@ import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; +import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.system.service.IWxUserService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -31,7 +32,6 @@ public class WxUserController extends BaseController { @Autowired private IWxUserService wxUserService; - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询微信用户分页") @PostMapping("/page") public TableDataInfo pageWxUser(@RequestBody @ApiParam("分页对象") WxUserPageDto dto){ @@ -40,7 +40,7 @@ public class WxUserController extends BaseController { return getDataTable(wxUsers); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:wxUser:edit") @ApiOperation(value="修改微信用户") @PostMapping(value = "/update") public AjaxResult update(@RequestBody @ApiParam("user对象") WxUserDto dto){ @@ -48,7 +48,7 @@ public class WxUserController extends BaseController { return AjaxResult.success(wxUserService.update(dto.extractParam())); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:wxUser:delete") @ApiOperation(value="删除微信用户") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteWxUser(@PathVariable @ApiParam("主键ids") List ids){ @@ -56,7 +56,6 @@ public class WxUserController extends BaseController { return AjaxResult.success(wxUserService.delete(ids)); } - //@RequiresPermissions("system:config:list") @ApiOperation(value="查询微信用户详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsWxUser(@PathVariable @ApiParam("主键id") Long id){ @@ -67,7 +66,7 @@ public class WxUserController extends BaseController { return AjaxResult.success(wxUser); } - //@RequiresPermissions("system:config:list") + @RequiresPermissions("img:wxUser:edit") @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CommonImgsMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CommonImgsMapper.java index 390fd80..7fdc630 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CommonImgsMapper.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CommonImgsMapper.java @@ -17,4 +17,12 @@ public interface CommonImgsMapper extends BaseMapper { * @return - */ int insertBatch(@Param("imgList") List imgList,@Param("type") String type); + + /** + * 批量更新图片显示状态 + * @param ids 图片数组 + * @param status 显示状态 + * @return - + */ + int batchUpdateStatus(@Param("ids") List ids, @Param("status") String status); } \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICommonImgsService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICommonImgsService.java index b0e94b9..e927332 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICommonImgsService.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICommonImgsService.java @@ -1,38 +1,39 @@ package com.bnyer.system.service; import com.bnyer.common.core.domain.CommonImgs; +import com.bnyer.common.core.dto.CommonImgsPageDto; import java.util.List; public interface ICommonImgsService { /** - * 批量删除commonImgs + * 批量删除公共素材库图片 * @param ids ids * @return - */ int delete(List ids); /** - * 查询commonImgs分页 + * 查询公共素材库图片分页 * @param dto 分页对象 * @return - */ - List queryPage(); + List queryPage(CommonImgsPageDto dto); /** - * 查询commonImgs详情 - * @param id 主键id + * 批量变更显示状态 + * @param ids 主键ids + * @param status 状态 * @return - */ - CommonImgs queryDetails(Long id); + int changeStatus(List ids, String status); /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - + * 新增公共素材库图片 + * @param imgUrls 公共素材库图片 + * @param type 类型 */ - int changeStatus(Long id, String status); + void insert(List imgUrls,String type); } diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CommonImgsServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CommonImgsServiceImpl.java index f4a5c38..d253e73 100644 --- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CommonImgsServiceImpl.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CommonImgsServiceImpl.java @@ -1,7 +1,11 @@ package com.bnyer.system.service.impl; +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.core.domain.CommonImgs; +import com.bnyer.common.core.dto.CommonImgsPageDto; +import com.bnyer.common.core.utils.StringUtils; import com.bnyer.system.mapper.CommonImgsMapper; import com.bnyer.system.service.ICommonImgsService; import lombok.extern.slf4j.Slf4j; @@ -10,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; +import java.util.Date; import java.util.List; @Service @@ -30,22 +35,35 @@ public class CommonImgsServiceImpl implements ICommonImgsService { } @Override - public List queryPage() { - return null; + public List queryPage(CommonImgsPageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotEmpty(dto.getType())){ + wrapper.eq(CommonImgs::getType, dto.getType()); + } + if(StringUtils.isNotEmpty(dto.getIsShow())){ + wrapper.eq(CommonImgs::getIsShow, dto.getIsShow()); + } + return commonImgsMapper.selectList(wrapper); } @Override - public CommonImgs queryDetails(Long id) { - return commonImgsMapper.selectById(id); + @Transactional(rollbackFor = Exception.class) + public int changeStatus(List ids, String status) { + return commonImgsMapper.batchUpdateStatus(ids,status); } @Override @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(CommonImgs::getId, id); - CommonImgs commonImgs = new CommonImgs(); - commonImgs.setIsShow(status); - return commonImgsMapper.update(commonImgs,wrapper); + public void insert(List imgUrls,String type) { + for (String imgUrl : imgUrls) { + CommonImgs commonImgs = new CommonImgs(); + commonImgs.setCreateTime(new Date()); + commonImgs.setUpdateTime(new Date()); + commonImgs.setIsShow("1"); + commonImgs.setSort(0); + commonImgs.setType(type); + commonImgs.setImgUrl(imgUrl); + commonImgsMapper.insert(commonImgs); + } } } diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CommonImgsMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CommonImgsMapper.xml index a9b8921..197e7b9 100644 --- a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CommonImgsMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CommonImgsMapper.xml @@ -22,4 +22,13 @@ (#{item}, #{type},NOW(),NOW()) + + + update img_common_imgs + set is_show = #{status},update_time = now() + where id in + + #{id} + + \ No newline at end of file