hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

banner 新增platform 字段

Browse Source
This commit is contained in:
tianfeng 2026-01-28 15:11:08 +08:00
parent 4f58df995a
commit cdeb90f4a3
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/sys/AppConfigRestController.java
View File

@ -185,9 +185,6 @@ public class AppConfigRestController extends BaseController {
*/ */
@GetMapping("/banner") @GetMapping("/banner")
public List<BannerCO> listBanner(AppExtCommand cmd) { public List<BannerCO> listBanner(AppExtCommand cmd) {
if (cmd.checkIos()) {
return Collections.emptyList();
}
return appConfigService.listBanner(cmd); return appConfigService.listBanner(cmd);
} }

6
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/sys/query/BannerQryExe.java
View File

@ -40,7 +40,7 @@ public class BannerQryExe {
String regionId = userRegionGateway.getRegionId(cmd.requiredReqUserId()); String regionId = userRegionGateway.getRegionId(cmd.requiredReqUserId());
ResponseAssert.notBlank(CommonErrorCode.REGION_NOT_SUPPORTED_ERROR, regionId); ResponseAssert.notBlank(CommonErrorCode.REGION_NOT_SUPPORTED_ERROR, regionId);
List<BannerCache> list = bannerCacheService.listBannerCacheBySysOrigin(cmd.requireReqSysOrigin(), () -> { List<BannerCache> list = bannerCacheService.listBannerCacheBySysOrigin(cmd.requireReqSysOrigin(), () -> {
List<BannerConfig> configs = listEffectiveCache(cmd.requireReqSysOrigin()); List<BannerConfig> configs = listEffectiveCache(cmd.requireReqSysOrigin(), cmd.getReqClient().getClientName());
if (CollectionUtils.isEmpty(configs)) { if (CollectionUtils.isEmpty(configs)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
@ -53,8 +53,8 @@ public class BannerQryExe {
} }
private List<BannerConfig> listEffectiveCache(String sysOrigin) { private List<BannerConfig> listEffectiveCache(String sysOrigin, String platform) {
return bannerConfigService.listEffective(sysOrigin); return bannerConfigService.listEffective(sysOrigin, platform);
} }
} }

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/cache/service/other/impl/BannerCacheServiceImpl.java vendored
View File

@ -35,7 +35,7 @@ public class BannerCacheServiceImpl implements BannerCacheService {
public List<BannerCache> listBannerCacheBySysOrigin(String sysOrigin, VoidCallable<List<BannerCache>> orElsePut) { public List<BannerCache> listBannerCacheBySysOrigin(String sysOrigin, VoidCallable<List<BannerCache>> orElsePut) {
return Optional return Optional
.ofNullable(redisService.hashGet(BannerKeys.BANNER.getKey(), getBannerKey(sysOrigin), .ofNullable(redisService.hashGet(BannerKeys.BANNER.getKey(), getBannerKey(sysOrigin + "22"),
new TypeReference<List<BannerCache>>() { new TypeReference<List<BannerCache>>() {
})) }))
.map(bannerCaches -> bannerCaches.stream() .map(bannerCaches -> bannerCaches.stream()

6
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/BannerConfig.java
View File

@ -39,6 +39,12 @@ public class BannerConfig extends TimestampBaseEntity {
@TableField("sys_origin") @TableField("sys_origin")
private String sysOrigin; private String sysOrigin;
/**
* 平台：Android, iOS
*/
@TableField("platform")
private String platform;
/** /**
* 封面. * 封面.
*/ */

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/BannerConfigService.java
View File

@ -22,7 +22,7 @@ public interface BannerConfigService extends BaseService<BannerConfig> {
* @param sysOrigin 来源系统 * @param sysOrigin 来源系统
* @return ignore * @return ignore
*/ */
List<BannerConfig> listEffective(String sysOrigin); List<BannerConfig> listEffective(String sysOrigin, String platform);
PageResult<BannerConfig> pageBanner(SysBannerConfigQryCmd query); PageResult<BannerConfig> pageBanner(SysBannerConfigQryCmd query);

14
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/sys/impl/BannerConfigServiceImpl.java
View File

@ -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.date.TimestampUtils;
import com.red.circle.tool.core.text.StringUtils; import com.red.circle.tool.core.text.StringUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -27,13 +28,14 @@ public class BannerConfigServiceImpl extends
BaseServiceImpl<BannerConfigDAO, BannerConfig> implements BannerConfigService { BaseServiceImpl<BannerConfigDAO, BannerConfig> implements BannerConfigService {
@Override @Override
public List<BannerConfig> listEffective(String sysOrigin) { public List<BannerConfig> listEffective(String sysOrigin, String platform) {
return query() return query()
.gt(BannerConfig::getExpiredTime, LocalDateTime.now()) .eq(BannerConfig::getSysOrigin, sysOrigin)
.eq(BannerConfig::getShowcase, Boolean.TRUE) .in(BannerConfig::getPlatform, Arrays.asList(platform, ""))
.eq(BannerConfig::getSysOrigin, sysOrigin) .gt(BannerConfig::getExpiredTime, LocalDateTime.now())
.orderByDesc(BannerConfig::getSort) .eq(BannerConfig::getShowcase, Boolean.TRUE)
.last(PageConstant.MAX_LIMIT).list(); .orderByDesc(BannerConfig::getSort)
.last(PageConstant.MAX_LIMIT).list();
} }
@Override @Override