From e2ab64adda2959be92640a1a949abc640684cc63 Mon Sep 17 00:00:00 2001 From: chengkun <2500338766@qq.com> Date: Sat, 7 May 2022 14:07:10 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0:=E6=89=80=E6=9C=89=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer/img/controller/BannerController.java | 9 +++++++++ .../bnyer/img/controller/FeedBackController.java | 4 ++-- .../img/controller/TiktokImgController.java | 9 +++++++++ .../img/controller/TiktokUserController.java | 9 +++++++++ .../com/bnyer/img/controller/TypeController.java | 12 +++++++++++- .../java/com/bnyer/img/dto/FeedBackPageDto.java | 6 +++++- .../{FeedBackStatusDto.java => StatusDto.java} | 4 ++-- .../main/java/com/bnyer/img/dto/TypePageDto.java | 3 +++ .../com/bnyer/img/service/BannerService.java | 8 ++++++++ .../com/bnyer/img/service/FeedBackService.java | 3 ++- .../com/bnyer/img/service/TiktokImgService.java | 8 ++++++++ .../com/bnyer/img/service/TiktokUserService.java | 8 ++++++++ .../java/com/bnyer/img/service/TypeService.java | 11 ++++++++++- .../img/service/impl/BannerServiceImpl.java | 11 +++++++++++ .../img/service/impl/FeedBackServiceImpl.java | 5 +++-- .../img/service/impl/TiktokImgServiceImpl.java | 11 +++++++++++ .../img/service/impl/TiktokUserServiceImpl.java | 9 +++++++++ .../bnyer/img/service/impl/TypeServiceImpl.java | 16 ++++++++++++++-- 18 files changed, 134 insertions(+), 12 deletions(-) rename bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/{FeedBackStatusDto.java => StatusDto.java} (82%) diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java index 157cc05..7218022 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java @@ -8,6 +8,7 @@ import com.bnyer.common.security.annotation.RequiresPermissions; import com.bnyer.img.domain.Banner; import com.bnyer.img.dto.BannerDto; import com.bnyer.img.dto.BannerPageDto; +import com.bnyer.img.dto.StatusDto; import com.bnyer.img.service.BannerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -68,4 +69,12 @@ public class BannerController extends BaseController { log.debug("查询banner详情参数为:{}", id); return AjaxResult.success(bannerService.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(bannerService.changeStatus(dto.getId(),dto.getStatus())); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java index 68d8527..4878e4b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java @@ -32,7 +32,7 @@ public class FeedBackController extends BaseController { @PostMapping("/page") public TableDataInfo listFeedBack(@RequestBody @ApiParam("feedback分页对象") FeedBackPageDto dto){ startPage(); - List feedback = feedBackService.queryPage(dto.getSource()); + List feedback = feedBackService.queryPage(dto.getSource(),dto.getIsShow()); return getDataTable(feedback); } @@ -47,7 +47,7 @@ public class FeedBackController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="变更feedback显示状态") @PostMapping(value = "/changeStatus") - public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("feedback状态对象") FeedBackStatusDto dto){ + public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("feedback状态对象") StatusDto dto){ log.debug("变更feedback参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(feedBackService.changeStatus(dto.getId(),dto.getStatus())); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java index 0d4a533..7fb2d04 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java @@ -5,6 +5,7 @@ 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.img.domain.TiktokImg; +import com.bnyer.img.dto.StatusDto; import com.bnyer.img.dto.TiktokImgDto; import com.bnyer.img.dto.TiktokImgPageDto; import com.bnyer.img.service.TiktokImgService; @@ -67,4 +68,12 @@ public class TiktokImgController extends BaseController { log.debug("查询TiktokImg详情参数为:{}", id); return AjaxResult.success(tiktokImgService.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(tiktokImgService.changeStatus(dto.getId(),dto.getStatus())); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java index 9d7a5fd..081c676 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java @@ -6,6 +6,7 @@ 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.img.domain.TiktokUser; +import com.bnyer.img.dto.StatusDto; import com.bnyer.img.dto.TiktokCreaterDto; import com.bnyer.img.dto.TiktokUserDto; import com.bnyer.img.dto.TiktokUserPageDto; @@ -79,4 +80,12 @@ public class TiktokUserController extends BaseController { } return AjaxResult.success(tiktokUser); } + + //@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(tiktokUserService.changeStatus(dto.getId(),dto.getStatus())); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java index 27db079..d7e0be7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java @@ -5,6 +5,7 @@ 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.img.domain.Type; +import com.bnyer.img.dto.StatusDto; import com.bnyer.img.dto.TypeDto; import com.bnyer.img.dto.TypePageDto; import com.bnyer.img.service.TypeService; @@ -32,7 +33,7 @@ public class TypeController extends BaseController { @PostMapping("/page") public TableDataInfo pageType(@RequestBody @ApiParam("分页对象") TypePageDto dto){ startPage(); - List types = typeService.queryPage(dto.getTypeName()); + List types = typeService.queryPage(dto.getTypeName(),dto.getIsShow()); return getDataTable(types); } @@ -67,4 +68,13 @@ public class TypeController extends BaseController { log.debug("查询type详情参数为:{}", id); return AjaxResult.success(typeService.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(typeService.changeStatus(dto.getId(),dto.getStatus())); + } + } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java index 18c3d43..91b2011 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java @@ -1,5 +1,6 @@ package com.bnyer.img.dto; +import com.bnyer.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -12,8 +13,11 @@ import java.io.Serializable; @Getter @Setter @ApiModel("feedback分页接收类") -public class FeedBackPageDto implements Serializable { +public class FeedBackPageDto implements Serializable{ @ApiModelProperty(value="平台渠道") private String source; + + @ApiModelProperty(value="是否显示") + private String isShow; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackStatusDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/StatusDto.java similarity index 82% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackStatusDto.java rename to bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/StatusDto.java index a7d229a..880fd49 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackStatusDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/StatusDto.java @@ -11,8 +11,8 @@ import java.io.Serializable; @Getter @Setter -@ApiModel("feedback状态接收类") -public class FeedBackStatusDto implements Serializable { +@ApiModel("状态接收类") +public class StatusDto implements Serializable { @ApiModelProperty(value="主键Id") private Long id; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java index 3219f2f..b1a6559 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java @@ -15,4 +15,7 @@ public class TypePageDto implements Serializable { @ApiModelProperty(value="分类名称") private String typeName; + + @ApiModelProperty(value="是否显示") + private String isShow; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java index e9c13b8..5846b95 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java @@ -50,4 +50,12 @@ public interface BannerService { */ List queryList(String source); + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id,String status); + } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java index ea9de39..cf6f27c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java @@ -30,9 +30,10 @@ public interface FeedBackService { /** * 查询反馈分页 * @param source 平台渠道来源 + * @param isShow 是否显示 * @return - */ - List queryPage(String source); + List queryPage(String source,String isShow); /** * 获取反馈详情 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java index 8897c92..0520a52 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java @@ -66,4 +66,12 @@ public interface TiktokImgService { * @return - */ TiktokImgVo queryImgDetails(String imgId); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java index cb29aef..56180c8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java @@ -68,4 +68,12 @@ public interface TiktokUserService { * @param dto 绑定对象参数 */ void bindPhone(TiktokBindPhoneDto dto); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java index b290882..93523b9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java @@ -31,9 +31,10 @@ public interface TypeService { /** * 查询图片分类分页 * @param typeName 分类名称 + * @param isShow 是否显示 * @return - */ - List queryPage(String typeName); + List queryPage(String typeName,String isShow); /** * 小程序端查询图片分类列表 @@ -47,4 +48,12 @@ public interface TypeService { * @return - */ Type queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java index 02fdbde..c9e5161 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java @@ -1,8 +1,10 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.img.domain.Banner; +import com.bnyer.img.domain.Type; import com.bnyer.img.dto.BannerPageDto; import com.bnyer.img.mapper.BannerMapper; import com.bnyer.img.service.BannerService; @@ -57,4 +59,13 @@ public class BannerServiceImpl implements BannerService { public List queryList(String source) { return bannerMapper.queryList(source); } + + @Override + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Banner::getId, id); + Banner banner = new Banner(); + banner.setIsShow(status); + return bannerMapper.update(banner,wrapper); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java index 5f0a4a9..e1f2929 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java @@ -40,9 +40,10 @@ public class FeedBackServiceImpl implements FeedBackService { } @Override - public List queryPage(String source) { + public List queryPage(String source,String isShow) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.isNotNull(source),Feedback::getSource,source); + wrapper.eq(StringUtils.isNotBlank(source),Feedback::getSource,source); + wrapper.eq(StringUtils.isNotBlank(isShow),Feedback::getIsShow,isShow); return feedbackMapper.selectList(wrapper); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java index 36491df..8fcef87 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java @@ -1,9 +1,11 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.constants.RedisKeyConstant; +import com.bnyer.img.domain.Banner; import com.bnyer.img.domain.TiktokCollection; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.domain.TiktokLike; @@ -98,4 +100,13 @@ public class TiktokImgServiceImpl implements TiktokImgService { public TiktokImgVo queryImgDetails(String imgId) { return tiktokImgMapper.queryDetails(imgId); } + + @Override + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TiktokImg::getId, id); + TiktokImg img = new TiktokImg(); + img.setIsShow(status); + return tiktokImgMapper.update(img,wrapper); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java index 9aefee8..4abb237 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java @@ -285,6 +285,15 @@ public class TiktokUserServiceImpl implements TiktokUserService { } } + @Override + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TiktokUser::getId, id); + TiktokUser user = new TiktokUser(); + user.setIsShow(status); + return tiktokUserMapper.update(user,wrapper); + } + /** * 获取用户手机号 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java index 4b41674..52f7693 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java @@ -1,7 +1,9 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.img.domain.Feedback; import com.bnyer.img.domain.Type; import com.bnyer.img.mapper.TypeMapper; import com.bnyer.img.service.TypeService; @@ -39,9 +41,10 @@ public class TypeServiceImpl implements TypeService { } @Override - public List queryPage(String typeName) { + public List queryPage(String typeName,String isShow) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotNull(typeName), Type::getTypeName, typeName); + wrapper.like(StringUtils.isNotBlank(typeName), Type::getTypeName, typeName); + wrapper.eq(StringUtils.isNotBlank(isShow),Type::getIsShow, isShow); wrapper.orderByDesc(Type::getSort); return typeMapper.selectList(wrapper); } @@ -55,4 +58,13 @@ public class TypeServiceImpl implements TypeService { public Type queryDetails(Long id) { return typeMapper.selectById(id); } + + @Override + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Type::getId, id); + Type type = new Type(); + type.setIsShow(status); + return typeMapper.update(type,wrapper); + } }