From 7d4ae0b35a9180022b87e64bc85165270f6fe404 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 26 Mar 2025 23:17:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20DateTimeFormat?= =?UTF-8?q?=20=E6=B3=A8=E8=A7=A3=E7=9A=84=E4=BD=BF=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E7=BB=9F=E4=B8=80=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20LocalDateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit starter-web 模块已支持 Query 日期时间转换 --- .../continew/admin/auth/model/query/OnlineUserQuery.java | 7 ++----- .../admin/auth/service/impl/OnlineUserServiceImpl.java | 6 +++--- .../top/continew/admin/system/model/query/LogQuery.java | 7 ++----- .../top/continew/admin/system/model/query/UserQuery.java | 7 ++----- .../continew/admin/system/service/impl/LogServiceImpl.java | 4 ++-- .../admin/system/service/impl/UserServiceImpl.java | 2 +- .../continew/admin/schedule/model/query/JobLogQuery.java | 3 --- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java index ad5d1a6f..b8e5d6c8 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java @@ -16,14 +16,12 @@ package top.continew.admin.auth.model.query; -import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -55,8 +53,7 @@ public class OnlineUserQuery implements Serializable { * 登录时间 */ @Schema(description = "登录时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59") - @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - private List loginTime; + private List loginTime; /** * 用户 ID diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java index 4968c94b..e14fb14a 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -77,7 +77,7 @@ public class OnlineUserServiceImpl implements OnlineUserService { .isMatchClientId(query.getClientId(), userContext)) { continue; } - List loginTimeList = query.getLoginTime(); + List loginTimeList = query.getLoginTime(); entry.getValue().parallelStream().forEach(token -> { UserExtraContext extraContext = UserContextHolder.getExtraContext(token); if (!this.isMatchLoginTime(loginTimeList, extraContext.getLoginTime())) { @@ -144,10 +144,10 @@ public class OnlineUserServiceImpl implements OnlineUserService { * @param loginTime 登录时间 * @return 是否匹配登录时间 */ - private boolean isMatchLoginTime(List loginTimeList, LocalDateTime loginTime) { + private boolean isMatchLoginTime(List loginTimeList, LocalDateTime loginTime) { if (CollUtil.isEmpty(loginTimeList)) { return true; } - return DateUtil.isIn(DateUtil.date(loginTime).toJdkDate(), loginTimeList.get(0), loginTimeList.get(1)); + return loginTime.isAfter(loginTimeList.get(0)) && loginTime.isBefore(loginTimeList.get(1)); } } diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java index ff2559f9..ae833c4e 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java @@ -16,16 +16,14 @@ package top.continew.admin.system.model.query; -import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import top.continew.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -69,9 +67,8 @@ public class LogQuery implements Serializable { * 操作时间 */ @Schema(description = "操作时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59") - @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) @Size(max = 2, message = "操作时间必须是一个范围") - private List createTime; + private List createTime; /** * 状态 diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java index faf58986..50f823ae 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java @@ -16,16 +16,14 @@ package top.continew.admin.system.model.query; -import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import top.continew.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -57,9 +55,8 @@ public class UserQuery implements Serializable { * 创建时间 */ @Schema(description = "创建时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59") - @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) @Size(max = 2, message = "创建时间必须是一个范围") - private List createTime; + private List createTime; /** * 部门 ID diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java index 21a121ce..a4e4cdaa 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java @@ -43,7 +43,7 @@ import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.file.excel.util.ExcelUtils; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -114,7 +114,7 @@ public class LogServiceImpl implements LogService { String ip = query.getIp(); String createUserString = query.getCreateUserString(); DisEnableStatusEnum status = query.getStatus(); - List createTimeList = query.getCreateTime(); + List createTimeList = query.getCreateTime(); return new QueryWrapper().and(StrUtil.isNotBlank(description), q -> q.like("t1.description", description) .or() .like("t1.module", description)) diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 4afe9f3d..948d1336 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -500,7 +500,7 @@ public class UserServiceImpl extends BaseServiceImpl buildQueryWrapper(UserQuery query) { String description = query.getDescription(); DisEnableStatusEnum status = query.getStatus(); - List createTimeList = query.getCreateTime(); + List createTimeList = query.getCreateTime(); Long deptId = query.getDeptId(); List userIdList = query.getUserIds(); // 获取排除用户 ID 列表 diff --git a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java index 8fabe6d7..e28ad0c7 100644 --- a/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java @@ -16,13 +16,11 @@ package top.continew.admin.schedule.model.query; -import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Size; import lombok.Data; import org.hibernate.validator.constraints.Range; -import org.springframework.format.annotation.DateTimeFormat; import top.continew.admin.schedule.enums.JobExecuteStatusEnum; import java.io.Serial; @@ -70,7 +68,6 @@ public class JobLogQuery implements Serializable { * 创建时间 */ @Schema(description = "创建时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59") - @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) @Size(max = 2, message = "创建时间必须是一个范围") private LocalDateTime[] datetimeRange;