feature-1.0-img: 添加返回分类id字段

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

@@ -15,9 +15,7 @@ import com.bnyer.img.mapper.TiktokCollectionMapper;
 import com.bnyer.img.mapper.TiktokImgMapper;
 import com.bnyer.img.mapper.TiktokLikeMapper;
 import com.bnyer.img.service.TiktokImgService;
-import com.bnyer.img.vo.CreatorTypeImgVo;
-import com.bnyer.img.vo.ImgSignVo;
-import com.bnyer.img.vo.TiktokImgVo;
+import com.bnyer.img.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -153,18 +151,36 @@ public class TiktokImgServiceImpl implements TiktokImgService {
     @Override
     public CreatorTypeImgVo queryCreatorTypeImgNum(Long creatorId) {
         Integer headNum = tiktokImgMapper.queryCreatorTypeImgNum(1L, creatorId);
+        CreatorTypeImgHeadVo headInfo = new CreatorTypeImgHeadVo();
+        headInfo.setHeadNum(headNum);
+        headInfo.setTypeId(1L);
         Integer gifNum = tiktokImgMapper.queryCreatorTypeImgNum(2L, creatorId);
+        CreatorTypeImgGifVo gifInfo = new CreatorTypeImgGifVo();
+        gifInfo.setGifNum(gifNum);
+        gifInfo.setTypeId(2L);
         Integer backNum = tiktokImgMapper.queryCreatorTypeImgNum(3L, creatorId);
+        CreatorTypeImgBackVo backInfo = new CreatorTypeImgBackVo();
+        backInfo.setBackNum(backNum);
+        backInfo.setTypeId(3L);
         Integer friendNum = tiktokImgMapper.queryCreatorTypeImgNum(4L, creatorId);
+        CreatorTypeImgFriendVo friendInfo = new CreatorTypeImgFriendVo();
+        friendInfo.setFriendNum(friendNum);
+        friendInfo.setTypeId(4L);
         Integer emoNum = tiktokImgMapper.queryCreatorTypeImgNum(5L, creatorId);
+        CreatorTypeImgEmoVo emoInfo = new CreatorTypeImgEmoVo();
+        emoInfo.setEmoNum(emoNum);
+        emoInfo.setTypeId(5L);
         Integer watchNum = tiktokImgMapper.queryCreatorTypeImgNum(6L, creatorId);
+        CreatorTypeImgWatchVo watchInfo = new CreatorTypeImgWatchVo();
+        watchInfo.setWatchNum(watchNum);
+        watchInfo.setTypeId(6L);
         CreatorTypeImgVo result = new CreatorTypeImgVo();
-        result.setHeadNum(headNum);
-        result.setGifNum(gifNum);
-        result.setBackNum(backNum);
-        result.setFriendNum(friendNum);
-        result.setEmoNum(emoNum);
-        result.setWatchNum(watchNum);
+        result.setHeaderInfo(headInfo);
+        result.setGifInfo(gifInfo);
+        result.setBackInfo(backInfo);
+        result.setFriendInfo(friendInfo);
+        result.setEmoInfo(emoInfo);
+        result.setWatchInfo(watchInfo);
         return result;
     }
 

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgBackVo.java

@@ -0,0 +1,23 @@
+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 CreatorTypeImgBackVo implements Serializable {
+
+    @ApiModelProperty(value="手机壁纸数量")
+    private Integer backNum;
+
+    @ApiModelProperty(value="分类Id")
+    private Long typeId;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgEmoVo.java

@@ -0,0 +1,23 @@
+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 CreatorTypeImgEmoVo implements Serializable {
+
+    @ApiModelProperty(value="表情包数量")
+    private Integer emoNum;
+
+    @ApiModelProperty(value="分类Id")
+    private Long typeId;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgFriendVo.java

@@ -0,0 +1,23 @@
+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 CreatorTypeImgFriendVo implements Serializable {
+
+    @ApiModelProperty(value="朋友圈背景数量")
+    private Integer friendNum;
+
+    @ApiModelProperty(value="分类Id")
+    private Long typeId;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgGifVo.java

@@ -0,0 +1,23 @@
+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("艺术家分类图片Gif数量响应体")
+public class CreatorTypeImgGifVo implements Serializable {
+
+    @ApiModelProperty(value="gif动图数量")
+    private Integer gifNum;
+
+    @ApiModelProperty(value="分类Id")
+    private Long typeId;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgHeadVo.java

@@ -0,0 +1,23 @@
+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 CreatorTypeImgHeadVo implements Serializable {
+
+    @ApiModelProperty(value="头像数量")
+    private Integer headNum;
+
+    @ApiModelProperty(value="分类Id")
+    private Long typeId;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgVo.java

@@ -13,23 +13,29 @@ import java.io.Serializable;
 @ApiModel("艺术家分类图片数量响应体")
 public class CreatorTypeImgVo implements Serializable {
 
-    @ApiModelProperty(value="头像数量")
-    private Integer headNum;
 
-    @ApiModelProperty(value="gif动图数量")
-    private Integer gifNum;
+    @ApiModelProperty(value="头像信息")
+    CreatorTypeImgHeadVo headerInfo;
 
-    @ApiModelProperty(value="手机壁纸数量")
-    private Integer backNum;
 
-    @ApiModelProperty(value="朋友圈背景数量")
-    private Integer friendNum;
+    @ApiModelProperty(value="gif动图信息")
+    CreatorTypeImgGifVo gifInfo;
 
-    @ApiModelProperty(value="表情包数量")
-    private Integer emoNum;
 
-    @ApiModelProperty(value="iwatch数量")
-    private Integer watchNum;
+    @ApiModelProperty(value="手机壁纸信息")
+    CreatorTypeImgBackVo backInfo;
+
+
+    @ApiModelProperty(value="朋友圈背景信息")
+    CreatorTypeImgFriendVo friendInfo;
+
+
+    @ApiModelProperty(value="表情包信息")
+    CreatorTypeImgEmoVo emoInfo;
+
+
+    @ApiModelProperty(value="iwatch信息")
+    CreatorTypeImgWatchVo watchInfo;
 
     private static final long serialVersionUID = 1L;
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorTypeImgWatchVo.java

@@ -0,0 +1,23 @@
+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("艺术家分类图片iwatch数量响应体")
+public class CreatorTypeImgWatchVo implements Serializable {
+
+    @ApiModelProperty(value="iwatch数量")
+    private Integer watchNum;
+
+    @ApiModelProperty(value="分类Id")
+    private Long typeId;
+
+    private static final long serialVersionUID = 1L;
+}