feature1.0.0-img:优化艺术家图片分页

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java

@@ -8,7 +8,7 @@ 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.CreatorTypeImgsVo;
+import com.bnyer.img.vo.CreatorDetailsVo;
 import com.bnyer.img.vo.TiktokImgVo;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
@@ -101,10 +101,19 @@ public class FhMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="根据搜索码查询艺术家图片列表")
-    @PostMapping(value = "/creatorImgsDetails")
-    public AjaxResult creatorImgsDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
-        CreatorTypeImgsVo creatorVo = creatorService.queryCreatorImgListByScanCode(params.getScanCode());
+    @ApiOperation(value="根据搜索码和分类id查询艺术家图片分页")
+    @PostMapping(value = "/typeImgsPage")
+    public TableDataInfo typeImgsPage(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        List<TiktokImgVo> imgList = tiktokImgService.queryImgsByScanCodeAndTypeId(params.getScanCode(), params.getTypeId());
+        return getDataTable(imgList);
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="根据搜索码查询艺术家详情")
+    @PostMapping(value = "/creatorDetails")
+    public AjaxResult creatorDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorDetailsDto params){
+        CreatorDetailsVo creatorVo = creatorService.queryCreatorDetailsByScanCode(params.getScanCode());
         if(creatorVo == null){
             return AjaxResult.error(TiktokConstant.TIKTOK_CREATOR_NOT_EXIST,"该艺术家不存在!");
         }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java

@@ -1,6 +1,8 @@
 package com.bnyer.img.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
+import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.web.controller.BaseController;
 import com.bnyer.common.core.web.domain.AjaxResult;
 import com.bnyer.common.core.web.page.TableDataInfo;
@@ -8,9 +10,7 @@ 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.CreatorTypeImgsVo;
-import com.bnyer.img.vo.TiktokImgVo;
-import com.bnyer.img.vo.TypeImgVo;
+import com.bnyer.img.vo.*;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -98,14 +99,31 @@ public class TiktokMiniController extends BaseController {
     @PostMapping(value = "/creatorImgsPage")
     public TableDataInfo creatorImgsPage(@RequestBody @ApiParam("分页对象") BasePageDto dto){
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
-        return getDataTable(creatorService.queryThreeImgCreatorList());
+        //List<CreatorVo> list = new ArrayList<>();
+        List<CreatorVo> creatorVos = creatorService.queryThreeImgCreatorList();
+//        for (CreatorVo creatorVo : creatorVos) {
+//            if(CollectionUtil.isNotEmpty(creatorVo.getImgList())){
+//                list.add(creatorVo);
+//            }
+//        }
+        //TODO 此处图片列表为空时，去除为空的部分分页会有BUG
+        return getDataTable(creatorVos);
     }
 
     //@TokenCheck
-    @ApiOperation(value="根据搜索码查询艺术家图片列表")
-    @PostMapping(value = "/creatorImgsDetails")
-    public AjaxResult creatorImgsDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
-        CreatorTypeImgsVo creatorVo = creatorService.queryCreatorImgListByScanCode(params.getScanCode());
+    @ApiOperation(value="根据搜索码和分类id查询艺术家图片分页")
+    @PostMapping(value = "/typeImgsPage")
+    public TableDataInfo typeImgsPage(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        List<TiktokImgVo> imgList = tiktokImgService.queryImgsByScanCodeAndTypeId(params.getScanCode(), params.getTypeId());
+        return getDataTable(imgList);
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="根据搜索码查询艺术家详情")
+    @PostMapping(value = "/creatorDetails")
+    public AjaxResult creatorDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorDetailsDto params){
+        CreatorDetailsVo creatorVo = creatorService.queryCreatorDetailsByScanCode(params.getScanCode());
         if(creatorVo == null){
             return AjaxResult.error(TiktokConstant.TIKTOK_CREATOR_NOT_EXIST,"该艺术家不存在!");
         }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java

@@ -8,7 +8,7 @@ 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.CreatorTypeImgsVo;
+import com.bnyer.img.vo.CreatorDetailsVo;
 import com.bnyer.img.vo.TiktokImgVo;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
@@ -101,10 +101,19 @@ public class WxMiniController extends BaseController {
     }
 
     //@TokenCheck
-    @ApiOperation(value="根据搜索码查询艺术家图片列表")
-    @PostMapping(value = "/creatorImgsDetails")
-    public AjaxResult creatorImgsDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
-        CreatorTypeImgsVo creatorVo = creatorService.queryCreatorImgListByScanCode(params.getScanCode());
+    @ApiOperation(value="根据搜索码和分类id查询艺术家图片分页")
+    @PostMapping(value = "/typeImgsPage")
+    public TableDataInfo typeImgsPage(@Validated @RequestBody @ApiParam("搜索码对象") CreatorImgsDetailsDto params){
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        List<TiktokImgVo> imgList = tiktokImgService.queryImgsByScanCodeAndTypeId(params.getScanCode(), params.getTypeId());
+        return getDataTable(imgList);
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="根据搜索码查询艺术家详情")
+    @PostMapping(value = "/creatorDetails")
+    public AjaxResult creatorDetails(@Validated @RequestBody @ApiParam("搜索码对象") CreatorDetailsDto params){
+        CreatorDetailsVo creatorVo = creatorService.queryCreatorDetailsByScanCode(params.getScanCode());
         if(creatorVo == null){
             return AjaxResult.error(TiktokConstant.TIKTOK_CREATOR_NOT_EXIST,"该艺术家不存在!");
         }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDetailsDto.java

@@ -0,0 +1,20 @@
+package com.bnyer.img.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Getter
+@Setter
+@ApiModel("首页艺术家详情接收类")
+public class CreatorDetailsDto implements Serializable {
+
+    @NotBlank(message = "搜索码不能为空！")
+    @ApiModelProperty(value="搜索码")
+    private String scanCode;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorImgsDetailsDto.java

@@ -6,15 +6,17 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 
 
 @Getter
 @Setter
-@ApiModel("首页艺术家详情接收类")
-public class CreatorImgsDetailsDto implements Serializable {
+@ApiModel("首页艺术家图片详情接收类")
+public class CreatorImgsDetailsDto extends BasePageDto {
 
     @NotBlank(message = "搜索码不能为空！")
     @ApiModelProperty(value="搜索码")
     private String scanCode;
+
+    @ApiModelProperty(value="分类id")
+    private Long typeId;
 }

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

@@ -3,9 +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.CreatorTypeImgsVo;
-import com.bnyer.img.vo.CreatorVo;
+import com.bnyer.img.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,13 +22,6 @@ public interface CreatorMapper extends BaseMapper<Creator> {
      */
     List<CreatorVo> queryThreeImgCreatorList();
 
-    /**
-     * 根据搜索码查询艺术家信息
-     * @param scanCode 搜索码
-     * @return -
-     */
-    CreatorTypeImgsVo queryThreeImgCreatorListByScanCode(@Param("scanCode") String scanCode);
-
     /**
      * 查询艺术家分页
      * @param params 分页参数
@@ -57,4 +48,11 @@ public interface CreatorMapper extends BaseMapper<Creator> {
      * @return -
      */
     String queryCreatorScanCodeById(@Param("id") Long id);
+
+    /**
+     * 查询艺术家详情信息
+     * @param scanCode 搜索码
+     * @return
+     */
+    CreatorDetailsVo queryCreatorDetailsByScanCode(@Param("scanCode") String scanCode);
 }

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

@@ -52,4 +52,12 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
      * @return -
      */
     List<TiktokImgVo> queryTypeImgList(@Param("creatorId") Long creatorId);
+
+    /**
+     * 根据搜索码和分类Id查询艺术家分类图片
+     * @param scanCode 搜索码
+     * @param typeId 分类id
+     * @return -
+     */
+    List<TiktokImgVo> queryImgsByScanCodeAndTypeId(@Param("scanCode") String scanCode,@Param("typeId") Long typeId);
 }

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

@@ -2,7 +2,7 @@ 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.CreatorTypeVo;
 import com.bnyer.img.vo.TypeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,9 +19,9 @@ public interface TypeMapper extends BaseMapper<Type> {
     List<TypeVo> queryList();
 
     /**
-     * 根据艺术家id查询分类图片列表
-     * @param creatorId 艺术家id
+     * 查询用户分类
+     * @param scanCode 搜索码
      * @return -
      */
-    List<TypeImgVo> queryTypeImgsList(@Param("creatorId") Long creatorId);
+    List<CreatorTypeVo> queryCreatorType(@Param("scanCode") String scanCode);
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java

@@ -5,9 +5,7 @@ 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 com.bnyer.img.vo.*;
 
 import java.util.List;
 import java.util.Map;
@@ -60,11 +58,11 @@ public interface CreatorService {
     List<CreatorVo> queryThreeImgCreatorList();
 
     /**
-     * 根据搜索码查询艺术家
+     * 根据搜索码查询艺术家详情
      * @param scanCode 搜索码
      * @return -
      */
-    CreatorTypeImgsVo queryCreatorImgListByScanCode(String scanCode);
+    CreatorDetailsVo queryCreatorDetailsByScanCode(String scanCode);
 
     /**
      * 变更显示状态

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java

@@ -107,4 +107,12 @@ public interface TiktokImgService {
      * @return -
      */
     List<TiktokImgVo> queryFrontPage();
+
+    /**
+     * 根据搜索码和分类Id查询艺术家分类图片
+     * @param scanCode 搜索码
+     * @param typeId 分类id
+     * @return -
+     */
+    List<TiktokImgVo> queryImgsByScanCodeAndTypeId(String scanCode,Long typeId);
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java

@@ -1,7 +1,6 @@
 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;
@@ -57,5 +56,4 @@ public interface TypeService {
      * @return -
      */
     int changeStatus(Long id,String status);
-
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java

@@ -1,6 +1,5 @@
 package com.bnyer.img.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -206,8 +205,8 @@ public class CreatorServiceImpl implements CreatorService {
     }
 
     @Override
-    public CreatorTypeImgsVo queryCreatorImgListByScanCode(String scanCode) {
-        return creatorMapper.queryThreeImgCreatorListByScanCode(scanCode);
+    public CreatorDetailsVo queryCreatorDetailsByScanCode(String scanCode) {
+        return creatorMapper.queryCreatorDetailsByScanCode(scanCode);
     }
 
     @Override

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java

@@ -184,4 +184,9 @@ public class TiktokImgServiceImpl implements TiktokImgService {
     public List<TiktokImgVo> queryFrontPage() {
         return tiktokImgMapper.queryFrontPage();
     }
+
+    @Override
+    public List<TiktokImgVo> queryImgsByScanCodeAndTypeId(String scanCode, Long typeId) {
+        return tiktokImgMapper.queryImgsByScanCodeAndTypeId(scanCode,typeId);
+    }
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java

@@ -3,11 +3,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;
-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 → bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorDetailsVo.java

@@ -11,8 +11,8 @@ import java.util.List;
 
 @Getter
 @Setter
-@ApiModel("艺术家图片响应类")
-public class CreatorTypeImgsVo implements Serializable {
+@ApiModel("艺术家详情响应类")
+public class CreatorDetailsVo implements Serializable {
 
     @ApiModelProperty(value="id")
     private Long id;
@@ -41,8 +41,8 @@ public class CreatorTypeImgsVo implements Serializable {
     @ApiModelProperty(value="图片喜欢数量")
     private Integer imgLikeNum;
 
-    @ApiModelProperty(value="分类图片列表")
-    List<TypeImgVo> typeImgList;
+    @ApiModelProperty(value="分类列表")
+    private List<CreatorTypeVo> typeList;
 
     private static final long serialVersionUID = 1L;
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/TypeImgVo.java → bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeVo.java

@@ -6,13 +6,12 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 @Getter
 @Setter
-@ApiModel("分类图片响应类")
-public class TypeImgVo implements Serializable {
+@ApiModel("用户分类响应类")
+public class CreatorTypeVo implements Serializable {
 
     @ApiModelProperty(value="typeId")
     private Long typeId;
@@ -20,8 +19,5 @@ public class TypeImgVo implements Serializable {
     @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

@@ -38,7 +38,7 @@
     <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">
+  <resultMap id="CreatorTypeList" type="com.bnyer.img.vo.CreatorDetailsVo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="scanCode" jdbcType="VARCHAR" property="scanCode" />
     <result column="img" jdbcType="VARCHAR" property="img" />
@@ -48,7 +48,7 @@
     <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"/>
+    <collection property="typeList" ofType="com.bnyer.img.vo.CreatorTypeVo" select="com.bnyer.img.mapper.TypeMapper.queryCreatorType" column="scanCode"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -64,20 +64,10 @@
         (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'
+    where ic.is_show = '1' and ic.status = '1'
     order by ic.create_time desc
   </select>
 
-  <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,
-        (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}
-  </select>
-
   <select id="queryPage" resultMap="BaseResultMap">
     select
         <include refid="Base_Column_List"/>
@@ -127,6 +117,7 @@
 		ic.id,ic.scan_code,ic.is_hot,ic.img,
 		(select sum(download_num+great_num+collection_num) from img_tiktok_img where creator_id = ic.id) as hotNum
 	from img_creator ic
+    where ic.status = '1' and ic.is_show = '1'
 	order by hotNum desc limit 10
   </select>
   <select id="queryCreatorScanCodeById" resultType="java.lang.String">
@@ -135,4 +126,14 @@
     from img_creator
     where status = '1' and is_show = '1' and id = #{id}
   </select>
+
+  <select id="queryCreatorDetailsByScanCode" resultMap="CreatorTypeList">
+    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,
+        (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.status = '1' and ic.scan_code = #{scanCode}
+  </select>
 </mapper>

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

@@ -82,4 +82,15 @@
       from img_tiktok_img
       where is_show = '1' and status = '1'
     </select>
+
+  <select id="queryImgsByScanCodeAndTypeId" resultType="com.bnyer.img.vo.TiktokImgVo">
+    select
+        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_tiktok_img iti
+    join img_creator ic on iti.creator_id = ic.id
+    where iti.is_show = '1' and iti.status = '1'
+    and ic.scan_code = #{scanCode} and iti.type_id = #{typeId}
+  </select>
 </mapper>

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

@@ -12,21 +12,6 @@
     <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
@@ -39,15 +24,15 @@
     where is_show = '1'
     order by sort asc
   </select>
-  <select id="queryTypeImgsList" resultMap="typeImgList">
+
+  <select id="queryCreatorType" resultType="com.bnyer.img.vo.CreatorTypeVo">
     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
+        it.id as typeId,it.type_name as typeName
+    from img_tiktok_img iti
+    join img_type it on it.id = iti.type_id
+    join img_creator ic on ic.id = iti.creator_id
+    where ic.scan_code = #{scanCode}
+    group by iti.type_id
+    order by it.sort asc
   </select>
 </mapper>