From 74a7b47a67a11c41635d53ad2b4f7240b916fa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 24 Sep 2025 17:04:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=E4=BC=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86=E4=B8=8E=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将Date类型时间字段转换为LocalDateTime后格式化，提升时间处理准确性 - 启用Jackson对Java 8时间类型的支持，确保时间序列化一致性-优化非管理员权限查询逻辑中的日志输出，增强调试信息可读性 - 改进定时任务中订单查询的日志描述，明确业务意图 - 移除了冗余的Jackson JSR310模块配置，避免重复注册问题 --- .../impl/CmsWebsiteServiceImplHelper.java | 16 ++++++++++++---- .../gxwebsoft/oa/controller/OaAppController.java | 2 +- .../service/impl/OrderCancelServiceImpl.java | 2 +- src/main/resources/application.yml | 3 --- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java index 1f2b369..e632f51 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java @@ -69,13 +69,21 @@ public class CmsWebsiteServiceImplHelper { vo.setRunning(website.getRunning()); vo.setVersion(website.getVersion()); if (website.getCreateTime() != null) { - vo.setCreateTime(website.getCreateTime().format(formatter)); + // 将Date转换为LocalDateTime后格式化 + LocalDateTime createTime = website.getCreateTime().toInstant() + .atZone(java.time.ZoneId.systemDefault()) + .toLocalDateTime(); + vo.setCreateTime(createTime.format(formatter)); } // 时间字段 - 格式化为字符串 -// if (website.getExpirationTime() != null) { -// vo.setExpirationTime(website.getExpirationTime().format(formatter)); -// } + if (website.getExpirationTime() != null) { + // 将Date转换为LocalDateTime后格式化 + LocalDateTime expirationTime = website.getExpirationTime().toInstant() + .atZone(java.time.ZoneId.systemDefault()) + .toLocalDateTime(); + vo.setExpirationTime(expirationTime.format(formatter)); + } // 过期相关信息 vo.setExpired(website.getExpired()); diff --git a/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java b/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java index 35d6640..001c3f8 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java @@ -76,7 +76,7 @@ public class OaAppController extends BaseController { if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ // 非管理员按项目成员权限显示 final List list = oaAppUserService.list(new LambdaQueryWrapper().eq(OaAppUser::getUserId, userId)); - System.out.println("list = " + list); + System.out.println("非管理员按项目成员权限显示 list = " + list); final Set collect = list.stream().map(OaAppUser::getAppId).collect(Collectors.toSet()); param.setAppIds(collect); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java index 603e267..825afbb 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java @@ -126,7 +126,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { .last("LIMIT " + batchSize); final List list = shopOrderService.list(queryWrapper); - System.out.println("list = " + list.size()); + System.out.println("定时任务需要查询所有租户的超时订单 list = " + list.size()); return shopOrderService.list(queryWrapper); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8232c29..4888d93 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -26,9 +26,6 @@ spring: write-dates-as-timestamps: false deserialization: fail-on-unknown-properties: false - # 启用JSR310模块支持Java 8时间类型 - modules: - - com.fasterxml.jackson.datatype.jsr310.JavaTimeModule # 连接池配置 datasource: