refactor(core):优化时间字段处理与日志输出
- 将Date类型时间字段转换为LocalDateTime后格式化,提升时间处理准确性 - 启用Jackson对Java 8时间类型的支持,确保时间序列化一致性-优化非管理员权限查询逻辑中的日志输出,增强调试信息可读性 - 改进定时任务中订单查询的日志描述,明确业务意图 - 移除了冗余的Jackson JSR310模块配置,避免重复注册问题
This commit is contained in:
@@ -69,13 +69,21 @@ public class CmsWebsiteServiceImplHelper {
|
|||||||
vo.setRunning(website.getRunning());
|
vo.setRunning(website.getRunning());
|
||||||
vo.setVersion(website.getVersion());
|
vo.setVersion(website.getVersion());
|
||||||
if (website.getCreateTime() != null) {
|
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) {
|
if (website.getExpirationTime() != null) {
|
||||||
// vo.setExpirationTime(website.getExpirationTime().format(formatter));
|
// 将Date转换为LocalDateTime后格式化
|
||||||
// }
|
LocalDateTime expirationTime = website.getExpirationTime().toInstant()
|
||||||
|
.atZone(java.time.ZoneId.systemDefault())
|
||||||
|
.toLocalDateTime();
|
||||||
|
vo.setExpirationTime(expirationTime.format(formatter));
|
||||||
|
}
|
||||||
|
|
||||||
// 过期相关信息
|
// 过期相关信息
|
||||||
vo.setExpired(website.getExpired());
|
vo.setExpired(website.getExpired());
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public class OaAppController extends BaseController {
|
|||||||
if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){
|
if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){
|
||||||
// 非管理员按项目成员权限显示
|
// 非管理员按项目成员权限显示
|
||||||
final List<OaAppUser> list = oaAppUserService.list(new LambdaQueryWrapper<OaAppUser>().eq(OaAppUser::getUserId, userId));
|
final List<OaAppUser> list = oaAppUserService.list(new LambdaQueryWrapper<OaAppUser>().eq(OaAppUser::getUserId, userId));
|
||||||
System.out.println("list = " + list);
|
System.out.println("非管理员按项目成员权限显示 list = " + list);
|
||||||
final Set<Integer> collect = list.stream().map(OaAppUser::getAppId).collect(Collectors.toSet());
|
final Set<Integer> collect = list.stream().map(OaAppUser::getAppId).collect(Collectors.toSet());
|
||||||
param.setAppIds(collect);
|
param.setAppIds(collect);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
|
|||||||
.last("LIMIT " + batchSize);
|
.last("LIMIT " + batchSize);
|
||||||
|
|
||||||
final List<ShopOrder> list = shopOrderService.list(queryWrapper);
|
final List<ShopOrder> list = shopOrderService.list(queryWrapper);
|
||||||
System.out.println("list = " + list.size());
|
System.out.println("定时任务需要查询所有租户的超时订单 list = " + list.size());
|
||||||
return shopOrderService.list(queryWrapper);
|
return shopOrderService.list(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,9 +26,6 @@ spring:
|
|||||||
write-dates-as-timestamps: false
|
write-dates-as-timestamps: false
|
||||||
deserialization:
|
deserialization:
|
||||||
fail-on-unknown-properties: false
|
fail-on-unknown-properties: false
|
||||||
# 启用JSR310模块支持Java 8时间类型
|
|
||||||
modules:
|
|
||||||
- com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
|
|
||||||
|
|
||||||
# 连接池配置
|
# 连接池配置
|
||||||
datasource:
|
datasource:
|
||||||
|
|||||||
Reference in New Issue
Block a user