feature1.0.0-img: 优化图片显示接口

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,"该艺术家不存在!");
         }

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<Creator> {
      * @param scanCode 搜索码
      * @return -
      */
-    CreatorVo queryThreeImgCreatorListByScanCode(@Param("scanCode") String scanCode);
+    CreatorTypeImgsVo queryThreeImgCreatorListByScanCode(@Param("scanCode") String scanCode);
 
     /**
      * 查询艺术家分页

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java

@@ -45,4 +45,11 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
      * @return -
      */
     List<TiktokImgVo> queryFrontPage();
+
+    /**
+     * 根据艺术家查询图片列表
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<TiktokImgVo> queryTypeImgList(@Param("creatorId") Long creatorId);
 }

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<Type> {
      * @return
      */
     List<TypeVo> queryList();
+
+    /**
+     * 根据艺术家id查询分类图片列表
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<TypeImgVo> queryTypeImgsList(@Param("creatorId") Long creatorId);
 }

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);
 
     /**
      * 变更显示状态

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);
+
 }

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);
     }
 

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;

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<TypeImgVo> typeImgList;
+
+    private static final long serialVersionUID = 1L;
+}

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<TiktokImgVo> imgList;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml

@@ -37,6 +37,20 @@
     <result column="imgLikeNum" jdbcType="INTEGER" property="imgLikeNum" />
     <collection property="imgList" ofType="com.bnyer.img.vo.TiktokImgVo" select="com.bnyer.img.mapper.TiktokImgMapper.queryThreeImgs" column="id"/>
   </resultMap>
+
+  <resultMap id="CreatorTypeImgsList" type="com.bnyer.img.vo.CreatorTypeImgsVo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="scanCode" jdbcType="VARCHAR" property="scanCode" />
+    <result column="img" jdbcType="VARCHAR" property="img" />
+    <result column="isHot" jdbcType="CHAR" property="isHot" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="intro" jdbcType="VARCHAR" property="intro" />
+    <result column="imgTotalNum" jdbcType="INTEGER" property="imgTotalNum" />
+    <result column="imgCollectionNum" jdbcType="INTEGER" property="imgCollectionNum" />
+    <result column="imgLikeNum" jdbcType="INTEGER" property="imgLikeNum" />
+    <collection property="typeImgList" ofType="com.bnyer.img.vo.CreatorTypeImgsVo" select="com.bnyer.img.mapper.TypeMapper.queryTypeImgsList" column="id"/>
+  </resultMap>
+
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     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>
 
-  <select  id="queryThreeImgCreatorListByScanCode" resultMap="CreatorThreeList">
+  <select  id="queryThreeImgCreatorListByScanCode" resultMap="CreatorTypeImgsList">
     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,

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml

@@ -61,6 +61,15 @@
     order by create_time desc
     limit 3
   </select>
+
+  <select id="queryTypeImgList" resultType="com.bnyer.img.vo.TiktokImgVo">
+    select
+    id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot
+    from img_tiktok_img
+    where creator_id = #{creatorId} and is_show = '1' and status = '1'
+    order by create_time desc
+  </select>
+
   <select id="queryDetails" resultType="com.bnyer.img.vo.TiktokImgVo">
     select
         id,img_url,creator_id,type_id,download_num, great_num, collection_num,status,is_hot

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TypeMapper.xml

@@ -11,6 +11,22 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
   </resultMap>
+
+  <resultMap id="typeImgList" type="com.bnyer.img.vo.TypeImgVo">
+    <id column="typeId" jdbcType="BIGINT" property="typeId" />
+    <result column="typeName" jdbcType="VARCHAR" property="typeName" />
+    <collection property="imgList" ofType="com.bnyer.img.vo.TiktokImgVo">
+      <id column="id" jdbcType="BIGINT" property="id" />
+      <result column="imgUrl" jdbcType="VARCHAR" property="imgUrl" />
+      <result column="creatorId" jdbcType="BIGINT" property="creatorId" />
+      <result column="typeId" jdbcType="BIGINT" property="typeId" />
+      <result column="downloadNum" jdbcType="INTEGER" property="downloadNum" />
+      <result column="greatNum" jdbcType="INTEGER" property="greatNum" />
+      <result column="collectionNum" jdbcType="INTEGER" property="collectionNum" />
+      <result column="status" jdbcType="CHAR" property="status" />
+      <result column="isHot" jdbcType="CHAR" property="isHot" />
+    </collection>
+  </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, type_name, is_show, create_time, update_time, sort
@@ -23,4 +39,15 @@
     where is_show = '1'
     order by sort asc
   </select>
+  <select id="queryTypeImgsList" resultMap="typeImgList">
+    select
+        it.id as typeId,it.type_name as typeName,
+        iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,iti.type_id as TypeId,
+        iti.download_num as downloadNum,iti.great_num as greatNum,iti.collection_num as collectionNum,
+        iti.status as status,iti.is_hot as isHot
+    from img_type it
+    join img_tiktok_img iti on iti.type_id = it.id
+    where iti.is_show = '1' and iti.status = '1' and iti.creator_id = #{creatorId}
+    order by iti.create_time desc
+  </select>
 </mapper>