From 277278a01e498ebe58ea8e622ef3df15a37e65e1 Mon Sep 17 00:00:00 2001 From: bynt Date: Sat, 8 Oct 2022 15:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/OptCommentVideoRequestDTO.java | 2 - .../impl/TiktokAccountServiceImpl.java | 3 +- .../service/impl/TiktokMemberServiceImpl.java | 9 +- .../impl/TiktokVideoCommentServiceImpl.java | 96 +++++++------------ 4 files changed, 43 insertions(+), 67 deletions(-) diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/request/OptCommentVideoRequestDTO.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/request/OptCommentVideoRequestDTO.java index 83cc48e..839fdb7 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/request/OptCommentVideoRequestDTO.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/request/OptCommentVideoRequestDTO.java @@ -41,7 +41,5 @@ public class OptCommentVideoRequestDTO { @ApiModelProperty(value = "用户id") private Long userId; - @ApiModelProperty(value = "用户id") - private Long sopId; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokAccountServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokAccountServiceImpl.java index 37a0e63..676724f 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokAccountServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokAccountServiceImpl.java @@ -21,7 +21,8 @@ public class TiktokAccountServiceImpl extends ServiceImpl findBySignInStatus(Integer status) { - return tiktokAccountMapper.selectList(new LambdaQueryWrapper().eq(TiktokAccountEntity::getSignInStatus, status)); + return tiktokAccountMapper.selectList + (new LambdaQueryWrapper().eq(TiktokAccountEntity::getSignInStatus, status)); } } 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 ba85a11..add56fe 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 @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.json.JSONUtil; import com.baiye.api.TiktokRequestClient; import com.baiye.api.request.TiktokSearchMemberRequest; import com.baiye.api.response.TiktokSearchMemberResponse; @@ -35,7 +34,8 @@ import java.util.List; */ @Service @RequiredArgsConstructor -public class TiktokMemberServiceImpl extends ServiceImpl implements TiktokMemberService { +public class TiktokMemberServiceImpl extends + ServiceImpl implements TiktokMemberService { @Value("${snowflake.workerId}") private int workerId; @@ -43,7 +43,6 @@ public class TiktokMemberServiceImpl extends ServiceImpl() .eq(TiktokMember::getTiktokId, tiktokId)); - if (ObjectUtil.isNotNull(member)) { return tiktokMemberStruct.toDto(member); } @@ -105,7 +104,7 @@ public class TiktokMemberServiceImpl extends ServiceImpl longs = tiktokVideoCommentMapper.selectCommentByVideoId(dto.getAwemeId()); for (SaveSopCommentDTO.TiktokSopCommentVideoDTO commentVideoDTO : dto.getDtoList()) { - // 评论别人 - if (ObjectUtil.isNotNull(commentVideoDTO.getIsCommentOther())) { - // 判断是否包含评论 - if (!longs.contains(commentVideoDTO.getChildCommentId()) && - !longs.contains(commentVideoDTO.getParentCommentId())) { - - if (Boolean.TRUE.equals(commentVideoDTO.getIsCommentOther())) { - TiktokMemberDTO member = tiktokMemberService. - saveTiktokMemberByTiktok(commentVideoDTO.getChildTiktokId()); - if (ObjectUtil.isNotNull(member) && ObjectUtil.isNotNull(member.getId())) { - // 构建父类评论 - TiktokVideoComment parentComment = buildComment - (Boolean.FALSE, commentVideoDTO.getDyVendorId(), - dto.getAwemeId(), commentVideoDTO.getParentTiktokId(), - commentVideoDTO.getParentCommentId(), - commentVideoDTO.getParentCommentContent(), Long.parseLong(member.getId())); - // 构建子类评论 - TiktokVideoComment childComment = buildComment - (Boolean.TRUE, commentVideoDTO.getDyVendorId(), - dto.getAwemeId(), commentVideoDTO.getChildTiktokId(), - commentVideoDTO.getChildCommentId(), - commentVideoDTO.getChildContent(), Long.parseLong(member.getId())); - commentsList.add(parentComment); - commentsList.add(childComment); - sendMessage(dto, commentVideoDTO, member); - } - } - } - - if (Boolean.FALSE.equals(commentVideoDTO.getIsCommentOther())) { - TiktokMemberDTO member = tiktokMemberService. - saveTiktokMemberByTiktok(commentVideoDTO.getChildTiktokId()); - if (ObjectUtil.isNotNull(member) && ObjectUtil.isNotNull(member.getId())) { - if (!longs.contains(commentVideoDTO.getParentCommentId())) { - // 构建父类评论 - TiktokVideoComment parentComment = buildComment - (Boolean.TRUE, commentVideoDTO.getDyVendorId(), - dto.getAwemeId(), commentVideoDTO.getParentTiktokId(), - commentVideoDTO.getParentCommentId(), - commentVideoDTO.getParentCommentContent(), Long.parseLong(member.getId())); - commentsList.add(parentComment); - } - - // 判断是否包含评论 - if (!longs.contains(commentVideoDTO.getChildCommentId())) { - // 构建子类评论 - TiktokVideoComment childComment = buildComment - (Boolean.FALSE, commentVideoDTO.getDyVendorId(), - dto.getAwemeId(), commentVideoDTO.getChildTiktokId(), - commentVideoDTO.getChildCommentId(), - commentVideoDTO.getChildContent(), Long.parseLong(member.getId())); - commentsList.add(childComment); - } - // 发送消息 - sendMessage(dto, commentVideoDTO, member); - } - } + if (Boolean.TRUE.equals(commentVideoDTO.getIsCommentOther())) { + TiktokMemberDTO member = tiktokMemberService. + saveTiktokMemberByTiktok(commentVideoDTO.getChildTiktokId()); + builSendMessage(commentsList, dto, longs, commentVideoDTO, member, Boolean.FALSE, Boolean.TRUE); + } + // 被人评论 + if (Boolean.FALSE.equals(commentVideoDTO.getIsCommentOther())) { + TiktokMemberDTO member = tiktokMemberService. + saveTiktokMemberByTiktok(commentVideoDTO.getParentTiktokId()); + builSendMessage(commentsList, dto, longs, commentVideoDTO, member, Boolean.TRUE, Boolean.FALSE); } } } } - // 批量插入评论 - tiktokVideoCommentMapper.batchInsert(commentsList); + if (CollUtil.isNotEmpty(commentsList)) { + // 批量插入评论 + tiktokVideoCommentMapper.batchInsert(commentsList); + } } return Boolean.FALSE; } + private void builSendMessage(List commentsList, SaveSopCommentDTO dto, List longs, SaveSopCommentDTO.TiktokSopCommentVideoDTO commentVideoDTO, TiktokMemberDTO member, Boolean aFalse, Boolean aTrue) { + if (ObjectUtil.isNotNull(member) && ObjectUtil.isNotNull(member.getId())) { + if (!longs.contains(commentVideoDTO.getParentCommentId())) { + // 构建父类评论 + TiktokVideoComment parentComment = buildComment + (aFalse, commentVideoDTO.getDyVendorId(), + dto.getAwemeId(), commentVideoDTO.getParentTiktokId(), + commentVideoDTO.getParentCommentId(), commentVideoDTO.getParentCommentContent(), + Long.parseLong(member.getId())); + commentsList.add(parentComment); + } + if (!longs.contains(commentVideoDTO.getChildCommentId())) { + // 构建子类评论 + TiktokVideoComment childComment = buildComment + (aTrue, commentVideoDTO.getDyVendorId(), + dto.getAwemeId(), commentVideoDTO.getChildTiktokId(), + commentVideoDTO.getChildCommentId(), commentVideoDTO.getChildContent(), + Long.parseLong(member.getId())); + commentsList.add(childComment); + sendMessage(dto, commentVideoDTO, member); + } + } + } private void sendMessage(SaveSopCommentDTO dto, SaveSopCommentDTO.TiktokSopCommentVideoDTO commentVideoDTO, TiktokMemberDTO member) {