From cd1dd7809ac851ea5345fb9ee5cdeaa6f782d652 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 20 Oct 2022 14:43:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/baiye/dto/SaveSopCommentDTO.java | 2 +- .../dto/{UserDTO.java => TikTokUserDTO.java} | 2 +- .../response/TiktokSearchMemberResponse.java | 1 - .../com/baiye/service/TiktokMemberService.java | 6 +++--- .../service/impl/TiktokMemberServiceImpl.java | 17 ++++++++--------- .../impl/TiktokVideoCommentServiceImpl.java | 4 ++-- 6 files changed, 15 insertions(+), 17 deletions(-) rename cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/{UserDTO.java => TikTokUserDTO.java} (95%) diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SaveSopCommentDTO.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SaveSopCommentDTO.java index ebf1c48..3d17f4a 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SaveSopCommentDTO.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SaveSopCommentDTO.java @@ -54,6 +54,6 @@ public class SaveSopCommentDTO { private String dyVendorId; @ApiModelProperty(value = "用户信息") - private UserDTO userDTO; + private TikTokUserDTO tikTokUserDTO; } } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/UserDTO.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/TikTokUserDTO.java similarity index 95% rename from cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/UserDTO.java rename to cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/TikTokUserDTO.java index 8087d9f..7f999f6 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/UserDTO.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/TikTokUserDTO.java @@ -13,7 +13,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class UserDTO implements Serializable { +public class TikTokUserDTO implements Serializable { @JsonProperty("uid") private Long uid; diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/response/TiktokSearchMemberResponse.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/response/TiktokSearchMemberResponse.java index 9c27634..a77b033 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/response/TiktokSearchMemberResponse.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/api/response/TiktokSearchMemberResponse.java @@ -1,7 +1,6 @@ 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.*; diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokMemberService.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokMemberService.java index 00933b0..2fd5cc8 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokMemberService.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokMemberService.java @@ -1,7 +1,7 @@ package com.baiye.service; import com.baiye.dto.TiktokMemberDTO; -import com.baiye.dto.UserDTO; +import com.baiye.dto.TikTokUserDTO; import com.baiye.entity.TiktokMember; import com.baomidou.mybatisplus.extension.service.IService; @@ -46,9 +46,9 @@ public interface TiktokMemberService extends IService { /** * 保存会员信息 * - * @param userDTO + * @param tikTokUserDTO * @param sopId * @return */ - TiktokMemberDTO saveTiktokMemberByUser(UserDTO userDTO, Long sopId); + TiktokMemberDTO saveTiktokMemberByUser(TikTokUserDTO tikTokUserDTO, Long sopId); } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMemberServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMemberServiceImpl.java index 02b436b..02e5e2f 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMemberServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokMemberServiceImpl.java @@ -11,7 +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.TikTokUserDTO; import com.baiye.dto.request.SearchMemberRequestDTO; import com.baiye.entity.TiktokMember; import com.baiye.mapstruct.TiktokMemberStruct; @@ -26,7 +26,6 @@ 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; /** @@ -123,10 +122,10 @@ public class TiktokMemberServiceImpl extends } @Override - public TiktokMemberDTO saveTiktokMemberByUser(UserDTO userDTO, Long sopId) { + public TiktokMemberDTO saveTiktokMemberByUser(TikTokUserDTO tikTokUserDTO, Long sopId) { TiktokMember member = this.getOne (new LambdaQueryWrapper() - .eq(TiktokMember::getTiktokId, userDTO.getUid())); + .eq(TiktokMember::getTiktokId, tikTokUserDTO.getUid())); if (ObjectUtil.isNotNull(member)) { List sopStr = member.getSopStr(); if (!sopStr.contains(sopId)) { @@ -137,14 +136,14 @@ public class TiktokMemberServiceImpl extends } return tiktokMemberStruct.toDto(member); } - if (ObjectUtil.isNotNull(userDTO) && ObjectUtil.isNotNull(userDTO.getUniqueId())) { + if (ObjectUtil.isNotNull(tikTokUserDTO) && ObjectUtil.isNotNull(tikTokUserDTO.getUniqueId())) { List 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(); + TiktokMember tiktokMember = TiktokMember.builder().tiktokId(tikTokUserDTO.getUniqueId()). + avatar(tikTokUserDTO.getAvatarMedium().getUrlList().get(DefaultNumberConstants.ZERO_NUMBER)). + city(tikTokUserDTO.getCity()).nickname(tikTokUserDTO.getNickname()).province(tikTokUserDTO.getProvince()). + gender(tikTokUserDTO.getGender()).id(memberId).sopStr(list).build(); return tiktokMemberMapper.insert(tiktokMember) > DefaultNumberConstants.ZERO_NUMBER ? tiktokMemberStruct.toDto(tiktokMember) : null; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoCommentServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoCommentServiceImpl.java index 922840e..26bdea7 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokVideoCommentServiceImpl.java +++ b/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. - saveTiktokMemberByUser(commentVideoDTO.getUserDTO(),dto.getSopId()); + saveTiktokMemberByUser(commentVideoDTO.getTikTokUserDTO(),dto.getSopId()); buildSendMessage(commentsList, dto, longs, commentVideoDTO, member, Boolean.FALSE, Boolean.TRUE); } // 被人评论 if (Boolean.FALSE.equals(commentVideoDTO.getIsCommentOther())) { TiktokMemberDTO member = tiktokMemberService. - saveTiktokMemberByUser(commentVideoDTO.getUserDTO(), dto.getSopId()); + saveTiktokMemberByUser(commentVideoDTO.getTikTokUserDTO(), dto.getSopId()); buildSendMessage(commentsList, dto, longs, commentVideoDTO, member, Boolean.TRUE, Boolean.FALSE); } }