From 3b6edd3c02635706b478267d98a0109bf49a46b7 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 18 Apr 2024 16:04:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=B0=83=E6=95=B4=EF=BC=8C=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E4=BD=8D=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/server/common/ApplicationVersionValidator.java | 5 ++++- .../axzo/nanopart/server/service/impl/BannerServiceImpl.java | 2 ++ .../nanopart/server/service/impl/MaterialServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/common/ApplicationVersionValidator.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/common/ApplicationVersionValidator.java index 45007398..e60ecd36 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/common/ApplicationVersionValidator.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/common/ApplicationVersionValidator.java @@ -2,6 +2,7 @@ package cn.axzo.nanopart.server.common; import cn.axzo.framework.domain.ServiceException; import cn.axzo.nanopart.api.constant.NanopartConstant; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; /** @@ -12,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; * @version 1.0 * @date 2024/4/17 20:21 */ +@Slf4j public class ApplicationVersionValidator { /** @@ -21,7 +23,8 @@ public class ApplicationVersionValidator { */ public static void checkVersionSimple(String 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("请输入正确的版本号"); } } diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java index 4ab77627..45c3c7d2 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java @@ -278,6 +278,8 @@ public class BannerServiceImpl extends ServiceImpl implements .eq(Objects.nonNull(req.getTerminal()), Banner::getTerminal, req.getTerminal()) .eq(Objects.nonNull(req.getStatus()), Banner::getStatus, req.getStatus()) .eq(Banner::getIsDelete, 0) + .orderByDesc(Banner::getStatus) + .orderByDesc(Banner::getCreateAt) .orderByAsc(Banner::getCode); } diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java index 52f1595a..69877acf 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java @@ -347,8 +347,8 @@ public class MaterialServiceImpl extends ServiceImpl impl .eq(StringUtils.isNotEmpty(req.getBannerCode()), Material::getBannerCode, req.getBannerCode()) .like(StringUtils.isNotEmpty(req.getName()), Material::getName, req.getName()) .eq(Objects.nonNull(req.getStatus()), Material::getStatus, req.getStatus()) - .le(Objects.nonNull(req.getStartTime()), Material::getStartTime, req.getStartTime()) - .ge(Objects.nonNull(req.getEndTime()), Material::getEndTime, req.getEndTime()) + .ge(Objects.nonNull(req.getStartTime()), Material::getStartTime, req.getStartTime()) + .le(Objects.nonNull(req.getEndTime()), Material::getEndTime, req.getEndTime()) .orderByDesc(Material::getStatus) .orderByAsc(Material::getPriority) .orderByDesc(Material::getCreateAt);