增加用户信息

cdp-common/cdp-common-core/src/main/java/com/baiye/core/convert/StringConverterListJson.java

@@ -0,0 +1,23 @@
+package com.baiye.core.convert;
+
+import cn.hutool.json.JSONUtil;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+/**
+ * @author Enzo
+ * @date : 2021/12/28
+ */
+@Converter
+public class StringConverterListJson implements AttributeConverter<Object, String> {
+    @Override
+    public String convertToDatabaseColumn(Object obj) {
+        return JSONUtil.toJsonStr(obj);
+    }
+
+    @Override
+    public Object convertToEntityAttribute(String s) {
+        return JSONUtil.parseArray(s);
+    }
+}

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SaveSopCommentDTO.java

@@ -20,6 +20,8 @@ public class SaveSopCommentDTO {
     @ApiModelProperty(value = "小组id")
     private Long organizeId;
 
+    @ApiModelProperty(value = "sopId")
+    private Long sopId;
 
     private List<TiktokSopCommentVideoDTO> dtoList;
 
@@ -51,5 +53,7 @@ public class SaveSopCommentDTO {
         @ApiModelProperty(value = "评论使用设备号")
         private String dyVendorId;
 
+        @ApiModelProperty(value = "用户信息")
+        private UserDTO userDTO;
     }
 }

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/TiktokMemberDTO.java

@@ -1,10 +1,13 @@
 package com.baiye.dto;
 
+import com.baiye.core.convert.StringConverterListJson;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Convert;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Enzo
@@ -47,4 +50,8 @@ public class TiktokMemberDTO implements Serializable {
 
     @ApiModelProperty("视频id")
     private String videoId;
+
+    @ApiModelProperty(value = "sopId")
+    @Convert(converter = StringConverterListJson.class)
+    private List<String> sopStr;
 }

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/UserDTO.java

@@ -0,0 +1,55 @@
+package com.baiye.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2022/10/19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserDTO implements Serializable {
+
+    @JsonProperty("uid")
+    private Long uid;
+
+    @JsonProperty("gender")
+    private Integer gender;
+
+    @JsonProperty("is_star")
+    private String isStar;
+
+    @JsonProperty("city")
+    private String city;
+
+    @JsonProperty("location")
+    private String location;
+
+    @JsonProperty("country")
+    private String country;
+
+    @JsonProperty("province")
+    private String province;
+
+    @JsonProperty("nickname")
+    private String nickname;
+
+    @JsonProperty("unique_id")
+    private String uniqueId;
+
+    @JsonProperty("avatar_medium")
+    private AvatarMedium avatarMedium;
+
+    @Getter
+    @Setter
+    @AllArgsConstructor
+    public class AvatarMedium implements Serializable {
+        @JsonProperty("url_list")
+        private List<String> urlList;
+    }
+}

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/TiktokMember.java

@@ -1,13 +1,17 @@
 package com.baiye.entity;
 
+import com.baiye.core.convert.EmojiConverterListJson;
+import com.baiye.core.convert.StringConverterListJson;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.Convert;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Enzo
@@ -49,6 +53,10 @@ public class TiktokMember  implements Serializable {
     @ApiModelProperty(value = "城市")
     private String city;
 
+    @Convert(converter = StringConverterListJson.class)
+    @ApiModelProperty(value = "sopId")
+    private List<Long> sopStr;
+
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/response/TiktokSearchMemberResponse.java

@@ -1,12 +1,11 @@
 package com.baiye.api.response;
 
 import com.baiye.core.base.api.BaseTiktokResponse;
+import com.baiye.dto.UserDTO;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
+import lombok.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -25,6 +24,9 @@ public class TiktokSearchMemberResponse extends BaseTiktokResponse<TiktokSearchM
     @NoArgsConstructor
     public class User {
 
+        @JsonProperty("uid")
+        private Long uid;
+
         @JsonProperty("gender")
         private Integer gender;
 
@@ -50,7 +52,13 @@ public class TiktokSearchMemberResponse extends BaseTiktokResponse<TiktokSearchM
         private String uniqueId;
 
         @JsonProperty("avatar_medium")
-        private List<String> avatarMedium;
+        private AvatarMedium avatarMedium;
+
+        @Data
+        public class AvatarMedium implements Serializable {
+            @JsonProperty("url_list")
+            private List<String> urlList;
+        }
 
     }
 

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokMemberService.java

@@ -1,6 +1,7 @@
 package com.baiye.service;
 
 import com.baiye.dto.TiktokMemberDTO;
+import com.baiye.dto.UserDTO;
 import com.baiye.entity.TiktokMember;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -40,4 +41,14 @@ public interface TiktokMemberService  extends IService<TiktokMember> {
      * @return
      */
     Long saveTiktokMember(String tiktokId);
+
+
+    /**
+     * 保存会员信息
+     *
+     * @param userDTO
+     * @param sopId
+     * @return
+     */
+    TiktokMemberDTO saveTiktokMemberByUser(UserDTO userDTO, Long sopId);
 }

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMemberServiceImpl.java

@@ -11,6 +11,7 @@ import com.baiye.core.constant.HttpStatus;
 import com.baiye.core.constant.TiktokRequestConstants;
 import com.baiye.dao.TiktokMemberMapper;
 import com.baiye.dto.TiktokMemberDTO;
+import com.baiye.dto.UserDTO;
 import com.baiye.dto.request.SearchMemberRequestDTO;
 import com.baiye.entity.TiktokMember;
 import com.baiye.mapstruct.TiktokMemberStruct;
@@ -19,11 +20,15 @@ import com.baiye.service.TiktokEquipmentService;
 import com.baiye.service.TiktokMemberService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Enzo
  * @date : 2022/9/22
@@ -83,7 +88,7 @@ public class TiktokMemberServiceImpl extends
             if (ObjectUtil.isNotNull(user) && ObjectUtil.isNotNull(user.getUniqueId())) {
                 Long memberId = IdUtil.getSnowflake(workerId, datacenterId).nextId();
                 TiktokMember tiktokMember = TiktokMember.builder().tiktokId(tiktokId).
-                        avatar(user.getAvatarMedium().get(DefaultNumberConstants.ZERO_NUMBER)).
+                        avatar(user.getAvatarMedium().getUrlList().get(DefaultNumberConstants.ZERO_NUMBER)).
                                 city(user.getCity()).nickname(user.getNickname()).province(user.getProvince()).
                                         gender(user.getGender()).id(memberId).build();
                 return tiktokMemberMapper.insert(tiktokMember) >
@@ -117,4 +122,32 @@ public class TiktokMemberServiceImpl extends
                 DefaultNumberConstants.ZERO_NUMBER ? memberId : DefaultNumberConstants.ZERO_NUMBER;
     }
 
+    @Override
+    public TiktokMemberDTO saveTiktokMemberByUser(UserDTO userDTO, Long sopId) {
+        TiktokMember member = this.getOne
+                (new LambdaQueryWrapper<TiktokMember>()
+                        .eq(TiktokMember::getTiktokId, userDTO.getUid()));
+        if (ObjectUtil.isNotNull(member)) {
+            List<Long> sopStr = member.getSopStr();
+            if (!sopStr.contains(sopId)) {
+                List<Long> strings = member.getSopStr();
+                strings.add(sopId);
+                member.setSopStr(strings);
+                tiktokMemberMapper.insert(member);
+            }
+            return tiktokMemberStruct.toDto(member);
+        }
+        if (ObjectUtil.isNotNull(userDTO) && ObjectUtil.isNotNull(userDTO.getUniqueId())) {
+            List<Long> list = Lists.newArrayList();
+            list.add(sopId);
+            Long memberId = IdUtil.getSnowflake(workerId, datacenterId).nextId();
+            TiktokMember tiktokMember = TiktokMember.builder().tiktokId(userDTO.getUniqueId()).
+                    avatar(userDTO.getAvatarMedium().getUrlList().get(DefaultNumberConstants.ZERO_NUMBER)).
+                            city(userDTO.getCity()).nickname(userDTO.getNickname()).province(userDTO.getProvince()).
+                                    gender(userDTO.getGender()).id(memberId).sopStr(list).build();
+            return tiktokMemberMapper.insert(tiktokMember) >
+                    DefaultNumberConstants.ZERO_NUMBER ? tiktokMemberStruct.toDto(tiktokMember) : null;
+        }
+        return null;
+    }
 }

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokUserMessageServiceImpl.java

@@ -70,7 +70,6 @@ public class TiktokUserMessageServiceImpl implements TiktokUserMessageService {
                         = tiktokEquipmentService.findByDyVendorId(messageRequestDTO.getVendorId());
                 TiktokMemberDTO tiktokMemberDTO = tiktokMemberService.saveTiktokMemberByTiktok
                         (messageRequestDTO.getUserId(), messageRequestDTO.getVendorId());
-
                 // 构建实体
                 TiktokPrivateLetter privateLetter =
                         TiktokPrivateLetter.builder().id(nextId).senderId(Long.parseLong(byDyVendorId.getDyUserId())).

cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoCommentServiceImpl.java

@@ -223,13 +223,13 @@ public class TiktokVideoCommentServiceImpl extends
                         // 评论别人
                         if (Boolean.TRUE.equals(commentVideoDTO.getIsCommentOther())) {
                             TiktokMemberDTO member = tiktokMemberService.
-                                    saveTiktokMemberByTiktok(commentVideoDTO.getChildTiktokId(),searchVendorId);
+                                    saveTiktokMemberByUser(commentVideoDTO.getUserDTO(),dto.getSopId());
                             buildSendMessage(commentsList, dto, longs, commentVideoDTO, member, Boolean.FALSE, Boolean.TRUE);
                         }
                         // 被人评论
                         if (Boolean.FALSE.equals(commentVideoDTO.getIsCommentOther())) {
                             TiktokMemberDTO member = tiktokMemberService.
-                                    saveTiktokMemberByTiktok(commentVideoDTO.getParentTiktokId(), searchVendorId);
+                                    saveTiktokMemberByUser(commentVideoDTO.getUserDTO(), dto.getSopId());
                             buildSendMessage(commentsList, dto, longs, commentVideoDTO, member, Boolean.TRUE, Boolean.FALSE);
                         }
                     }

cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/src/main/java/com/baiye/api/response/TiktokSearchMemberResponse.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -49,9 +50,17 @@ public class TiktokSearchMemberResponse extends BaseTiktokResponse<TiktokSearchM
         @JsonProperty("unique_id")
         private String uniqueId;
 
+
         @JsonProperty("avatar_medium")
-        private List<String> avatarMedium;
+        private AvatarMedium avatarMedium;
 
+        @Getter
+        @Setter
+        @AllArgsConstructor
+        public class AvatarMedium implements Serializable {
+            @JsonProperty("url_list")
+            private List<String> urlList;
+        }
     }