From b9489d7406f97a21d9baaf43f7f339468df11852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 3 Apr 2026 10:59:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=87=8D=E5=A4=A7=E6=9B=B4=E6=96=B0]=20?= =?UTF-8?q?=E5=BA=94=E5=B9=BF=E5=A4=A7=E7=94=A8=E6=88=B7=E8=A6=81=E6=B1=82?= =?UTF-8?q?=20=E5=B0=86Date=E6=8D=A2=E6=88=90LocalDateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/web/service/SysLoginService.java | 3 +- .../core/domain/dto/TaskAssigneeDTO.java | 6 +-- .../common/core/domain/dto/UserDTO.java | 4 +- .../dromara/common/core/utils/DateUtils.java | 42 ++++++++++++++++++- .../common/core/utils/ServletUtils.java | 16 +++++++ .../common/log/event/OperLogEvent.java | 4 +- .../mybatis/core/domain/BaseEntity.java | 6 +-- .../handler/InjectionMetaObjectHandler.java | 14 +++---- .../dromara/demo/domain/vo/TestDemoVo.java | 6 +-- .../dromara/demo/domain/vo/TestTreeVo.java | 4 +- .../gen/service/GenTableServiceImpl.java | 10 +++-- .../dromara/system/domain/SysLoginInfo.java | 4 +- .../org/dromara/system/domain/SysOperLog.java | 4 +- .../org/dromara/system/domain/SysUser.java | 4 +- .../system/domain/bo/SysLoginInfoBo.java | 4 +- .../system/domain/bo/SysOperLogBo.java | 4 +- .../system/domain/vo/ProfileUserVo.java | 4 +- .../dromara/system/domain/vo/SysConfigVo.java | 4 +- .../dromara/system/domain/vo/SysDeptVo.java | 4 +- .../system/domain/vo/SysDictDataVo.java | 4 +- .../system/domain/vo/SysDictTypeVo.java | 4 +- .../system/domain/vo/SysLoginInfoVo.java | 4 +- .../dromara/system/domain/vo/SysMenuVo.java | 4 +- .../system/domain/vo/SysMessageVo.java | 4 +- .../dromara/system/domain/vo/SysNoticeVo.java | 4 +- .../system/domain/vo/SysOperLogVo.java | 4 +- .../dromara/system/domain/vo/SysOssVo.java | 4 +- .../dromara/system/domain/vo/SysPostVo.java | 4 +- .../dromara/system/domain/vo/SysRoleVo.java | 4 +- .../dromara/system/domain/vo/SysSocialVo.java | 4 +- .../system/domain/vo/SysUserExportVo.java | 4 +- .../dromara/system/domain/vo/SysUserVo.java | 6 +-- .../service/impl/SysLoginInfoServiceImpl.java | 8 ++-- .../service/impl/SysMessageServiceImpl.java | 5 +-- .../service/impl/SysOperLogServiceImpl.java | 4 +- .../dromara/workflow/domain/TestLeave.java | 6 +-- .../workflow/domain/bo/TestLeaveBo.java | 6 +-- .../workflow/domain/vo/FlowCategoryVo.java | 4 +- .../workflow/domain/vo/FlowDefinitionVo.java | 6 +-- .../workflow/domain/vo/FlowHisTaskVo.java | 10 ++--- .../workflow/domain/vo/FlowInstanceVo.java | 6 +-- .../workflow/domain/vo/FlowSpelVo.java | 4 +- .../workflow/domain/vo/FlowTaskVo.java | 6 +-- .../workflow/domain/vo/TestLeaveVo.java | 6 +-- .../impl/FlwTaskAssigneeServiceImpl.java | 3 +- .../service/impl/FlwTaskServiceImpl.java | 1 + .../service/impl/TestLeaveServiceImpl.java | 6 +-- 47 files changed, 170 insertions(+), 112 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java index 6e3959bd8..46d49928b 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.time.Duration; +import java.time.LocalDateTime; import java.util.List; import java.util.function.Supplier; @@ -178,7 +179,7 @@ public class SysLoginService { SysUser sysUser = new SysUser(); sysUser.setUserId(userId); sysUser.setLoginIp(ip); - sysUser.setLoginDate(DateUtils.getNowDate()); + sysUser.setLoginDate(LocalDateTime.now()); sysUser.setUpdateBy(userId); DataPermissionHelper.ignore(() -> userMapper.updateById(sysUser)); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java index 05d15c9df..f0b3c78ff 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.util.Collection; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; @@ -57,7 +57,7 @@ public class TaskAssigneeDTO implements Serializable { Function handlerCode, Function handlerName, Function groupName, - Function createTimeMapper) { + Function createTimeMapper) { return sourceCollection.stream() .map(item -> new TaskHandler( storageId.apply(item), @@ -99,7 +99,7 @@ public class TaskAssigneeDTO implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java index 1893f6f39..7bf4b2d99 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -68,6 +68,6 @@ public class UserDTO implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java index 6c450853c..5eb55238b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java @@ -10,6 +10,7 @@ import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.concurrent.TimeUnit; @@ -122,6 +123,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { return parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, date); } + /** + * 将 LocalDateTime 格式化为 YYYY-MM-DD HH:MM:SS 格式的字符串 + * + * @param dateTime 要格式化的 LocalDateTime 对象 + * @return 格式化后的日期时间字符串 + */ + public static String formatDateTime(final LocalDateTime dateTime) { + return dateTime.format(DateTimeFormatter.ofPattern(FormatsType.YYYY_MM_DD_HH_MM_SS.getTimeFormat())); + } + /** * 将指定日期按照指定格式进行格式化 * @@ -242,7 +253,36 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { if (sec > 0) { result.append(String.format("%d秒", sec)); } - return result.length() > 0 ? result.toString().trim() : "0秒"; + return !result.isEmpty() ? result.toString().trim() : "0秒"; + } + + /** + * 计算两个 LocalDateTime 时间点的差值（天、小时、分钟、秒），当值为0时不显示该单位 + * + * @param endDate 结束时间 + * @param nowDate 当前时间 + * @return 时间差字符串，格式为 "x天 x小时 x分钟 x秒"，若为 0 则不显示 + */ + public static String getTimeDifference(LocalDateTime endDate, LocalDateTime nowDate) { + long diffInMillis = java.time.Duration.between(nowDate, endDate).toMillis(); + long day = TimeUnit.MILLISECONDS.toDays(diffInMillis); + long hour = TimeUnit.MILLISECONDS.toHours(diffInMillis) % 24; + long min = TimeUnit.MILLISECONDS.toMinutes(diffInMillis) % 60; + long sec = TimeUnit.MILLISECONDS.toSeconds(diffInMillis) % 60; + StringBuilder result = new StringBuilder(); + if (day > 0) { + result.append(String.format("%d天 ", day)); + } + if (hour > 0) { + result.append(String.format("%d小时 ", hour)); + } + if (min > 0) { + result.append(String.format("%d分钟 ", min)); + } + if (sec > 0) { + result.append(String.format("%d秒", sec)); + } + return !result.isEmpty() ? result.toString().trim() : "0秒"; } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java index 509026f72..329892969 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java @@ -1,6 +1,7 @@ package org.dromara.common.core.utils; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.http.HttpStatus; import jakarta.servlet.ServletRequest; @@ -266,6 +267,21 @@ public class ServletUtils extends JakartaServletUtil { return getClientIP(getRequest()); } + /** + * 获取客户端 IP 地址 + * + * @return 客户端 IP 地址 + */ + public static String getClientIP(HttpServletRequest request, String... otherHeaderNames) { + String[] headers = {"X-Forwarded-For", "X-Real-IP", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"}; + if (ArrayUtil.isNotEmpty(otherHeaderNames)) { + headers = ArrayUtil.addAll(otherHeaderNames, headers); + } + + String ip = getClientIPByHeader(request, headers); + return StringUtils.strip(ip, "[]"); + } + /** * 对内容进行 URL 编码 * diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java index 05b20d428..a2b8b1a55 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java @@ -4,7 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 操作日志事件 @@ -101,7 +101,7 @@ public class OperLogEvent implements Serializable { /** * 操作时间 */ - private Date operTime; + private LocalDateTime operTime; /** * 消耗时间 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java index 303d7a9f5..3ca4785de 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * Entity基类 @@ -35,7 +35,7 @@ public class BaseEntity implements Serializable { * 创建时间 */ @TableField(fill = FieldFill.INSERT) - private Date createTime; + private LocalDateTime createTime; /** * 更新者 @@ -47,6 +47,6 @@ public class BaseEntity implements Serializable { * 更新时间 */ @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java index 7ab30fa73..6651e8333 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -11,7 +11,7 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.satoken.utils.LoginHelper; -import java.util.Date; +import java.time.LocalDateTime; /** * MP注入处理器 @@ -37,7 +37,7 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { try { if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { // 获取当前时间作为创建时间和更新时间，如果创建时间不为空，则使用创建时间，否则使用当前时间 - Date current = ObjectUtils.notNull(baseEntity.getCreateTime(), new Date()); + LocalDateTime current = ObjectUtils.notNull(baseEntity.getCreateTime(), LocalDateTime.now()); baseEntity.setCreateTime(current); baseEntity.setUpdateTime(current); @@ -58,9 +58,9 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { } } } else { - Date date = new Date(); - this.strictInsertFill(metaObject, "createTime", Date.class, date); - this.strictInsertFill(metaObject, "updateTime", Date.class, date); + LocalDateTime date = LocalDateTime.now(); + this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, date); + this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, date); } } catch (Exception e) { throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_INTERNAL_ERROR); @@ -77,7 +77,7 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { try { if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { // 获取当前时间作为更新时间，无论原始对象中的更新时间是否为空都填充 - Date current = new Date(); + LocalDateTime current = LocalDateTime.now(); baseEntity.setUpdateTime(current); // 获取当前登录用户的ID，并填充更新人信息 @@ -85,7 +85,7 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { Long userId = ObjectUtil.isNotNull(loginUser) ? loginUser.getUserId() : DEFAULT_USER_ID; baseEntity.setUpdateBy(userId); } else { - this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); } } catch (Exception e) { throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_INTERNAL_ERROR); diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java index 0f760c8a3..265881ff2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java @@ -13,7 +13,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -77,7 +77,7 @@ public class TestDemoVo implements Serializable { @ExcelRequired @DateTimeFormat("yyyy-MM-dd HH:mm:ss") @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; /** * 创建人 @@ -96,7 +96,7 @@ public class TestDemoVo implements Serializable { * 更新时间 */ @ExcelProperty(value = "更新时间") - private Date updateTime; + private LocalDateTime updateTime; /** * 更新人 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java index 2b54bfec7..f39dd3c53 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java @@ -8,7 +8,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -58,7 +58,7 @@ public class TestTreeVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index 9857fa987..0a75b598b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.gen.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; @@ -169,8 +170,9 @@ public class GenTableServiceImpl implements IGenTableService { gen.setTableName(x.getName()); gen.setTableComment(x.getComment()); // postgresql的表元数据没有创建时间这个东西(好奇葩) 只能new Date代替 - gen.setCreateTime(ObjectUtil.defaultIfNull(x.getCreateTime(), new Date())); - gen.setUpdateTime(x.getUpdateTime()); + Date createDate = ObjectUtil.defaultIfNull(x.getCreateTime(), new Date()); + gen.setCreateTime(LocalDateTimeUtil.of(createDate)); + gen.setUpdateTime(x.getUpdateTime() != null ? LocalDateTimeUtil.of(x.getUpdateTime()) : null); return gen; }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed()) .toList(); @@ -212,8 +214,8 @@ public class GenTableServiceImpl implements IGenTableService { gen.setDataName(dataName); gen.setTableName(x.getName()); gen.setTableComment(x.getComment()); - gen.setCreateTime(x.getCreateTime()); - gen.setUpdateTime(x.getUpdateTime()); + gen.setCreateTime(LocalDateTimeUtil.of(x.getCreateTime())); + gen.setUpdateTime(LocalDateTimeUtil.of(x.getUpdateTime())); return gen; }).toList(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLoginInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLoginInfo.java index 88703f5fb..6ccd7b035 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLoginInfo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLoginInfo.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 系统访问记录表 sys_login_info @@ -75,6 +75,6 @@ public class SysLoginInfo implements Serializable { /** * 访问时间 */ - private Date loginTime; + private LocalDateTime loginTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java index 6b5a325a6..938dfbdf0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 操作日志记录表 oper_log @@ -100,7 +100,7 @@ public class SysOperLog implements Serializable { /** * 操作时间 */ - private Date operTime; + private LocalDateTime operTime; /** * 消耗时间 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java index 2f38d2d08..59a4e190c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.mybatis.core.domain.BaseEntity; -import java.util.Date; +import java.time.LocalDateTime; /** * 用户对象 sys_user @@ -96,7 +96,7 @@ public class SysUser extends BaseEntity { /** * 最后登录时间 */ - private Date loginDate; + private LocalDateTime loginDate; /** * 备注 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java index 93b2bc5c2..bfcdcf1d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLoginInfoBo.java @@ -6,7 +6,7 @@ import org.dromara.system.domain.SysLoginInfo; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; @@ -76,7 +76,7 @@ public class SysLoginInfoBo implements Serializable { /** * 访问时间 */ - private Date loginTime; + private LocalDateTime loginTime; /** * 请求参数 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java index af69e237e..e51ac80e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java @@ -8,7 +8,7 @@ import org.dromara.system.domain.SysOperLog; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; @@ -112,7 +112,7 @@ public class SysOperLogBo implements Serializable { /** * 操作时间 */ - private Date operTime; + private LocalDateTime operTime; /** * 消耗时间 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java index afb81c5f8..40479d376 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileUserVo.java @@ -6,7 +6,7 @@ import org.dromara.common.translation.constant.TransConstant; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -74,7 +74,7 @@ public class ProfileUserVo implements Serializable { /** * 最后登录时间 */ - private Date loginDate; + private LocalDateTime loginDate; /** * 部门名 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java index a9687cb70..af1ca4e50 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java @@ -10,7 +10,7 @@ import org.dromara.system.domain.SysConfig; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -67,6 +67,6 @@ public class SysConfigVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index 917864e62..4c505f9be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -11,7 +11,7 @@ import org.dromara.system.domain.SysDept; import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -99,7 +99,7 @@ public class SysDeptVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; /** * 子部门 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java index a6d7aa7d6..887a8441f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java @@ -10,7 +10,7 @@ import org.dromara.system.domain.SysDictData; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -83,6 +83,6 @@ public class SysDictDataVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java index 40f38e287..db54e4696 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java @@ -8,7 +8,7 @@ import org.dromara.system.domain.SysDictType; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -52,6 +52,6 @@ public class SysDictTypeVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java index 8333f180d..d779ecd3f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java @@ -10,7 +10,7 @@ import org.dromara.system.domain.SysLoginInfo; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; @@ -95,7 +95,7 @@ public class SysLoginInfoVo implements Serializable { * 访问时间 */ @ExcelProperty(value = "访问时间") - private Date loginTime; + private LocalDateTime loginTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java index 9db114b67..1fb059899 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java @@ -7,7 +7,7 @@ import org.dromara.system.domain.SysMenu; import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; @@ -106,7 +106,7 @@ public class SysMenuVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 子菜单 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java index 161ca08fe..1df507f17 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMessageVo.java @@ -6,7 +6,7 @@ import org.dromara.system.domain.SysMessage; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 消息记录视图对象 sys_message @@ -68,5 +68,5 @@ public class SysMessageVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java index 271ae62b4..2b0fba348 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java @@ -8,7 +8,7 @@ import org.dromara.system.domain.SysNotice; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; @@ -68,6 +68,6 @@ public class SysNoticeVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java index b71ea2746..e99e9bec6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java @@ -10,7 +10,7 @@ import org.dromara.system.domain.SysOperLog; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -129,7 +129,7 @@ public class SysOperLogVo implements Serializable { * 操作时间 */ @ExcelProperty(value = "操作时间") - private Date operTime; + private LocalDateTime operTime; /** * 消耗时间 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java index cd2771acf..e9f996329 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java @@ -8,7 +8,7 @@ import org.dromara.system.domain.SysOss; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * OSS对象存储视图对象 sys_oss @@ -55,7 +55,7 @@ public class SysOssVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 上传人 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java index ffe694af3..f844657c7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -12,7 +12,7 @@ import org.dromara.system.domain.SysPost; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 岗位信息视图对象 sys_post @@ -80,7 +80,7 @@ public class SysPostVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; /** * 部门名 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java index 44b8fb36c..01c98068e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java @@ -11,7 +11,7 @@ import org.dromara.system.domain.SysRole; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 角色信息视图对象 sys_role @@ -86,7 +86,7 @@ public class SysRoleVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; /** * 用户是否存在此角色标识 默认不存在 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java index 4e4e00def..0ccf3c2b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java @@ -6,7 +6,7 @@ import org.dromara.system.domain.SysSocial; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -135,5 +135,5 @@ public class SysSocialVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java index 2e19512ee..e153ff5f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -9,7 +9,7 @@ import org.dromara.system.listener.DeptExcelConverter; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 用户对象导出VO @@ -83,7 +83,7 @@ public class SysUserExportVo implements Serializable { * 最后登录时间 */ @ExcelProperty(value = "最后登录时间") - private Date loginDate; + private LocalDateTime loginDate; /** * 负责人 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 5e1c9a466..0753e07e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -12,7 +12,7 @@ import org.dromara.system.domain.SysUser; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; @@ -96,7 +96,7 @@ public class SysUserVo implements Serializable { /** * 最后登录时间 */ - private Date loginDate; + private LocalDateTime loginDate; /** * 备注 @@ -106,7 +106,7 @@ public class SysUserVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 部门名 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java index 15f91df76..6b445ca6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java @@ -28,8 +28,8 @@ import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; @@ -56,8 +56,8 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { @EventListener public void recordLoginInfo(LoginInfoEvent loginInfoEvent) { HttpServletRequest request = loginInfoEvent.getRequest(); - final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent")); - final String ip = ServletUtils.getClientIP(request); + UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent")); + String ip = ServletUtils.getClientIP(request); // 客户端信息 String clientId = request.getHeader(LoginHelper.CLIENT_KEY); SysClientVo client = null; @@ -144,7 +144,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { @Override public void insertLoginInfo(SysLoginInfoBo bo) { SysLoginInfo loginInfo = MapstructUtils.convert(bo, SysLoginInfo.class); - loginInfo.setLoginTime(new Date()); + loginInfo.setLoginTime(LocalDateTime.now()); baseMapper.insert(loginInfo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java index beb33e5dc..1e660991d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java @@ -23,10 +23,9 @@ import org.dromara.system.mapper.SysMessageMapper; import org.dromara.system.service.ISysMessageService; import org.springframework.stereotype.Service; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; -import java.util.concurrent.TimeUnit; /** * 消息记录服务实现 @@ -212,7 +211,7 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService // 分类匹配 lqw.eq(SysMessage::getCategory, category); // 仅查询30天内消息 - lqw.ge(SysMessage::getCreateTime, new Date(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(BOX_DAYS))); + lqw.ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS)); // 全局消息 或 当前用户在接收人范围内 lqw.and(wrapper -> wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS) .or() diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java index b3b02f35f..175fb0951 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java @@ -19,8 +19,8 @@ import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; @@ -99,7 +99,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { @Override public void insertOperlog(SysOperLogBo bo) { SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); - operLog.setOperTime(new Date()); + operLog.setOperTime(LocalDateTime.now()); baseMapper.insert(operLog); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java index b54873ca6..8c45642b1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; +import java.time.LocalDateTime; /** * 请假对象 test_leave @@ -42,12 +42,12 @@ public class TestLeave extends BaseEntity { /** * 开始时间 */ - private Date startDate; + private LocalDateTime startDate; /** * 结束时间 */ - private Date endDate; + private LocalDateTime endDate; /** * 请假天数 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java index a42202271..84669b4c9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java @@ -12,7 +12,7 @@ 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.HashMap; import java.util.Map; @@ -57,7 +57,7 @@ public class TestLeaveBo implements Serializable { @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class}) @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; + private LocalDateTime startDate; /** * 结束时间 @@ -65,7 +65,7 @@ public class TestLeaveBo implements Serializable { @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class}) @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; + private LocalDateTime endDate; /** * 请假天数 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java index 33d85f38b..8b85f9ce6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java @@ -10,7 +10,7 @@ import org.dromara.workflow.domain.FlowCategory; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 流程分类视图对象 wf_category @@ -64,6 +64,6 @@ public class FlowCategoryVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java index 210f1de22..841ca3bf2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java @@ -6,7 +6,7 @@ import org.dromara.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * 流程定义视图 @@ -24,12 +24,12 @@ public class FlowDefinitionVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 更新时间 */ - private Date updateTime; + private LocalDateTime updateTime; /** * 删除标记 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java index caf2685b5..98afbede8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java @@ -9,7 +9,7 @@ import org.dromara.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -28,12 +28,12 @@ public class FlowHisTaskVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 更新时间 */ - private Date updateTime; + private LocalDateTime updateTime; /** * 删除标记 @@ -215,7 +215,7 @@ public class FlowHisTaskVo implements Serializable { * * @param createTime 创建时间 */ - public void setCreateTime(Date createTime) { + public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; updateRunDuration(); } @@ -225,7 +225,7 @@ public class FlowHisTaskVo implements Serializable { * * @param updateTime 更新时间 */ - public void setUpdateTime(Date updateTime) { + public void setUpdateTime(LocalDateTime updateTime) { this.updateTime = updateTime; updateRunDuration(); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java index a49c09061..f0bd6d1e5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java @@ -5,7 +5,7 @@ import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.workflow.common.constant.FlowConstant; -import java.util.Date; +import java.time.LocalDateTime; /** * 流程实例视图对象。 @@ -23,12 +23,12 @@ public class FlowInstanceVo { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 更新时间 */ - private Date updateTime; + private LocalDateTime updateTime; /** * 删除标记 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java index 35fd1c6d7..63eedaf07 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java @@ -10,7 +10,7 @@ import org.dromara.workflow.domain.FlowSpel; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -74,6 +74,6 @@ public class FlowSpelVo implements Serializable { * 创建时间 */ @ExcelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index b907d1c2d..e300b1681 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -9,7 +9,7 @@ import org.dromara.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -32,12 +32,12 @@ public class FlowTaskVo implements Serializable { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 更新时间 */ - private Date updateTime; + private LocalDateTime updateTime; /** * 删除标记 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java index 010793c3e..b66c25279 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java @@ -8,7 +8,7 @@ import org.dromara.workflow.domain.TestLeave; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** @@ -47,13 +47,13 @@ public class TestLeaveVo implements Serializable { * 开始时间 */ @ExcelProperty(value = "开始时间") - private Date startDate; + private LocalDateTime startDate; /** * 结束时间 */ @ExcelProperty(value = "结束时间") - private Date endDate; + private LocalDateTime endDate; /** * 请假天数 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java index 7d01bc403..c370acd3e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -12,7 +12,6 @@ import org.dromara.common.core.domain.dto.DeptDTO; import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.core.enums.FormatsType; import org.dromara.common.core.service.*; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StreamUtils; @@ -191,7 +190,7 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand .setHandlerCode(assignee -> StringUtils.blankToDefault(assignee.getHandlerCode(), "无")) .setHandlerName(assignee -> StringUtils.blankToDefault(assignee.getHandlerName(), "无")) .setGroupName(assignee -> this.getGroupName(type, assignee.getGroupName())) - .setCreateTime(assignee -> DateUtils.parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, assignee.getCreateTime())); + .setCreateTime(assignee -> DateUtils.formatDateTime(assignee.getCreateTime())); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 5c6e15d7e..34b22cea7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.UserService; +import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ValidatorUtils; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index b52af410d..5fd0a3626 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -1,7 +1,7 @@ package org.dromara.workflow.service.impl; import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; +import java.time.temporal.ChronoUnit; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -126,7 +126,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { */ @Override public TestLeaveVo insertByBo(TestLeaveBo bo) { - long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true); + long day = ChronoUnit.DAYS.between(bo.getStartDate(), bo.getEndDate()); // 截止日期也算一天 bo.setLeaveDays((int) day + 1); bo.setApplyCode(System.currentTimeMillis() + StrUtil.EMPTY); @@ -150,7 +150,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { @Transactional(rollbackFor = Exception.class) @Override public TestLeaveVo submitAndFlowStart(TestLeaveBo bo) { - long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true); + long day = ChronoUnit.DAYS.between(bo.getStartDate(), bo.getEndDate()); // 截止日期也算一天 bo.setLeaveDays((int) day + 1); if (ObjectUtil.isNull(bo.getId())) {