From 241a9cf85b3c19eb093d4d661c35d71c490adf1f Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 10 Aug 2023 23:38:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20DatePattern=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E6=9B=BF=E4=BB=A3=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E4=B8=AD=E7=9A=84=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/jackson/JacksonConfiguration.java | 9 ++++--- .../cnadmin/common/constant/StringConsts.java | 25 ------------------- .../cnadmin/common/util/ExcelUtils.java | 4 +-- .../cnadmin/common/util/FileUtils.java | 5 ++-- .../monitor/model/query/LoginLogQuery.java | 5 ++-- .../model/query/OperationLogQuery.java | 5 ++-- .../monitor/model/query/SystemLogQuery.java | 5 ++-- .../auth/model/query/OnlineUserQuery.java | 4 +-- .../cnadmin/system/model/query/UserQuery.java | 5 ++-- 9 files changed, 23 insertions(+), 44 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java index 1140edfe..bb72e924 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java @@ -42,8 +42,9 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; +import cn.hutool.core.date.DatePattern; + import top.charles7c.cnadmin.common.base.BaseEnum; -import top.charles7c.cnadmin.common.constant.StringConsts; /** * Jackson 配置 @@ -69,15 +70,15 @@ public class JacksonConfiguration { javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); // 针对时间类型：LocalDateTime、LocalDate、LocalTime 的序列化和反序列化 - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(StringConsts.NORM_DATE_TIME_PATTERN); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN); javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(dateTimeFormatter)); javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(dateTimeFormatter)); - DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(StringConsts.NORM_DATE_PATTERN); + DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN); javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(dateFormatter)); javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(dateFormatter)); - DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern(StringConsts.NORM_TIME_PATTERN); + DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN); javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(timeFormatter)); javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(timeFormatter)); builder.timeZone(TimeZone.getDefault()); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java index 7f84c4b4..045706f3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/StringConsts.java @@ -59,29 +59,4 @@ public class StringConsts implements StrPool { * 中文逗号 */ public static final String CHINESE_COMMA = "，"; - - /** - * 标准日期时间格式 - */ - public static final String NORM_DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; - - /** - * 标准日期时间格式（紧凑） - */ - public static final String PURE_DATE_TIME_PATTERN = "yyyyMMddHHmmss"; - - /** - * 标准日期时间格式（紧凑，带毫秒） - */ - public static final String PURE_DATE_TIME_MS_PATTERN = "yyyyMMddHHmmssSSS"; - - /** - * 标准日期格式 - */ - public static final String NORM_DATE_PATTERN = "yyyy-MM-dd"; - - /** - * 标准时间格式 - */ - public static final String NORM_TIME_PATTERN = "HH:mm:ss"; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java index 072ed47f..869070b2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java @@ -28,11 +28,11 @@ import lombok.extern.slf4j.Slf4j; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.URLUtil; import top.charles7c.cnadmin.common.config.easyexcel.ExcelBigNumberConverter; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.exception.ServiceException; /** @@ -79,7 +79,7 @@ public class ExcelUtils { HttpServletResponse response) { try { fileName = - String.format("%s_%s.xlsx", fileName, DateUtil.format(new Date(), StringConsts.PURE_DATE_TIME_PATTERN)); + String.format("%s_%s.xlsx", fileName, DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN)); fileName = URLUtil.encode(fileName); response.setHeader("Content-disposition", "attachment;filename=" + fileName); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java index b706b3b6..31d68302 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java @@ -25,12 +25,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.multipart.MultipartFile; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.util.IdUtil; -import top.charles7c.cnadmin.common.constant.StringConsts; - /** * 文件工具类 * @@ -60,7 +59,7 @@ public class FileUtils { String fileName; if (isKeepOriginalFilename) { fileName = String.format("%s-%s.%s", FileNameUtil.getPrefix(originalFilename), - DateUtil.format(LocalDateTime.now(), StringConsts.PURE_DATE_TIME_MS_PATTERN), extensionName); + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_MS_PATTERN), extensionName); } else { fileName = String.format("%s.%s", IdUtil.fastSimpleUUID(), extensionName); } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java index b047d218..0022f71f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; +import cn.hutool.core.date.DatePattern; + import top.charles7c.cnadmin.common.annotation.Query; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.QueryTypeEnum; /** @@ -54,6 +55,6 @@ public class LoginLogQuery implements Serializable { */ @Schema(description = "登录时间") @Query(type = QueryTypeEnum.BETWEEN) - @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) private List createTime; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java index 03470c9a..5c4aa7f9 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; +import cn.hutool.core.date.DatePattern; + import top.charles7c.cnadmin.common.annotation.Query; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.QueryTypeEnum; /** @@ -61,7 +62,7 @@ public class OperationLogQuery implements Serializable { */ @Schema(description = "操作时间") @Query(type = QueryTypeEnum.BETWEEN) - @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) private List createTime; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java index 4a4895f2..d166bcec 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; +import cn.hutool.core.date.DatePattern; + import top.charles7c.cnadmin.common.annotation.Query; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.QueryTypeEnum; /** @@ -47,6 +48,6 @@ public class SystemLogQuery implements Serializable { */ @Schema(description = "创建时间") @Query(type = QueryTypeEnum.BETWEEN) - @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) private List createTime; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java index 6e506ab0..b766a9e5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java @@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; -import top.charles7c.cnadmin.common.constant.StringConsts; +import cn.hutool.core.date.DatePattern; /** * 在线用户查询条件 @@ -50,6 +50,6 @@ public class OnlineUserQuery implements Serializable { * 登录时间 */ @Schema(description = "登录时间") - @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) private List loginTime; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java index 3b69f726..f4e9f73e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.format.annotation.DateTimeFormat; +import cn.hutool.core.date.DatePattern; + import top.charles7c.cnadmin.common.annotation.Query; -import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.enums.QueryTypeEnum; /** @@ -61,7 +62,7 @@ public class UserQuery implements Serializable { */ @Schema(description = "创建时间") @Query(type = QueryTypeEnum.BETWEEN) - @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) + @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) private List createTime; /**