From 6634bc1ddfdea1751801c8908a0ca9a244a5db6c Mon Sep 17 00:00:00 2001 From: wujingtao Date: Sun, 9 Oct 2022 14:49:59 +0800 Subject: [PATCH] =?UTF-8?q?sop=E8=AF=84=E8=AE=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/TiktokRequestConstants.java | 5 ++- .../controller/FollowerListController.java | 6 +++ .../baiye/controller/TiktokSopController.java | 12 +++--- .../TiktokVideoCommentController.java | 20 +++++----- .../TiktokCommentSearchVideoJob.java | 37 +++++++++++++++++++ .../com/baiye/dao/PreciseResourceMapper.java | 2 +- .../com/baiye/dao/ReviewContentMapper.java | 2 - .../com/baiye/dao/RoughResourceMapper.java | 2 +- .../src/main/java/com/baiye/dto/SopDto.java | 6 ++- .../java/com/baiye/entity/CommentEntity.java | 1 + .../com/baiye/entity/FollowerListEntity.java | 2 + .../baiye/entity/PreciseResourceEntity.java | 4 +- .../com/baiye/entity/RoughResourceEntity.java | 4 +- .../main/java/com/baiye/entity/SopEntity.java | 3 +- .../com/baiye/query/PreciseResourceQuery.java | 19 ++++++++++ .../com/baiye/query/RoughResourceQuery.java | 19 ++++++++++ .../main/java/com/baiye/query/SopQuery.java | 2 +- .../baiye/service/FollowerListService.java | 4 ++ .../com/baiye/service/TiktokUserService.java | 11 ++++++ .../service/impl/FollowerListServiceImpl.java | 17 +++++++++ .../TiktokPreciseResourceServiceImpl.java | 2 +- .../impl/TiktokRoughResourceServiceImpl.java | 2 +- .../service/impl/TiktokSopServiceImpl.java | 30 ++++++++++----- .../service/impl/TiktokUserServiceImpl.java | 18 ++++++++- .../main/resources/mapper/KeyWordMapper.xml | 10 ++--- .../mapper/PreciseResourceMapper.xml | 29 +++++++++++---- .../resources/mapper/ReviewContentMapper.xml | 5 --- .../resources/mapper/RoughResourceMapper.xml | 23 +++++++++--- .../main/resources/config/application-dev.yml | 2 +- 29 files changed, 235 insertions(+), 64 deletions(-) create mode 100644 cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/job/dy_tool_member/TiktokCommentSearchVideoJob.java diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/constant/TiktokRequestConstants.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/constant/TiktokRequestConstants.java index 2e6da46..89e1446 100644 --- a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/constant/TiktokRequestConstants.java +++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/constant/TiktokRequestConstants.java @@ -87,7 +87,10 @@ public interface TiktokRequestConstants { * 获取粉丝列表 */ String GET_FOLLOWER_LIST = "/api/user/optFollowerList"; - + /** + * 关注用户 + */ + String GET_FOLLOW_USER ="/api/user/optFollowUser"; /** * 抖音发送私信 diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/FollowerListController.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/FollowerListController.java index 1cc7154..2fd1c80 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/FollowerListController.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/FollowerListController.java @@ -1,5 +1,6 @@ package com.baiye.controller; +import com.baiye.core.base.api.Result; import com.baiye.core.page.PageResult; import com.baiye.query.FollowerListQuery; import com.baiye.service.FollowerListService; @@ -27,4 +28,9 @@ public class FollowerListController { public PageResult queryFollowerList(FollowerListQuery followerListQuery, Pageable pageable) { return followerListService.queryFollowerList(followerListQuery,pageable); } + @GetMapping("follow/user") + @ApiOperation("关注人员") + public Result optFollowUser(String vendorId, String userId) { + return followerListService.optFollowUser(vendorId,userId); + } } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokSopController.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokSopController.java index 1767eee..476f696 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokSopController.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokSopController.java @@ -53,25 +53,27 @@ public class TiktokSopController { return Result.success(); } - @DeleteMapping("delete") + @DeleteMapping("delete/{sopId}") @ApiOperation("删除sop") - public Result deleteSop(Long sopId) { + public Result deleteSop(@PathVariable Long sopId) { tiktokSopService.deleteSop(sopId); return Result.success(); } @GetMapping("search") - public Result search(String dyId){ + public Result search(String dyId) { tiktokSopService.search(dyId); return Result.success(); } + @GetMapping("filterSop") - public Result filterSop(){ + public Result filterSop() { tiktokSopService.filterSop(); return Result.success(); } + @GetMapping("preciseReview") - public Result preciseReview(String dyId){ + public Result preciseReview(String dyId) { tiktokSopService.search(dyId); return Result.success(); } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokVideoCommentController.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokVideoCommentController.java index 7a9aeec..2634612 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokVideoCommentController.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokVideoCommentController.java @@ -7,7 +7,7 @@ import com.baiye.dto.CommentMessageRecordDTO; import com.baiye.entity.TiktokEquipmentEntity; import com.baiye.query.CommentRecordQuery; import com.baiye.service.TiktokVideoCommentService; -import com.baiye.util.SecurityUtils; +//import com.baiye.util.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -38,15 +38,15 @@ public class TiktokVideoCommentController { - @GetMapping("/list") - @ApiOperation("评论列表") - public Result> list(Pageable pageable){ - Long currentUserId = SecurityUtils.getCurrentUserId(); - List commentPage = - this.tiktokVideoCommentService.commentPage(pageable, currentUserId); - return Result.data(commentPage); - - } +// @GetMapping("/list") +// @ApiOperation("评论列表") +// public Result> list(Pageable pageable){ +// Long currentUserId = SecurityUtils.getCurrentUserId(); +// List commentPage = +// this.tiktokVideoCommentService.commentPage(pageable, currentUserId); +// return Result.data(commentPage); +// +// } @ApiOperation("评论消息") @GetMapping("/read") diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/job/dy_tool_member/TiktokCommentSearchVideoJob.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/job/dy_tool_member/TiktokCommentSearchVideoJob.java new file mode 100644 index 0000000..25e5336 --- /dev/null +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/job/dy_tool_member/TiktokCommentSearchVideoJob.java @@ -0,0 +1,37 @@ +package com.baiye.job.dy_tool_member; + +import com.baiye.service.impl.TiktokSopServiceImpl; +import com.dangdang.ddframe.job.api.ShardingContext; +import com.dangdang.ddframe.job.api.simple.SimpleJob; +import com.example.autoconfig.ElasticSimpleJob; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; + +/** + * @author jt + */ +@ElasticSimpleJob(jobName = "TiktokCommentSearchVideoJob", cron = "0 0 0/2 * * ? ") +//@ElasticSimpleJob(jobName = "TiktokCommentSearchVideoJob", cron = "0/1 * * * * ? ", shardingTotalCount = 1, overwrite = true, jobEvent = false) +@Slf4j +@Component +public class TiktokCommentSearchVideoJob implements SimpleJob { + + private static TiktokCommentSearchVideoJob videoJob; +// +// @Resource +// private TiktokSopServiceImpl tiktokSopService; + + @PostConstruct + public void init() { + videoJob = this; + } + + @Override + public void execute(ShardingContext shardingContext) { + log.info("===========================开始执行(评论sop获取视频)定时任务==========================="); +// videoJob.tiktokSopService.search(); + } +} diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/PreciseResourceMapper.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/PreciseResourceMapper.java index d1fca5a..8c53368 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/PreciseResourceMapper.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/PreciseResourceMapper.java @@ -16,7 +16,7 @@ import java.util.List; @Mapper public interface PreciseResourceMapper extends BaseMapper { - List queryPage(@Param("preciseResourceQuery") PreciseResourceQuery preciseResourceQuery, @Param("pageable") Pageable pageable); + List queryPage(@Param("preciseResourceQuery") PreciseResourceQuery preciseResourceQuery ,@Param("pageNumber") Integer pageNumber,@Param("pageSize")Integer pageSize); Long countAll(@Param("preciseResourceQuery") PreciseResourceQuery preciseResourceQuery); diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/ReviewContentMapper.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/ReviewContentMapper.java index 315077a..917f8a8 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/ReviewContentMapper.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/ReviewContentMapper.java @@ -18,6 +18,4 @@ public interface ReviewContentMapper extends BaseMapper { * @param list */ void insertAll(@Param("list") List list); - - void deleteByKeyWordIds(@Param("ids") List ids); } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/RoughResourceMapper.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/RoughResourceMapper.java index 52098f7..8497d06 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/RoughResourceMapper.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dao/RoughResourceMapper.java @@ -16,7 +16,7 @@ import java.util.List; @Mapper public interface RoughResourceMapper extends BaseMapper { - List queryPage(@Param("roughResourceQuery") RoughResourceQuery roughResourceQuery, @Param("pageable") Pageable pageable); + List queryPage(@Param("roughResourceQuery") RoughResourceQuery roughResourceQuery,@Param("pageNumber") Integer pageNumber,@Param("pageSize")Integer pageSize); Long countAll(@Param("roughResourceQuery") RoughResourceQuery roughResourceQuery); diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SopDto.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SopDto.java index bb73470..5e8db67 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SopDto.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/dto/SopDto.java @@ -50,7 +50,11 @@ public class SopDto { */ @ApiModelProperty(value = "描述") private String remake; - + /** + * 描述 + */ + @ApiModelProperty(value = "状态0-未执行 1- 执行") + private Integer status; /** * 点赞数 0-不限制 */ diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/CommentEntity.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/CommentEntity.java index 1ce07e6..d0f6235 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/CommentEntity.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/CommentEntity.java @@ -36,6 +36,7 @@ public class CommentEntity { private String avatarUrl; private String uniqueId; private Long organizeId; + private Integer commentType; @TableField(exist = false) private List> typeMapList; diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/FollowerListEntity.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/FollowerListEntity.java index 818de97..2a257c3 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/FollowerListEntity.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/FollowerListEntity.java @@ -30,6 +30,8 @@ public class FollowerListEntity { private Long sopId; @ApiModelProperty(value = "sop名") private String sopName; + @ApiModelProperty(value = "搜索使用得设备id") + private String vendorId; @ApiModelProperty(value = "视频用户id") private String userId; @ApiModelProperty(value = "视频用户名") diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/PreciseResourceEntity.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/PreciseResourceEntity.java index 81622c9..8360e14 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/PreciseResourceEntity.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/PreciseResourceEntity.java @@ -58,8 +58,8 @@ public class PreciseResourceEntity { /** * 匹配时间 */ - @TableField(value = "create_time", fill = FieldFill.INSERT) + @TableField(value = "match_time", fill = FieldFill.INSERT) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date match; + private Date matchTime; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/RoughResourceEntity.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/RoughResourceEntity.java index 434cdf6..a63497e 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/RoughResourceEntity.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/RoughResourceEntity.java @@ -70,8 +70,8 @@ public class RoughResourceEntity { * 匹配时间 */ @ApiModelProperty(value = "匹配时间") - @TableField(value = "match", fill = FieldFill.INSERT) + @TableField(value = "match_time", fill = FieldFill.INSERT) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date match; + private Date matchTime; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/SopEntity.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/SopEntity.java index d44dcbb..1da7050 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/SopEntity.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/entity/SopEntity.java @@ -19,13 +19,12 @@ import java.util.Date; @TableName("tb_sop") public class SopEntity implements Serializable { - /** * id */ @TableId(value = "sop_id",type = IdType.INPUT) @JsonSerialize(using = ToStringSerializer.class) - @ApiModelProperty(value = "id") + @ApiModelProperty(value = "sop_id") private Long sopId; /** diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/PreciseResourceQuery.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/PreciseResourceQuery.java index 74dc8af..126527d 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/PreciseResourceQuery.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/PreciseResourceQuery.java @@ -1,5 +1,8 @@ package com.baiye.query; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -7,5 +10,21 @@ import lombok.Data; */ @Data public class PreciseResourceQuery { + /** + * 视频id + */ + @TableId(type = IdType.INPUT) + @ApiModelProperty(value = "视频id") + private String awemeId; + + /** + * 视频名称 + */ + @ApiModelProperty(value = "视频名称") + private String awemeName; + /** + * 视频名称 + */ + @ApiModelProperty(value = "sopId") private Long sopId; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/RoughResourceQuery.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/RoughResourceQuery.java index 65fae4a..31f79e9 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/RoughResourceQuery.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/RoughResourceQuery.java @@ -1,5 +1,8 @@ package com.baiye.query; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -7,5 +10,21 @@ import lombok.Data; */ @Data public class RoughResourceQuery { + /** + * 视频id + */ + @TableId(type = IdType.INPUT) + @ApiModelProperty(value = "视频id") + private String awemeId; + + /** + * 视频名称 + */ + @ApiModelProperty(value = "视频名称") + private String awemeName; + /** + * 视频名称 + */ + @ApiModelProperty(value = "sopId") private Long sopId; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/SopQuery.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/SopQuery.java index d9c1267..058aa36 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/SopQuery.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-core/src/main/java/com/baiye/query/SopQuery.java @@ -15,6 +15,6 @@ public class SopQuery { @ApiModelProperty(value = "评论sop 名") private String sopName; @Query - @ApiModelProperty(value = "评论sop 名") + @ApiModelProperty(value = "状态") private Integer status; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/FollowerListService.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/FollowerListService.java index 78d57f8..e816194 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/FollowerListService.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/FollowerListService.java @@ -1,5 +1,6 @@ package com.baiye.service; +import com.baiye.core.base.api.Result; import com.baiye.core.page.PageResult; import com.baiye.query.FollowerListQuery; import org.springframework.data.domain.Pageable; @@ -9,4 +10,7 @@ import org.springframework.data.domain.Pageable; */ public interface FollowerListService { PageResult queryFollowerList(FollowerListQuery followerListQuery, Pageable pageable); + + Result optFollowUser(String vendorId, String userId); + } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokUserService.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokUserService.java index 3e0a03b..44a7855 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokUserService.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/TiktokUserService.java @@ -121,9 +121,20 @@ public interface TiktokUserService { /** * 获取粉丝列表 + * * @param vendorId * @param userId * @return */ Result optFollowerList(String vendorId, String userId); + + /** + *关注用户 + * @param vendorId 设备抖音标识 + * @param userId 用户ID + * @param type 1表示关注，0表示取消关注 + * @param followSourceType 关注来源 默认13， 2-通过朋友推荐;11-别人的粉丝列表里面 ; 13-视频推荐 ; 14-搜索 ; 16-直播间 ; 17-扫一扫 ; 19-评论 ; 20-视频推荐 + * @return + */ + Result optFollowUser(String vendorId, String userId, Integer type, Integer followSourceType); } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/FollowerListServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/FollowerListServiceImpl.java index ee51cb9..c3f5ac4 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/FollowerListServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/FollowerListServiceImpl.java @@ -1,16 +1,21 @@ package com.baiye.service.impl; +import cn.hutool.json.JSONObject; +import com.baiye.core.base.api.Result; +import com.baiye.core.constant.HttpStatus; import com.baiye.core.page.PageResult; import com.baiye.dao.FollowerListMapper; import com.baiye.entity.FollowerListEntity; import com.baiye.query.FollowerListQuery; import com.baiye.service.FollowerListService; +import com.baiye.service.TiktokUserService; import com.baiye.util.PageUtils; import com.baiye.util.QueryHelpUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -18,9 +23,11 @@ import org.springframework.stereotype.Service; * @author jt */ @Service +@Slf4j @RequiredArgsConstructor public class FollowerListServiceImpl implements FollowerListService { private final FollowerListMapper followerListMapper; + private final TiktokUserService userService; @Override public PageResult queryFollowerList(FollowerListQuery followerListQuery, Pageable pageable) { @@ -29,4 +36,14 @@ public class FollowerListServiceImpl implements FollowerListService { IPage selectPage = followerListMapper.selectPage(page, queryWrapper); return PageResult.success(selectPage.getTotal(), selectPage.getPages(), selectPage.getRecords()); } + + @Override + public Result optFollowUser(String vendorId, String userId) { + Result result = userService.optFollowUser(vendorId, userId, 1, 13); + if (result.getCode() == HttpStatus.SUCCESS && result.getData() != null) { + return Result.success("关注成功"); + } + log.info("关注用户 result={}", result); + return Result.fail("关注失败"); + } } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPreciseResourceServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPreciseResourceServiceImpl.java index 00522d5..a02f2ae 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPreciseResourceServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokPreciseResourceServiceImpl.java @@ -24,7 +24,7 @@ public class TiktokPreciseResourceServiceImpl extends ServiceImpl preciseResourceDtos = preciseResourceMapper.queryPage(preciseResourceQuery, pageable); + List preciseResourceDtos = preciseResourceMapper.queryPage(preciseResourceQuery, (pageable.getPageNumber()-1) * pageable.getPageSize(), pageable.getPageSize()); return PageResult.success(integer, preciseResourceDtos); } } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokRoughResourceServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokRoughResourceServiceImpl.java index abc8d1a..c239be3 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokRoughResourceServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokRoughResourceServiceImpl.java @@ -31,7 +31,7 @@ public class TiktokRoughResourceServiceImpl extends ServiceImpl roughResourceDtos = roughResourceMapper.queryPage(roughResourceQuery, pageable); + List roughResourceDtos = roughResourceMapper.queryPage(roughResourceQuery,(pageable.getPageNumber()-1) * pageable.getPageSize(),pageable.getPageSize()); return PageResult.success(integer, roughResourceDtos); } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokSopServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokSopServiceImpl.java index 2c0d598..7b5a6a2 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokSopServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokSopServiceImpl.java @@ -33,7 +33,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.swagger.annotations.ApiModelProperty; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -175,7 +174,6 @@ public class TiktokSopServiceImpl extends ServiceImpl impl List keyWordByFilterKeys = new ArrayList<>(); List keyWordByMatchKeys = new ArrayList<>(); if (CollUtil.isNotEmpty(keyWordEntityList)) { - for (KeyWordEntity keyWord : keyWordEntityList) { if (keyWord.getType() == 0) { keyWordBySearchKeys.add(keyWord); @@ -223,7 +221,7 @@ public class TiktokSopServiceImpl extends ServiceImpl impl return map; } - @Transactional + @Transactional(rollbackFor = Exception.class) @Override public void updateSop(SopEntity sop) { this.updateById(sop); @@ -236,9 +234,13 @@ public class TiktokSopServiceImpl extends ServiceImpl impl sopMapper.deleteById(sopId); //删除关键词 List keyWordIds = keyWordMapper.queryIdbySopIdAndType(sopId, 2); + keyWordMapper.deleteBySopId(sopId); //删除回评内容 - reviewContentMapper.deleteByKeyWordIds(keyWordIds); + + QueryWrapper deleteByKeyWordIds = new QueryWrapper<>(); + deleteByKeyWordIds.in("key_word_id", keyWordIds); + reviewContentMapper.delete(deleteByKeyWordIds); } @@ -271,9 +273,9 @@ public class TiktokSopServiceImpl extends ServiceImpl impl String word = keyWord.getWord(); //搜索 boolean searchValue = reqSearchVideo(dyId, word, sop.getSopId(), sop.getSopName()); - if (searchValue) { - setCache(sop.getSearchInterval(), dyId); - } +// if (searchValue) { +// setCache(sop.getSearchInterval(), dyId); +// } } } @@ -398,7 +400,10 @@ public class TiktokSopServiceImpl extends ServiceImpl impl for (int i = 0; i < array.size(); i++) { JSONObject comment = array.getJSONObject(i); String cid = comment.getStr(DefaultKeyConstants.CID); - //TODO 评论id加缓存 + // 评论id加缓存 + if (redisUtils.get(DefaultKeyConstants.SOP_COMMENT_KEY + cid) != null) { + continue; + } String text = comment.getStr("text"); //评论人 String userId = comment.getJSONObject(DefaultKeyConstants.USER).getStr(DefaultKeyConstants.UID); @@ -418,7 +423,11 @@ public class TiktokSopServiceImpl extends ServiceImpl impl // continue; // } //TODO 进行回评 - userService.optCommentVideoComment(vendorId, awemeId, cid, contentEntities.get(i).getWord(), userId); + Result optCommentVideoCommentResult = userService.optCommentVideoComment(vendorId, awemeId, cid, contentEntities.get(i).getWord(), userId); + if (optCommentVideoCommentResult.getCode() != HttpStatus.SUCCESS) { + //未评论成 + continue; + } //执行完后,加一 Object day = redisUtils.get(DefaultKeyConstants.COMMENT_SOP_DAY); if (day != null) { @@ -450,7 +459,9 @@ public class TiktokSopServiceImpl extends ServiceImpl impl commentEntity.setAvatarUrl(avatarUrl); commentEntity.setUniqueId(comment.getStr(DefaultKeyConstants.UNIQUE_ID)); commentEntity.setOrganizeId(sop.getOrganizeId()); + commentEntity.setCommentType(0); list.add(commentEntity); + redisUtils.set(DefaultKeyConstants.SOP_COMMENT_KEY + cid, DefaultNumberConstants.ZERO_NUMBER); } } } @@ -576,6 +587,7 @@ public class TiktokSopServiceImpl extends ServiceImpl impl followerListEntity.setFollowStatus(0); followerListEntity.setUserId(uid); followerListEntity.setUserNickName(nickname); + followerListEntity.setVendorId(dyId); followerListEntities.add(followerListEntity); } } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokUserServiceImpl.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokUserServiceImpl.java index 11369c6..160a041 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokUserServiceImpl.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/java/com/baiye/service/impl/TiktokUserServiceImpl.java @@ -222,9 +222,25 @@ public class TiktokUserServiceImpl implements TiktokUserService { jsonObject.putOpt("vendorId", vendorId); jsonObject.putOpt("userId", userId); jsonObject.putOpt("offset", DefaultNumberConstants.ZERO_NUMBER); + jsonObject.putOpt("checkLogin", DefaultKeyConstants.TRUE); + jsonObject.putOpt("checkProxyInfo", DefaultKeyConstants.FLASE); + return implementPost(jsonObject, TiktokRequestConstants.GET_FOLLOWER_LIST); + } + return Result.fail(ResultCode.REQUEST_PARAMETER_ERROR.getMsg()); + } + + @Override + public Result optFollowUser(String vendorId, String userId, Integer type, Integer followSourceType) { + if (StringUtils.isNotBlank(vendorId) && StringUtils.isNotBlank(userId)) { + JSONObject jsonObject = new JSONObject(); + jsonObject.putOpt("vendorId", vendorId); + jsonObject.putOpt("userId", userId); + jsonObject.putOpt("type", type); + jsonObject.putOpt("followSourceType", followSourceType); + jsonObject.putOpt("offset", DefaultNumberConstants.ZERO_NUMBER); jsonObject.putOpt("checkLogin", DefaultKeyConstants.FLASE); jsonObject.putOpt("checkProxyInfo", DefaultKeyConstants.TRUE); - return implementPost(jsonObject, TiktokRequestConstants.GET_FOLLOWER_LIST); + return implementPost(jsonObject, TiktokRequestConstants.GET_FOLLOW_USER); } return Result.fail(ResultCode.REQUEST_PARAMETER_ERROR.getMsg()); } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/KeyWordMapper.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/KeyWordMapper.xml index 5626512..9e2b242 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/KeyWordMapper.xml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/KeyWordMapper.xml @@ -20,18 +20,16 @@ - delete - tb_key_word where sop_id = - #{sopId} + delete from tb_key_word where sop_id = #{sopId} diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/PreciseResourceMapper.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/PreciseResourceMapper.xml index aad654d..2440ad2 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/PreciseResourceMapper.xml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/PreciseResourceMapper.xml @@ -12,28 +12,43 @@ - insert into tb_precise_resource (aweme_id,aweme_name,sop_id,organize_id,word,like_num,collect_num,comment_num,forward_num,match) + insert into tb_precise_resource + (aweme_id,aweme_name,sop_id,organize_id,word,like_num,collect_num,comment_num,forward_num,match) values - ( #{item.awemeId}, #{item.awemeName},#{item.sopId},#{item.organizeId},#{item.word},#{item.likeNum},#{item.collectNum},#{item.commentNum},#{item.forwardNum},#{item.match}) + ( #{item.awemeId}, + #{item.awemeName},#{item.sopId},#{item.organizeId},#{item.word},#{item.likeNum},#{item.collectNum},#{item.commentNum},#{item.forwardNum},#{item.match}) diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/ReviewContentMapper.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/ReviewContentMapper.xml index 96e753d..11946c5 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/ReviewContentMapper.xml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/ReviewContentMapper.xml @@ -16,9 +16,4 @@ (#{item.word},#{item.keyWordId}) - - delete - tb_review_content where key_word_id in - #{ids} - diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/RoughResourceMapper.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/RoughResourceMapper.xml index 92c11e8..9f170a5 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/RoughResourceMapper.xml +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/src/main/resources/mapper/RoughResourceMapper.xml @@ -12,18 +12,31 @@ diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml index c724e44..2bb265f 100644 --- a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml +++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:localhost}:${NACOS_PORT:8848} # Spring Cloud Stream 配置项，对应 BindingServiceProperties 类 stream: # Binding 配置项，对应 BindingProperties Map