mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-10-31 10:57:13 +08:00 
			
		
		
		
	refactor: 使用 DatePattern 中的日期格式常量替代字符串常量中的日期格式
This commit is contained in:
		| @@ -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.LocalDateTimeSerializer; | ||||||
| import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; | 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.base.BaseEnum; | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Jackson 配置 |  * Jackson 配置 | ||||||
| @@ -69,15 +70,15 @@ public class JacksonConfiguration { | |||||||
|             javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); |             javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); | ||||||
|  |  | ||||||
|             // 针对时间类型:LocalDateTime、LocalDate、LocalTime 的序列化和反序列化 |             // 针对时间类型: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.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(dateTimeFormatter)); | ||||||
|             javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(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.addSerializer(LocalDate.class, new LocalDateSerializer(dateFormatter)); | ||||||
|             javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(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.addSerializer(LocalTime.class, new LocalTimeSerializer(timeFormatter)); | ||||||
|             javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(timeFormatter)); |             javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(timeFormatter)); | ||||||
|             builder.timeZone(TimeZone.getDefault()); |             builder.timeZone(TimeZone.getDefault()); | ||||||
|   | |||||||
| @@ -59,29 +59,4 @@ public class StringConsts implements StrPool { | |||||||
|      * 中文逗号 |      * 中文逗号 | ||||||
|      */ |      */ | ||||||
|     public static final String CHINESE_COMMA = ","; |     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"; |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -28,11 +28,11 @@ import lombok.extern.slf4j.Slf4j; | |||||||
| import com.alibaba.excel.EasyExcel; | import com.alibaba.excel.EasyExcel; | ||||||
| import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; | import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; | ||||||
|  |  | ||||||
|  | import cn.hutool.core.date.DatePattern; | ||||||
| import cn.hutool.core.date.DateUtil; | import cn.hutool.core.date.DateUtil; | ||||||
| import cn.hutool.core.util.URLUtil; | import cn.hutool.core.util.URLUtil; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.config.easyexcel.ExcelBigNumberConverter; | import top.charles7c.cnadmin.common.config.easyexcel.ExcelBigNumberConverter; | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
| import top.charles7c.cnadmin.common.exception.ServiceException; | import top.charles7c.cnadmin.common.exception.ServiceException; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -79,7 +79,7 @@ public class ExcelUtils { | |||||||
|         HttpServletResponse response) { |         HttpServletResponse response) { | ||||||
|         try { |         try { | ||||||
|             fileName = |             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); |             fileName = URLUtil.encode(fileName); | ||||||
|             response.setHeader("Content-disposition", "attachment;filename=" + fileName); |             response.setHeader("Content-disposition", "attachment;filename=" + fileName); | ||||||
|             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); |             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); | ||||||
|   | |||||||
| @@ -25,12 +25,11 @@ import lombok.extern.slf4j.Slf4j; | |||||||
|  |  | ||||||
| import org.springframework.web.multipart.MultipartFile; | import org.springframework.web.multipart.MultipartFile; | ||||||
|  |  | ||||||
|  | import cn.hutool.core.date.DatePattern; | ||||||
| import cn.hutool.core.date.DateUtil; | import cn.hutool.core.date.DateUtil; | ||||||
| import cn.hutool.core.io.file.FileNameUtil; | import cn.hutool.core.io.file.FileNameUtil; | ||||||
| import cn.hutool.core.util.IdUtil; | import cn.hutool.core.util.IdUtil; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * 文件工具类 |  * 文件工具类 | ||||||
|  * |  * | ||||||
| @@ -60,7 +59,7 @@ public class FileUtils { | |||||||
|         String fileName; |         String fileName; | ||||||
|         if (isKeepOriginalFilename) { |         if (isKeepOriginalFilename) { | ||||||
|             fileName = String.format("%s-%s.%s", FileNameUtil.getPrefix(originalFilename), |             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 { |         } else { | ||||||
|             fileName = String.format("%s.%s", IdUtil.fastSimpleUUID(), extensionName); |             fileName = String.format("%s.%s", IdUtil.fastSimpleUUID(), extensionName); | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
|  |  | ||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
|  | import cn.hutool.core.date.DatePattern; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | import top.charles7c.cnadmin.common.annotation.Query; | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
| import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -54,6 +55,6 @@ public class LoginLogQuery implements Serializable { | |||||||
|      */ |      */ | ||||||
|     @Schema(description = "登录时间") |     @Schema(description = "登录时间") | ||||||
|     @Query(type = QueryTypeEnum.BETWEEN) |     @Query(type = QueryTypeEnum.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) |     @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
|  |  | ||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
|  | import cn.hutool.core.date.DatePattern; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | import top.charles7c.cnadmin.common.annotation.Query; | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
| import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -61,7 +62,7 @@ public class OperationLogQuery implements Serializable { | |||||||
|      */ |      */ | ||||||
|     @Schema(description = "操作时间") |     @Schema(description = "操作时间") | ||||||
|     @Query(type = QueryTypeEnum.BETWEEN) |     @Query(type = QueryTypeEnum.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) |     @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
|  |  | ||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
|  | import cn.hutool.core.date.DatePattern; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | import top.charles7c.cnadmin.common.annotation.Query; | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
| import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -47,6 +48,6 @@ public class SystemLogQuery implements Serializable { | |||||||
|      */ |      */ | ||||||
|     @Schema(description = "创建时间") |     @Schema(description = "创建时间") | ||||||
|     @Query(type = QueryTypeEnum.BETWEEN) |     @Query(type = QueryTypeEnum.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) |     @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
|  |  | ||||||
| import org.springframework.format.annotation.DateTimeFormat; | 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 = "登录时间") |     @Schema(description = "登录时间") | ||||||
|     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) |     @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) | ||||||
|     private List<Date> loginTime; |     private List<Date> loginTime; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -26,8 +26,9 @@ import io.swagger.v3.oas.annotations.media.Schema; | |||||||
|  |  | ||||||
| import org.springframework.format.annotation.DateTimeFormat; | import org.springframework.format.annotation.DateTimeFormat; | ||||||
|  |  | ||||||
|  | import cn.hutool.core.date.DatePattern; | ||||||
|  |  | ||||||
| import top.charles7c.cnadmin.common.annotation.Query; | import top.charles7c.cnadmin.common.annotation.Query; | ||||||
| import top.charles7c.cnadmin.common.constant.StringConsts; |  | ||||||
| import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | import top.charles7c.cnadmin.common.enums.QueryTypeEnum; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -61,7 +62,7 @@ public class UserQuery implements Serializable { | |||||||
|      */ |      */ | ||||||
|     @Schema(description = "创建时间") |     @Schema(description = "创建时间") | ||||||
|     @Query(type = QueryTypeEnum.BETWEEN) |     @Query(type = QueryTypeEnum.BETWEEN) | ||||||
|     @DateTimeFormat(pattern = StringConsts.NORM_DATE_TIME_PATTERN) |     @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) | ||||||
|     private List<Date> createTime; |     private List<Date> createTime; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user