From cdeb90f4a38b99335cdf508d962a3fa2c4f5dfed Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 28 Jan 2026 15:11:08 +0800 Subject: [PATCH] =?UTF-8?q?banner=20=E6=96=B0=E5=A2=9Eplatform=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/app/sys/AppConfigRestController.java | 3 --- .../other/app/command/sys/query/BannerQryExe.java | 6 +++--- .../service/other/impl/BannerCacheServiceImpl.java | 2 +- .../database/rds/entity/sys/BannerConfig.java | 6 ++++++ .../rds/service/sys/BannerConfigService.java | 2 +- .../service/sys/impl/BannerConfigServiceImpl.java | 14 ++++++++------ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java index 23dac0ca..a5b3629e 100644 --- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java +++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java @@ -185,9 +185,6 @@ public class AppConfigRestController extends BaseController { */ @GetMapping("/banner") public List listBanner(AppExtCommand cmd) { - if (cmd.checkIos()) { - return Collections.emptyList(); - } return appConfigService.listBanner(cmd); } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java index dd913337..1a986705 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java @@ -40,7 +40,7 @@ public class BannerQryExe { String regionId = userRegionGateway.getRegionId(cmd.requiredReqUserId()); ResponseAssert.notBlank(CommonErrorCode.REGION_NOT_SUPPORTED_ERROR, regionId); List list = bannerCacheService.listBannerCacheBySysOrigin(cmd.requireReqSysOrigin(), () -> { - List configs = listEffectiveCache(cmd.requireReqSysOrigin()); + List configs = listEffectiveCache(cmd.requireReqSysOrigin(), cmd.getReqClient().getClientName()); if (CollectionUtils.isEmpty(configs)) { return Lists.newArrayList(); } @@ -53,8 +53,8 @@ public class BannerQryExe { } - private List listEffectiveCache(String sysOrigin) { - return bannerConfigService.listEffective(sysOrigin); + private List listEffectiveCache(String sysOrigin, String platform) { + return bannerConfigService.listEffective(sysOrigin, platform); } } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/cache/service/other/impl/BannerCacheServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/cache/service/other/impl/BannerCacheServiceImpl.java index ef90d05d..be5f3261 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/cache/service/other/impl/BannerCacheServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/cache/service/other/impl/BannerCacheServiceImpl.java @@ -35,7 +35,7 @@ public class BannerCacheServiceImpl implements BannerCacheService { public List listBannerCacheBySysOrigin(String sysOrigin, VoidCallable> orElsePut) { return Optional - .ofNullable(redisService.hashGet(BannerKeys.BANNER.getKey(), getBannerKey(sysOrigin), + .ofNullable(redisService.hashGet(BannerKeys.BANNER.getKey(), getBannerKey(sysOrigin + "22"), new TypeReference>() { })) .map(bannerCaches -> bannerCaches.stream() diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/BannerConfig.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/BannerConfig.java index c03d30a5..24561980 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/BannerConfig.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/BannerConfig.java @@ -39,6 +39,12 @@ public class BannerConfig extends TimestampBaseEntity { @TableField("sys_origin") private String sysOrigin; + /** + * 平台：Android, iOS + */ + @TableField("platform") + private String platform; + /** * 封面. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/BannerConfigService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/BannerConfigService.java index 0cd6db33..8b50f962 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/BannerConfigService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/BannerConfigService.java @@ -22,7 +22,7 @@ public interface BannerConfigService extends BaseService { * @param sysOrigin 来源系统 * @return ignore */ - List listEffective(String sysOrigin); + List listEffective(String sysOrigin, String platform); PageResult pageBanner(SysBannerConfigQryCmd query); 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 63a7f103..035ccae7 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 @@ -10,6 +10,7 @@ import com.red.circle.other.inner.model.cmd.sys.SysBannerConfigQryCmd; import com.red.circle.tool.core.date.TimestampUtils; import com.red.circle.tool.core.text.StringUtils; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; import java.util.Objects; import org.springframework.stereotype.Service; @@ -27,13 +28,14 @@ public class BannerConfigServiceImpl extends BaseServiceImpl implements BannerConfigService { @Override - public List listEffective(String sysOrigin) { + public List listEffective(String sysOrigin, String platform) { return query() - .gt(BannerConfig::getExpiredTime, LocalDateTime.now()) - .eq(BannerConfig::getShowcase, Boolean.TRUE) - .eq(BannerConfig::getSysOrigin, sysOrigin) - .orderByDesc(BannerConfig::getSort) - .last(PageConstant.MAX_LIMIT).list(); + .eq(BannerConfig::getSysOrigin, sysOrigin) + .in(BannerConfig::getPlatform, Arrays.asList(platform, "")) + .gt(BannerConfig::getExpiredTime, LocalDateTime.now()) + .eq(BannerConfig::getShowcase, Boolean.TRUE) + .orderByDesc(BannerConfig::getSort) + .last(PageConstant.MAX_LIMIT).list(); } @Override