wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2106): 版本号校验调整，广告位排序规则调整

Browse Source
This commit is contained in:
chenwenjian 2024-04-18 16:04:53 +08:00
parent f581a72e84
commit 3b6edd3c02
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
banner/banner-server/src/main/java/cn/axzo/nanopart/server/common/ApplicationVersionValidator.java
View File

@ -2,6 +2,7 @@ package cn.axzo.nanopart.server.common;
import cn.axzo.framework.domain.ServiceException; import cn.axzo.framework.domain.ServiceException;
import cn.axzo.nanopart.api.constant.NanopartConstant; import cn.axzo.nanopart.api.constant.NanopartConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
/** /**
@ -12,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
* @version 1.0 * @version 1.0
* @date 2024/4/17 20:21 * @date 2024/4/17 20:21
*/ */
@Slf4j
public class ApplicationVersionValidator { public class ApplicationVersionValidator {
/** /**
@ -21,7 +23,8 @@ public class ApplicationVersionValidator {
*/ */
public static void checkVersionSimple(String version) { public static void checkVersionSimple(String version) {
if (StringUtils.isNotBlank(version)) { if (StringUtils.isNotBlank(version)) {
if (!NanopartConstant.VERSION_SIMPLE_PATTERN.matches(version)) { if (!version.matches(NanopartConstant.VERSION_SIMPLE_PATTERN)) {
log.warn("版本号校验不通过，version = {}",version);
throw new ServiceException("请输入正确的版本号"); throw new ServiceException("请输入正确的版本号");
} }
} }

2
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java
View File

@ -278,6 +278,8 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
.eq(Objects.nonNull(req.getTerminal()), Banner::getTerminal, req.getTerminal()) .eq(Objects.nonNull(req.getTerminal()), Banner::getTerminal, req.getTerminal())
.eq(Objects.nonNull(req.getStatus()), Banner::getStatus, req.getStatus()) .eq(Objects.nonNull(req.getStatus()), Banner::getStatus, req.getStatus())
.eq(Banner::getIsDelete, 0) .eq(Banner::getIsDelete, 0)
.orderByDesc(Banner::getStatus)
.orderByDesc(Banner::getCreateAt)
.orderByAsc(Banner::getCode); .orderByAsc(Banner::getCode);
} }

4
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java
View File

@ -347,8 +347,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialDao, Material> impl
.eq(StringUtils.isNotEmpty(req.getBannerCode()), Material::getBannerCode, req.getBannerCode()) .eq(StringUtils.isNotEmpty(req.getBannerCode()), Material::getBannerCode, req.getBannerCode())
.like(StringUtils.isNotEmpty(req.getName()), Material::getName, req.getName()) .like(StringUtils.isNotEmpty(req.getName()), Material::getName, req.getName())
.eq(Objects.nonNull(req.getStatus()), Material::getStatus, req.getStatus()) .eq(Objects.nonNull(req.getStatus()), Material::getStatus, req.getStatus())
.le(Objects.nonNull(req.getStartTime()), Material::getStartTime, req.getStartTime()) .ge(Objects.nonNull(req.getStartTime()), Material::getStartTime, req.getStartTime())
.ge(Objects.nonNull(req.getEndTime()), Material::getEndTime, req.getEndTime()) .le(Objects.nonNull(req.getEndTime()), Material::getEndTime, req.getEndTime())
.orderByDesc(Material::getStatus) .orderByDesc(Material::getStatus)
.orderByAsc(Material::getPriority) .orderByAsc(Material::getPriority)
.orderByDesc(Material::getCreateAt); .orderByDesc(Material::getCreateAt);