From 25228a08636a9beb547c3ff4ac3ea79545f61160 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Sun, 3 Jul 2022 20:02:34 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=20=E4=BC=98=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/controller/TiktokMiniController.java | 5 +- .../com/bnyer/img/mapper/CreatorMapper.java | 4 +- .../com/bnyer/img/mapper/TiktokImgMapper.java | 7 +++ .../java/com/bnyer/img/mapper/TypeMapper.java | 9 ++++ .../com/bnyer/img/service/CreatorService.java | 8 +++- .../com/bnyer/img/service/TypeService.java | 2 + .../img/service/impl/CreatorServiceImpl.java | 10 ++-- .../img/service/impl/TypeServiceImpl.java | 1 + .../com/bnyer/img/vo/CreatorTypeImgsVo.java | 48 +++++++++++++++++++ .../main/java/com/bnyer/img/vo/TypeImgVo.java | 27 +++++++++++ .../com/bnyer/img/mapper/CreatorMapper.xml | 16 ++++++- .../com/bnyer/img/mapper/TiktokImgMapper.xml | 9 ++++ .../com/bnyer/img/mapper/TypeMapper.xml | 27 +++++++++++ 13 files changed, 162 insertions(+), 11 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgsVo.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeImgVo.java 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 d9f4d8e..4c7b3cd 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 @@ -8,8 +8,9 @@ import com.bnyer.img.constants.TiktokConstant; import com.bnyer.img.domain.Feedback; import com.bnyer.img.dto.*; import com.bnyer.img.service.*; -import com.bnyer.img.vo.CreatorVo; +import com.bnyer.img.vo.CreatorTypeImgsVo; import com.bnyer.img.vo.TiktokImgVo; +import com.bnyer.img.vo.TypeImgVo; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -104,7 +105,7 @@ public class TiktokMiniController extends BaseController { @ApiOperation(value="根据搜索码查询艺术家图片列表") @PostMapping(value = "/creatorImgsDetails") public AjaxResult creatorImgsDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){ - CreatorVo creatorVo = creatorService.queryCreatorImgListByScanCode(params.getScanCode()); + CreatorTypeImgsVo creatorVo = creatorService.queryCreatorImgListByScanCode(params.getScanCode()); if(creatorVo == null){ return AjaxResult.error(TiktokConstant.TIKTOK_CREATOR_NOT_EXIST,"该艺术家不存在!"); } 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 a685d70..b20d736 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 @@ -4,8 +4,8 @@ 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.CreatorTypeImgsVo; import com.bnyer.img.vo.CreatorVo; -import com.bnyer.img.vo.TiktokUserVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -29,7 +29,7 @@ public interface CreatorMapper extends BaseMapper { * @param scanCode 搜索码 * @return - */ - CreatorVo queryThreeImgCreatorListByScanCode(@Param("scanCode") String scanCode); + CreatorTypeImgsVo queryThreeImgCreatorListByScanCode(@Param("scanCode") String scanCode); /** * 查询艺术家分页 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java index a7c22ce..bc78bb2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java @@ -45,4 +45,11 @@ public interface TiktokImgMapper extends BaseMapper { * @return - */ List queryFrontPage(); + + /** + * 根据艺术家查询图片列表 + * @param creatorId 艺术家id + * @return - + */ + List queryTypeImgList(@Param("creatorId") Long creatorId); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java index b589a88..878e44b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java @@ -2,8 +2,10 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bnyer.img.domain.Type; +import com.bnyer.img.vo.TypeImgVo; import com.bnyer.img.vo.TypeVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,4 +17,11 @@ public interface TypeMapper extends BaseMapper { * @return */ List queryList(); + + /** + * 根据艺术家id查询分类图片列表 + * @param creatorId 艺术家id + * @return - + */ + List queryTypeImgsList(@Param("creatorId") Long creatorId); } \ No newline at end of file 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 825e664..53a4a65 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 @@ -1,8 +1,12 @@ package com.bnyer.img.service; import com.bnyer.img.domain.Creator; -import com.bnyer.img.dto.*; +import com.bnyer.img.dto.CreatorDto; +import com.bnyer.img.dto.CreatorPageDto; +import com.bnyer.img.dto.VerifyCreatorDto; +import com.bnyer.img.dto.WxLoginDto; import com.bnyer.img.vo.CreatorHotVo; +import com.bnyer.img.vo.CreatorTypeImgsVo; import com.bnyer.img.vo.CreatorVo; import java.util.List; @@ -60,7 +64,7 @@ public interface CreatorService { * @param scanCode 搜索码 * @return - */ - CreatorVo queryCreatorImgListByScanCode(String scanCode); + CreatorTypeImgsVo queryCreatorImgListByScanCode(String scanCode); /** * 变更显示状态 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 93523b9..2bb4e16 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 @@ -1,6 +1,7 @@ package com.bnyer.img.service; import com.bnyer.img.domain.Type; +import com.bnyer.img.vo.TypeImgVo; import com.bnyer.img.vo.TypeVo; import java.util.List; @@ -56,4 +57,5 @@ public interface TypeService { * @return - */ int changeStatus(Long id,String status); + } 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 699a0d3..512d2e9 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 @@ -2,9 +2,7 @@ package com.bnyer.img.service.impl; import cn.binarywang.wx.miniapp.api.WxMaUserService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -19,13 +17,17 @@ import com.bnyer.img.domain.Creator; import com.bnyer.img.domain.InviteLog; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.*; +import com.bnyer.img.dto.CreatorDto; +import com.bnyer.img.dto.CreatorPageDto; +import com.bnyer.img.dto.VerifyCreatorDto; +import com.bnyer.img.dto.WxLoginDto; import com.bnyer.img.mapper.CreatorMapper; 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.CreatorTypeImgsVo; import com.bnyer.img.vo.CreatorVo; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; @@ -201,7 +203,7 @@ public class CreatorServiceImpl implements CreatorService { } @Override - public CreatorVo queryCreatorImgListByScanCode(String scanCode) { + public CreatorTypeImgsVo queryCreatorImgListByScanCode(String scanCode) { return creatorMapper.queryThreeImgCreatorListByScanCode(scanCode); } 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 d42ec15..894bd7d 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 @@ -7,6 +7,7 @@ import com.bnyer.img.domain.Feedback; import com.bnyer.img.domain.Type; import com.bnyer.img.mapper.TypeMapper; import com.bnyer.img.service.TypeService; +import com.bnyer.img.vo.TypeImgVo; import com.bnyer.img.vo.TypeVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgsVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgsVo.java new file mode 100644 index 0000000..a95d61b --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgsVo.java @@ -0,0 +1,48 @@ +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; +import java.util.List; + + +@Getter +@Setter +@ApiModel("艺术家图片响应类") +public class CreatorTypeImgsVo 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 sort; + + @ApiModelProperty(value="简介") + private String intro; + + @ApiModelProperty(value="图片总数量") + private Integer imgTotalNum; + + @ApiModelProperty(value="图片收藏数量") + private Integer imgCollectionNum; + + @ApiModelProperty(value="图片喜欢数量") + private Integer imgLikeNum; + + @ApiModelProperty(value="分类图片列表") + List typeImgList; + + private static final long serialVersionUID = 1L; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeImgVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeImgVo.java new file mode 100644 index 0000000..02800e6 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeImgVo.java @@ -0,0 +1,27 @@ +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; +import java.util.List; + + +@Getter +@Setter +@ApiModel("分类图片响应类") +public class TypeImgVo implements Serializable { + + @ApiModelProperty(value="typeId") + private Long typeId; + + @ApiModelProperty(value="分类类型") + private String typeName; + + @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 86db86e..7068147 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 @@ -37,6 +37,20 @@ + + + + + + + + + + + + + + id, `name`,open_id, scan_code, phone, img, intro, invite_code, url, status, is_hot, is_show, create_time, @@ -54,7 +68,7 @@ order by ic.create_time desc - select 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, diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml index dfbb376..8078489 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml @@ -61,6 +61,15 @@ order by create_time desc limit 3 + + + + \ No newline at end of file