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 67dfbb45..52a5cecb 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 @@ -80,7 +80,7 @@ public class DynamicRestController extends BaseController { * @eo.request-type formdata */ @GetMapping("/list/comment") - public List listDynamicComment(@Validated DynamicCommentLimitCmd cmd) { + public PageResult listDynamicComment(@Validated DynamicCommentLimitCmd cmd) { return dynamicService.listDynamicComment(cmd); } 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 c5722e20..3402372b 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 @@ -121,21 +121,6 @@ public class DynamicCommentCmdExe { DynamicContent dynamicContent = dynamicContentService.getById(cmd.getId()); ResponseAssert.notNull(DynamicErrorCode.CONTENT_IS_NULL, dynamicContent); ResponseAssert.isFalse(DynamicErrorCode.CONTENT_DELETE, dynamicContent.getDel()); - if (SensitiveWordFilter.checkSensitiveWord(cmd.getContent())){ - // 封禁账号及设备 -// userAccountCommon.punishmentPro(new PunishmentAccountCmd() -// .setBeOptUserId(cmd.getReqUserId()) -// .setOptUserId(cmd.requiredReqUserId()) -// .setStatus(AccountStatusEnum.ARCHIVE) -// .setDescription("【动态涉及敏感词】封号+设备-" + cmd.getContent()) -// ); -// -// UserProfile userProfile = new UserProfile(); -// userProfile.setId(cmd.getReqUserId()); -// userProfile.setCheckStatus(AccountStatusEnum.ARCHIVE.name()); -// userProfileGateway.updateSelectiveById(userProfile); - ResponseAssert.isTrue(DynamicErrorCode.SENSITIVE_WORD_ERROR, Boolean.FALSE); - } return dynamicContent; } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicCommentQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicCommentQryExe.java index 67134888..17f309d5 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicCommentQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicCommentQryExe.java @@ -2,6 +2,7 @@ package com.red.circle.other.app.command.dynamic.query; import com.google.common.collect.Lists; import com.red.circle.framework.core.asserts.ResponseAssert; +import com.red.circle.framework.dto.PageResult; import com.red.circle.other.app.dto.clientobject.dynamic.DynamicCommentListCO; import com.red.circle.other.app.dto.cmd.dynamic.DynamicCommentLimitCmd; import com.red.circle.other.domain.gateway.user.UserProfileGateway; @@ -42,22 +43,22 @@ public class DynamicCommentQryExe { private final DynamicCommentService dynamicCommentService; private final DynamicCommentLikeService dynamicCommentLikeService; - public List execute(DynamicCommentLimitCmd cmd) { + public PageResult execute(DynamicCommentLimitCmd cmd) { DynamicContent dynamicContent = dynamicContentService.getById(cmd.getDynamicId()); ResponseAssert.notNull(DynamicErrorCode.CONTENT_IS_NULL, dynamicContent); ResponseAssert.isFalse(DynamicErrorCode.CONTENT_DELETE, dynamicContent.getDel()); - List comments = pageData(cmd); - if (CollectionUtils.isEmpty(comments)) { - return Lists.newArrayList(); + PageResult comments = pageData(cmd); + if (CollectionUtils.isEmpty(comments.getRecords())) { + return PageResult.newPageResult(0); } Map userMap = userProfileGateway.mapByUserIds(getUserIds(comments)); Map commentLikeMap = getCommentLikeMap(cmd, comments); - return comments.stream().map(comment -> { + return comments.convert(comment -> { DynamicCommentListCO listCO = new DynamicCommentListCO(); UserProfile createUser = userMap.get(comment.getCreateUser()); @@ -90,7 +91,7 @@ public class DynamicCommentQryExe { return listCO; - }).filter(Objects::nonNull).collect(Collectors.toList()); + }); } private Boolean getLike(Map commentLikeMap, DynamicComment comment) { @@ -98,9 +99,9 @@ public class DynamicCommentQryExe { } private Map getCommentLikeMap(DynamicCommentLimitCmd cmd, - List comments) { + PageResult comments) { return dynamicCommentLikeService - .mapByCommentIdsByUserId(comments.stream().map(DynamicComment::getId).collect( + .mapByCommentIdsByUserId(comments.getRecords().stream().map(DynamicComment::getId).collect( Collectors.toSet()), cmd.getReqUserId()); } @@ -111,19 +112,19 @@ public class DynamicCommentQryExe { .orElse(0L)); } - private Set getUserIds(List comments) { + private Set getUserIds(PageResult comments) { - Set userIds = comments.stream().map(DynamicComment::getCreateUser) + Set userIds = comments.getRecords().stream().map(DynamicComment::getCreateUser) .filter(Objects::nonNull).collect(Collectors.toSet()); - userIds.addAll(comments.stream().map(DynamicComment::getToUserId).filter(Objects::nonNull) + userIds.addAll(comments.getRecords().stream().map(DynamicComment::getToUserId).filter(Objects::nonNull) .collect(Collectors.toSet())); return userIds; } - private List pageData(DynamicCommentLimitCmd cmd) { - return dynamicCommentService.pageByTimeDesc(cmd.getPageNumber(), cmd.getDynamicId()); + private PageResult pageData(DynamicCommentLimitCmd cmd) { + return dynamicCommentService.pageByTimeDesc(cmd.getPageReq(), cmd.getDynamicId()); } } 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 e2683293..fa221fe1 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 @@ -87,7 +87,7 @@ public class DynamicServiceImpl implements DynamicService { } @Override - public List listDynamicComment(DynamicCommentLimitCmd cmd) { + public PageResult listDynamicComment(DynamicCommentLimitCmd cmd) { return dynamicCommentQryExe.execute(cmd); } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicCommentLimitCmd.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicCommentLimitCmd.java index 668261e5..66f34076 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicCommentLimitCmd.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/dynamic/DynamicCommentLimitCmd.java @@ -1,5 +1,6 @@ package com.red.circle.other.app.dto.cmd.dynamic; +import com.red.circle.common.business.dto.PageReq; import com.red.circle.common.business.dto.cmd.AppExtCommand; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -21,7 +22,7 @@ public class DynamicCommentLimitCmd extends AppExtCommand { * @eo.required */ @NotNull - private Integer pageNumber; + private PageReq pageReq; /** * 动态内容id. 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 b79c4c27..6a057880 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 @@ -44,7 +44,7 @@ public interface DynamicService { /** * 动态评论列表. */ - List listDynamicComment(DynamicCommentLimitCmd cmd); + PageResult listDynamicComment(DynamicCommentLimitCmd cmd); /** * 动态内容详情. diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicCommentService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicCommentService.java index aed01e90..45e3db68 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicCommentService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicCommentService.java @@ -1,6 +1,8 @@ package com.red.circle.other.infra.database.rds.service.dynamic; +import com.red.circle.framework.dto.PageQuery; +import com.red.circle.framework.dto.PageResult; import com.red.circle.framework.mybatis.service.BaseService; import com.red.circle.other.infra.database.rds.entity.dynamic.DynamicComment; import java.util.Collection; @@ -24,7 +26,7 @@ public interface DynamicCommentService extends BaseService { * @param pageNumber 第几页 * @param contentId 动态内容ID */ - List pageByTimeDesc(Integer pageNumber, Long contentId); + PageResult pageByTimeDesc(PageQuery pageQuery, Long contentId); /** * 获得子评论数 diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicCommentServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicCommentServiceImpl.java index 70d8247d..6a221720 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicCommentServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicCommentServiceImpl.java @@ -2,6 +2,8 @@ package com.red.circle.other.infra.database.rds.service.dynamic.impl; import com.google.common.collect.Maps; +import com.red.circle.framework.dto.PageQuery; +import com.red.circle.framework.dto.PageResult; import com.red.circle.framework.mybatis.constant.PageConstant; import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl; import com.red.circle.other.infra.database.cache.service.other.DynamicCacheService; @@ -41,17 +43,12 @@ public class DynamicCommentServiceImpl extends } @Override - public List pageByTimeDesc(Integer pageNumber, Long contentId) { - - if (Objects.isNull(pageNumber) || pageNumber < 1) { - pageNumber = 1; - } + public PageResult pageByTimeDesc(PageQuery pageQuery, Long contentId) { return query() .eq(DynamicComment::getDynamicContentId, contentId) .orderByDesc(DynamicComment::getCreateTime) - .last(getPageSql(pageNumber)) - .list(); + .page(pageQuery); } @Override diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/impl/BannerConfigServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/impl/BannerConfigServiceImpl.java index d372f148..376e81c4 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/impl/BannerConfigServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/impl/BannerConfigServiceImpl.java @@ -51,7 +51,7 @@ public class BannerConfigServiceImpl extends wrapper.in(BannerConfig::getPlatform, "", query.getPlatform()) ) .and(StringUtils.isNotBlank(query.getCountryCode()), wrapper -> - wrapper.in(BannerConfig::getCountryCode, "", query.getCountryCode()) + wrapper.apply("(country_code = '' OR FIND_IN_SET({0}, country_code))", query.getCountryCode()) ) .eq(Objects.equals(query.getShowcase(), 1), BannerConfig::getShowcase, Boolean.TRUE) .gt(Objects.equals(query.getShowcase(), 1), BannerConfig::getExpiredTime, TimestampUtils.now())