From ce495fc09ee5890841d0d402a041f4023fe58da3 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 28 Jan 2026 17:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E8=BF=94=E5=9B=9ELong=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/dynamic/DynamicRestController.java | 12 ++++++------ .../dynamic/DynamicCheckSendPermissionCmdExe.java | 15 +++++++-------- .../app/command/dynamic/DynamicCommentCmdExe.java | 8 ++++---- .../command/dynamic/DynamicCommentLikeCmdExe.java | 14 +++++++------- .../app/command/dynamic/DynamicLikeCmdExe.java | 13 +++++++------ .../dynamic/delete/DynamicCommentDelCmdExe.java | 12 +++++------- .../other/app/common/room/DynamicCommon.java | 4 ++-- .../app/service/dynamic/DynamicServiceImpl.java | 13 +++++++++---- .../other/app/service/dynamic/DynamicService.java | 13 +++++++++---- 9 files changed, 56 insertions(+), 48 deletions(-) diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/dynamic/DynamicRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/dynamic/DynamicRestController.java index 65fb915c..67dfbb45 100644 --- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/dynamic/DynamicRestController.java +++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/dynamic/DynamicRestController.java @@ -184,7 +184,7 @@ public class DynamicRestController extends BaseController { * @eo.request-type json */ @PostMapping("/delete/comment") - public String deleteComment(@RequestBody @Validated AppIdLongCmd cmd) { + public Long deleteComment(@RequestBody @Validated AppIdLongCmd cmd) { return dynamicService.deleteComment(cmd); } @@ -198,7 +198,7 @@ public class DynamicRestController extends BaseController { * @eo.request-type json */ @PostMapping("/comment") - public String comment(@RequestBody @Validated DynamicCommentCmd cmd) { + public Long comment(@RequestBody @Validated DynamicCommentCmd cmd) { return dynamicService.comment(cmd); } @@ -212,7 +212,7 @@ public class DynamicRestController extends BaseController { * @eo.request-type json */ @PostMapping("/like/comment") - public String likeComment(@RequestBody @Validated DynamicLikeCmd cmd) { + public Long likeComment(@RequestBody @Validated DynamicLikeCmd cmd) { return dynamicService.likeComment(cmd); } @@ -227,7 +227,7 @@ public class DynamicRestController extends BaseController { * @eo.request-type json */ @PostMapping("/like") - public String likeDynamic(@RequestBody @Validated DynamicLikeCmd cmd) { + public Long likeDynamic(@RequestBody @Validated DynamicLikeCmd cmd) { return dynamicService.likeDynamic(cmd); } @@ -318,8 +318,8 @@ public class DynamicRestController extends BaseController { * @eo.request-type formdata */ @GetMapping("/check/send/permission") - public DynamicSendRestrictCO checkSendPermission(AppExtCommand cmd) { - return dynamicService.checkSendPermission(cmd); + public Boolean checkSendPermission(AppExtCommand cmd) { + return dynamicService.checkSendPermission2(cmd); } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCheckSendPermissionCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCheckSendPermissionCmdExe.java index df27a842..902690ab 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCheckSendPermissionCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCheckSendPermissionCmdExe.java @@ -30,22 +30,17 @@ public class DynamicCheckSendPermissionCmdExe { public DynamicSendRestrictCO execute(AppExtCommand cmd) { - //魅力，财富等级是否足够 - checkUserLevel(cmd); - //该用户为动态黑名单用户 ResponseAssert.isFalse(CommonErrorCode.INSUFFICIENT_PERMISSION, dynamicBlacklistService.exist(cmd.getReqUserId())); //当前用户今天已发动态数量 - Long userSentTodayCount = getUserTodayDynamicCount(cmd); +// Long userSentTodayCount = getUserTodayDynamicCount(cmd); //限制用户每天发送动态的数量 - Long quantityLimit = dynamicCacheService.getSendQuantityLimit(); +// Long quantityLimit = dynamicCacheService.getSendQuantityLimit(); - return new DynamicSendRestrictCO() - .setAmount(dynamicCacheService.getSendDynamicFees()) - .setOverSend(userSentTodayCount >= quantityLimit); + return new DynamicSendRestrictCO(); } /** @@ -70,4 +65,8 @@ public class DynamicCheckSendPermissionCmdExe { return dynamicCacheService.getUserTodayDynamicCount(cmd.getReqUserId()); } + public Boolean execute2(AppExtCommand cmd) { + return !dynamicBlacklistService.exist(cmd.getReqUserId()); + } + } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentCmdExe.java index b3ab2ccb..c5722e20 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentCmdExe.java @@ -50,7 +50,7 @@ public class DynamicCommentCmdExe { private final DynamicPopularService dynamicPopularService; private final UserAccountCommon userAccountCommon; - public String execute(DynamicCommentCmd cmd) { + public Long execute(DynamicCommentCmd cmd) { ResponseAssert.isTrue(DynamicErrorCode.CURRENT_LEVEL_IS_TOO_LOW, commentLimit(cmd)); DynamicContent dynamicContent = checkParams(cmd); @@ -59,7 +59,7 @@ public class DynamicCommentCmdExe { Long commentId = IdWorkerUtils.getId(); saveComment(cmd, commentId); - String commentQuantity = incrCommentQuantity(cmd); + Long commentQuantity = incrCommentQuantity(cmd); //评论自己创建的动态或者自己回复自己不发送消息 if (isOwnDynamic(cmd, dynamicContent)) { @@ -139,8 +139,8 @@ public class DynamicCommentCmdExe { return dynamicContent; } - private String incrCommentQuantity(DynamicCommentCmd cmd) { - return NumUtils.formatLong(dynamicCacheService.updateCommentQuantity(cmd.getId(), 1)); + private Long incrCommentQuantity(DynamicCommentCmd cmd) { + return dynamicCacheService.updateCommentQuantity(cmd.getId(), 1); } private boolean isOwnDynamic(DynamicCommentCmd cmd, DynamicContent dynamicContent) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentLikeCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentLikeCmdExe.java index dbfdac83..4702b395 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentLikeCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicCommentLikeCmdExe.java @@ -36,7 +36,7 @@ public class DynamicCommentLikeCmdExe { private final DynamicPopularService dynamicPopularService; private final DynamicCommentLikeService dynamicCommentLikeService; - public String execute(DynamicLikeCmd cmd) { + public Long execute(DynamicLikeCmd cmd) { DynamicContent content = checkParams(cmd); Long id = IdWorkerUtils.getId(); @@ -69,9 +69,9 @@ public class DynamicCommentLikeCmdExe { return getDecrQuantity(cmd); } - private String getDecrQuantity(DynamicLikeCmd cmd) { - return NumUtils.formatLong( - dynamicCacheService.decrCommentLikeQuantity(cmd.getDynamicId(), cmd.getCommentId())); + private Long getDecrQuantity(DynamicLikeCmd cmd) { + return dynamicCacheService.decrCommentLikeQuantity(cmd.getDynamicId(), cmd.getCommentId()); +// return NumUtils.formatLong(dynamicCacheService.decrCommentLikeQuantity(cmd.getDynamicId(), cmd.getCommentId())); } private void deleteCommentLike(DynamicLikeCmd cmd) { @@ -98,9 +98,9 @@ public class DynamicCommentLikeCmdExe { return dynamicContent; } - private String getIncrQuantity(DynamicLikeCmd cmd) { - return NumUtils.formatLong( - dynamicCacheService.incrCommentLikeQuantity(cmd.getDynamicId(), cmd.getCommentId())); + private Long getIncrQuantity(DynamicLikeCmd cmd) { + return dynamicCacheService.incrCommentLikeQuantity(cmd.getDynamicId(), cmd.getCommentId()); +// return NumUtils.formatLong(dynamicCacheService.incrCommentLikeQuantity(cmd.getDynamicId(), cmd.getCommentId())); } private void save(DynamicLikeCmd cmd, Long id) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicLikeCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicLikeCmdExe.java index 935ac2ac..0fa38548 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicLikeCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/DynamicLikeCmdExe.java @@ -35,7 +35,7 @@ public class DynamicLikeCmdExe { private final DynamicContentService dynamicContentService; private final DynamicPopularService dynamicPopularService; - public String execute(DynamicLikeCmd cmd) { + public Long execute(DynamicLikeCmd cmd) { DynamicContent content = checkParams(cmd); @@ -46,7 +46,7 @@ public class DynamicLikeCmdExe { ResponseAssert.isFalse(DynamicErrorCode.LIKED, getExist(cmd)); save(cmd, commentId); - String quantity = getQuantity(cmd); + Long quantity = getQuantity(cmd); if (Objects.equals(cmd.getReqUserId(), content.getCreateUser())) { return quantity; @@ -64,14 +64,14 @@ public class DynamicLikeCmdExe { dynamicLikeService.delete(cmd.getDynamicId(), cmd.getReqUserId()); if (Objects.equals(cmd.getReqUserId(), content.getCreateUser())) { - return NumUtils.formatLong(dynamicCacheService.decrLikeQuantity(cmd.getDynamicId())); + return dynamicCacheService.decrLikeQuantity(cmd.getDynamicId()); } dynamicPopularService.updateScore(content.getId(), dynamicCacheService.getLikeScore() > 0 ? -dynamicCacheService.getLikeScore() : 0, cmd.getReqSysOrigin().getOrigin(), content.getRegion()); - return NumUtils.formatLong(dynamicCacheService.decrLikeQuantity(cmd.getDynamicId())); + return dynamicCacheService.decrLikeQuantity(cmd.getDynamicId()); } private DynamicContent checkParams(DynamicLikeCmd cmd) { @@ -81,8 +81,9 @@ public class DynamicLikeCmdExe { return content; } - private String getQuantity(DynamicLikeCmd cmd) { - return NumUtils.formatLong(dynamicCacheService.incrLikeQuantity(cmd.getDynamicId())); + private Long getQuantity(DynamicLikeCmd cmd) { + return dynamicCacheService.incrLikeQuantity(cmd.getDynamicId()); +// return NumUtils.formatLong(dynamicCacheService.incrLikeQuantity(cmd.getDynamicId())); } private void save(DynamicLikeCmd cmd, Long commentId) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/delete/DynamicCommentDelCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/delete/DynamicCommentDelCmdExe.java index 036c222d..f271f68d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/delete/DynamicCommentDelCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/delete/DynamicCommentDelCmdExe.java @@ -34,7 +34,7 @@ public class DynamicCommentDelCmdExe { private final DynamicPopularService dynamicPopularService; private final DynamicCommentLikeService dynamicCommentLikeService; - public String execute(AppIdLongCmd cmd) { + public Long execute(AppIdLongCmd cmd) { DynamicComment comment = dynamicCommentService.getById(cmd.getId()); ResponseAssert.notNull(DynamicErrorCode.COMMENT_DELETED, comment); @@ -52,7 +52,7 @@ public class DynamicCommentDelCmdExe { } - private String deleteAllComment(AppIdLongCmd cmd, DynamicComment comment) { + private Long deleteAllComment(AppIdLongCmd cmd, DynamicComment comment) { //修改热门动态权重 updateScore(cmd, comment); @@ -63,8 +63,7 @@ public class DynamicCommentDelCmdExe { Integer dynamicCommentCount = dynamicCommentService .getNumberByDynamicId(comment.getDynamicContentId()); - return NumUtils.formatInt(dynamicCacheService.initCommentQuantity - (comment.getDynamicContentId(), dynamicCommentCount)); + return dynamicCacheService.initCommentQuantity(comment.getDynamicContentId(), dynamicCommentCount).longValue(); } private void updateScore(AppIdLongCmd cmd, DynamicComment comment) { @@ -83,7 +82,7 @@ public class DynamicCommentDelCmdExe { cmd.getReqSysOrigin().getOrigin(), null); } - private String deleteComment(AppIdLongCmd cmd, DynamicComment comment) { + private Long deleteComment(AppIdLongCmd cmd, DynamicComment comment) { dynamicCommentService.deleteById(cmd.getId()); @@ -91,8 +90,7 @@ public class DynamicCommentDelCmdExe { -(getCommentLikeQuantity(comment).intValue() * dynamicCacheService.getLikeScore()), cmd.getReqSysOrigin().getOrigin(), null); - return NumUtils.formatLong(dynamicCacheService.updateCommentQuantity - (comment.getDynamicContentId(), -1)); + return dynamicCacheService.updateCommentQuantity(comment.getDynamicContentId(), -1); } private Long getCommentLikeQuantity(DynamicComment comment) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/DynamicCommon.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/DynamicCommon.java index c7d441e8..27fd21f8 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/DynamicCommon.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/room/DynamicCommon.java @@ -156,14 +156,14 @@ public class DynamicCommon { return; } - Integer count = dynamicMessageService.getCountByToUserId(toUserId); + /*Integer count = dynamicMessageService.getCountByToUserId(toUserId); log.info("该用户 {} 动态评论或点赞消息总数量发送", toUserId); newsletterClient.send(new NewsletterResultCmd() .setUserIds(List.of(toUserId)) .setEvent(NewsletterEvent.DYNAMIC_MESSAGE_QUANTITY) .setData(count <= 0 ? 1 : count) - ); + );*/ } /** diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/dynamic/DynamicServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/dynamic/DynamicServiceImpl.java index e11c0c15..e2683293 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/dynamic/DynamicServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/dynamic/DynamicServiceImpl.java @@ -127,22 +127,22 @@ public class DynamicServiceImpl implements DynamicService { } @Override - public String deleteComment(AppIdLongCmd cmd) { + public Long deleteComment(AppIdLongCmd cmd) { return dynamicCommentDelExe.execute(cmd); } @Override - public String comment(DynamicCommentCmd cmd) { + public Long comment(DynamicCommentCmd cmd) { return dynamicCommentExe.execute(cmd); } @Override - public String likeComment(DynamicLikeCmd cmd) { + public Long likeComment(DynamicLikeCmd cmd) { return dynamicCommentLikeExe.execute(cmd); } @Override - public String likeDynamic(DynamicLikeCmd cmd) { + public Long likeDynamic(DynamicLikeCmd cmd) { return dynamicLikeExe.execute(cmd); } @@ -181,4 +181,9 @@ public class DynamicServiceImpl implements DynamicService { return dynamicCheckSendPermissionCmdExe.execute(cmd); } + @Override + public Boolean checkSendPermission2(AppExtCommand cmd) { + return dynamicCheckSendPermissionCmdExe.execute2(cmd); + } + } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/dynamic/DynamicService.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/dynamic/DynamicService.java index c421373d..b79c4c27 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/dynamic/DynamicService.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/dynamic/DynamicService.java @@ -84,28 +84,28 @@ public interface DynamicService { /** * 删除评论. */ - String deleteComment(AppIdLongCmd cmd); + Long deleteComment(AppIdLongCmd cmd); /** * 评论动态或回复用户. * * @return 数量 */ - String comment(DynamicCommentCmd cmd); + Long comment(DynamicCommentCmd cmd); /** * 点赞评论. * * @return 数量 */ - String likeComment(DynamicLikeCmd cmd); + Long likeComment(DynamicLikeCmd cmd); /** * 点赞动态 * * @return 数量 */ - String likeDynamic(DynamicLikeCmd cmd); + Long likeDynamic(DynamicLikeCmd cmd); /** * 我的消息列表. @@ -141,4 +141,9 @@ public interface DynamicService { * 校验发送动态权限. */ DynamicSendRestrictCO checkSendPermission(AppExtCommand cmd); + + /** + * 校验发送动态权限. + */ + Boolean checkSendPermission2(AppExtCommand cmd); }