修改发送消息

master
bynt 2 years ago
parent 26a0e83dc3
commit 277278a01e

@ -41,7 +41,5 @@ public class OptCommentVideoRequestDTO {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "用户id")
private Long sopId;
}

@ -21,7 +21,8 @@ public class TiktokAccountServiceImpl extends ServiceImpl<TiktokAccountMapper, T
@Override
public List<TiktokAccountEntity> findBySignInStatus(Integer status) {
return tiktokAccountMapper.selectList(new LambdaQueryWrapper<TiktokAccountEntity>().eq(TiktokAccountEntity::getSignInStatus, status));
return tiktokAccountMapper.selectList
(new LambdaQueryWrapper<TiktokAccountEntity>().eq(TiktokAccountEntity::getSignInStatus, status));
}
}

@ -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<TiktokMemberMapper, TiktokMember> implements TiktokMemberService {
public class TiktokMemberServiceImpl extends
ServiceImpl<TiktokMemberMapper, TiktokMember> implements TiktokMemberService {
@Value("${snowflake.workerId}")
private int workerId;
@ -43,7 +43,6 @@ public class TiktokMemberServiceImpl extends ServiceImpl<TiktokMemberMapper, Tik
@Value("${snowflake.datacenterId}")
private int datacenterId;
private final TiktokProperties tiktokProperties;
private final TiktokMemberMapper tiktokMemberMapper;
@ -62,11 +61,11 @@ public class TiktokMemberServiceImpl extends ServiceImpl<TiktokMemberMapper, Tik
}
@Override
@Cacheable(cacheNames = "memberCache",key = "'tiktokId:' + #tiktokId")
public TiktokMemberDTO saveTiktokMemberByTiktok(String tiktokId) {
TiktokMember member = this.getOne
(new LambdaQueryWrapper<TiktokMember>()
.eq(TiktokMember::getTiktokId, tiktokId));
if (ObjectUtil.isNotNull(member)) {
return tiktokMemberStruct.toDto(member);
}

@ -215,74 +215,52 @@ public class TiktokVideoCommentServiceImpl extends
// 视频查询评论列表
List<Long> 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);
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);
}
}
}
}
if (CollUtil.isNotEmpty(commentsList)) {
// 批量插入评论
tiktokVideoCommentMapper.batchInsert(commentsList);
}
}
return Boolean.FALSE;
}
if (Boolean.FALSE.equals(commentVideoDTO.getIsCommentOther())) {
TiktokMemberDTO member = tiktokMemberService.
saveTiktokMemberByTiktok(commentVideoDTO.getChildTiktokId());
private void builSendMessage(List<TiktokVideoComment> commentsList, SaveSopCommentDTO dto, List<Long> 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
(Boolean.TRUE, commentVideoDTO.getDyVendorId(),
(aFalse, commentVideoDTO.getDyVendorId(),
dto.getAwemeId(), commentVideoDTO.getParentTiktokId(),
commentVideoDTO.getParentCommentId(),
commentVideoDTO.getParentCommentContent(), Long.parseLong(member.getId()));
commentVideoDTO.getParentCommentId(), commentVideoDTO.getParentCommentContent(),
Long.parseLong(member.getId()));
commentsList.add(parentComment);
}
// 判断是否包含评论
if (!longs.contains(commentVideoDTO.getChildCommentId())) {
// 构建子类评论
TiktokVideoComment childComment = buildComment
(Boolean.FALSE, commentVideoDTO.getDyVendorId(),
(aTrue, commentVideoDTO.getDyVendorId(),
dto.getAwemeId(), commentVideoDTO.getChildTiktokId(),
commentVideoDTO.getChildCommentId(),
commentVideoDTO.getChildContent(), Long.parseLong(member.getId()));
commentVideoDTO.getChildCommentId(), commentVideoDTO.getChildContent(),
Long.parseLong(member.getId()));
commentsList.add(childComment);
}
// 发送消息
sendMessage(dto, commentVideoDTO, member);
}
}
}
}
}
}
// 批量插入评论
tiktokVideoCommentMapper.batchInsert(commentsList);
}
return Boolean.FALSE;
}
private void sendMessage(SaveSopCommentDTO dto, SaveSopCommentDTO.TiktokSopCommentVideoDTO commentVideoDTO, TiktokMemberDTO member) {

Loading…
Cancel
Save