From 76ea6c2d040f10c578bf8192c3dfc7bc25d0eba0 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Sat, 2 Jul 2022 16:39:15 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=20=E4=BC=98=E5=8C=96=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=83=AD=E9=97=A8=E8=89=BA=E6=9C=AF?= =?UTF-8?q?=E5=AE=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer/img/constants/RedisKeyConstant.java | 4 --- .../img/controller/TiktokMiniController.java | 16 +++++++--- .../com/bnyer/img/mapper/CreatorMapper.java | 7 ++++ .../com/bnyer/img/service/CreatorService.java | 7 ++++ .../impl/CreatorProfitServiceImpl.java | 2 +- .../img/service/impl/CreatorServiceImpl.java | 15 ++++----- .../java/com/bnyer/img/vo/CreatorHotVo.java | 32 +++++++++++++++++++ .../main/java/com/bnyer/img/vo/CreatorVo.java | 13 ++++++++ .../com/bnyer/img/mapper/CreatorMapper.xml | 27 +++++++++++++--- 9 files changed, 101 insertions(+), 22 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java index c665d13..10c893c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java @@ -2,10 +2,6 @@ package com.bnyer.img.constants; public class RedisKeyConstant { - /** - * 小程序用户图片首页键 - */ - public static final String TIKTOK_CREATOR_IMG_KEY = "bnyer.img.tiktok.creatorImg"; /** * 抖音小程序用户收藏图片键 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 6513211..092b5f1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -92,10 +92,11 @@ public class TiktokMiniController extends BaseController { } //@TokenCheck - @ApiOperation(value="艺术家界面查询艺术家图片列表") - @GetMapping(value = "/creatorImgs") - public AjaxResult creatorImgs(){ - return AjaxResult.success(creatorService.queryThreeImgCreatorList()); + @ApiOperation(value="艺术家界面查询艺术家图片分页") + @PostMapping(value = "/creatorImgsPage") + public TableDataInfo creatorImgsPage(@RequestBody @ApiParam("分页对象") BasePageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + return getDataTable(creatorService.queryThreeImgCreatorList()); } //@TokenCheck @@ -201,4 +202,11 @@ public class TiktokMiniController extends BaseController { creatorProfitService.insertInvitedProfit(dto.extractParam()); return AjaxResult.success(); } + + //@TokenCheck + @ApiOperation(value="查询热门艺术家列表") + @GetMapping(value = "/listHotCreator") + public AjaxResult listHotCreator(){ + return AjaxResult.success(creatorService.queryHotCreatorList()); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java index b294bb5..20f46c9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java @@ -3,6 +3,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bnyer.img.domain.Creator; import com.bnyer.img.dto.CreatorPageDto; +import com.bnyer.img.vo.CreatorHotVo; import com.bnyer.img.vo.CreatorVo; import com.bnyer.img.vo.TiktokUserVo; import org.apache.ibatis.annotations.Mapper; @@ -43,4 +44,10 @@ public interface CreatorMapper extends BaseMapper { * @return - */ int updateBatch(@Param("list") List list); + + /** + * 查询10个热门艺术家列表 + * @return - + */ + List queryHotCreatorList(); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java index fc2b896..808cb41 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java @@ -2,6 +2,7 @@ package com.bnyer.img.service; import com.bnyer.img.domain.Creator; import com.bnyer.img.dto.*; +import com.bnyer.img.vo.CreatorHotVo; import com.bnyer.img.vo.CreatorVo; import java.util.List; @@ -109,4 +110,10 @@ public interface CreatorService { * @return - */ int batchUpdate(List list); + + /** + * 查询10个热门艺术家列表 + * @return - + */ + List queryHotCreatorList(); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java index 5925392..5ffe257 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java @@ -151,7 +151,7 @@ public class CreatorProfitServiceImpl implements CreatorProfitService { } if (updateList.size() > 0) { //批量更新邀请记录 - //TODO 修改此处BUG + //TODO 此处存在并发问题，会比最终的结果与预期效果值少，但此处暂不修复，故意而为之 creatorProfitMapper.batchUpdateDownload(updateList); } if (insertList.size() > 0) { diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index bab27e3..68c018e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -25,6 +25,7 @@ import com.bnyer.img.mapper.InviteLogMapper; import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.mapper.VerifyLogMapper; import com.bnyer.img.service.CreatorService; +import com.bnyer.img.vo.CreatorHotVo; import com.bnyer.img.vo.CreatorVo; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; @@ -196,14 +197,7 @@ public class CreatorServiceImpl implements CreatorService { @Override public List queryThreeImgCreatorList() { - //走缓存 - String redisKey = RedisKeyConstant.TIKTOK_CREATOR_IMG_KEY; - if(redisService.hasKey(redisKey)){ - return JSONObject.parseArray(redisService.getCacheObject(redisKey).toString(), CreatorVo.class); - } - List creatorVo = creatorMapper.queryThreeImgCreatorList(); - redisService.setCacheObject(redisKey,creatorVo,3600L, TimeUnit.SECONDS); - return creatorVo; + return creatorMapper.queryThreeImgCreatorList(); } @Override @@ -336,4 +330,9 @@ public class CreatorServiceImpl implements CreatorService { public int batchUpdate(List list) { return creatorMapper.updateBatch(list); } + + @Override + public List queryHotCreatorList() { + return creatorMapper.queryHotCreatorList(); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java new file mode 100644 index 0000000..ecadd9e --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorHotVo.java @@ -0,0 +1,32 @@ +package com.bnyer.img.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("热门艺术家响应类") +public class CreatorHotVo implements Serializable { + + @ApiModelProperty(value="id") + private Long id; + + @ApiModelProperty(value="搜索码") + private String scanCode; + + @ApiModelProperty(value="是否热门") + private String isHot; + + @ApiModelProperty(value="头像img地址") + private String img; + + @ApiModelProperty(value="热度") + private Integer hotNum; + + private static final long serialVersionUID = 1L; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java index 9ae0478..61bb5e6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorVo.java @@ -29,6 +29,19 @@ public class CreatorVo implements Serializable { @ApiModelProperty(value="序号") private Integer sort; + @ApiModelProperty(value="简介") + private String intro; + + @ApiModelProperty(value="图片总数量") + private Integer imgTotalNum; + + @ApiModelProperty(value="图片收藏数量") + private Integer imgCollectionNum; + + @ApiModelProperty(value="图片喜欢数量") + private Integer imgLikeNum; + + @ApiModelProperty(value="图片列表") List imgList; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml index 8104b45..d684d13 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml @@ -27,10 +27,14 @@ - + - + + + + + @@ -41,15 +45,21 @@ - select - id, scan_code,img,is_hot,sort + ic.id as id, ic.scan_code as scanCode,ic.img as img,ic.is_hot as isHot,ic.sort as sort,ic.intro as intro, + (select count(id) from img_tiktok_img where creator_id = ic.id) as imgTotalNum, + (select sum(great_num) from img_tiktok_img where creator_id = ic.id) as imgLikeNum, + (select sum(collection_num) from img_tiktok_img where creator_id = ic.id) as imgCollectionNum from img_creator ic where ic.is_show = '1' and ic.scan_code = #{scanCode} @@ -98,4 +108,11 @@ where id = #{item.id} +