From 1b64de8f479ad2c662d8beb8423e465d511278dd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 03 六月 2025 14:31:49 +0800
Subject: [PATCH] OffsetDateTime时区问题
---
basic-server/src/main/java/com/ruoyi/basic/entity/Customer.java | 3 ++-
ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java | 14 +++++++-------
basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql | 15 +++++++++++----
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/Customer.java b/basic-server/src/main/java/com/ruoyi/basic/entity/Customer.java
index 1cb7511..2a96b0b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/Customer.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/Customer.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.entity;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -12,7 +13,7 @@
*/
@Data
@TableName("customer")
-public class Customer extends BaseEntity {
+public class Customer extends MyBaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql b/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
index e96683a..a4f4916 100644
--- a/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
+++ b/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
@@ -12,8 +12,12 @@
contact_address VARCHAR(255) NOT NULL DEFAULT '', -- 鑱旂郴鍦板潃
province_id BIGINT NOT NULL DEFAULT 0,
city_id BIGINT NOT NULL DEFAULT 0,
- district_id BIGINT NOT NULL DEFAULT 0,
- create_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -- 鑷姩濉厖鍒涘缓鏃堕棿
+ district_id BIGINT NOT NULL DEFAULT 0,
+ deleted int4 NOT NULL DEFAULT 0, -- 鏄惁鍒犻櫎锛堣蒋鍒犻櫎鏍囧織锛�
+ create_by VARCHAR(255), -- 鍒涘缓浜�
+ create_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, -- 鍒涘缓鏃堕棿锛岄粯璁ゅ綋鍓嶆椂闂�
+ update_by VARCHAR(255), -- 鏈�鍚庢洿鏂颁汉
+ update_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -- 鏈�鍚庢洿鏂版椂闂达紝榛樿褰撳墠鏃堕棿
);
-- 琛ㄦ敞閲婏細渚涘簲鍟嗕俊鎭〃锛屽瓨鍌ㄤ緵搴斿晢鍩烘湰淇℃伅锛堝惈鍦板潃灞傜骇鍏宠仈锛�
@@ -52,6 +56,9 @@
-- 鍖哄幙ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
COMMENT ON COLUMN supply.district_id IS '渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎';
--- 鍒涘缓鏃堕棿锛堝甫鏃跺尯锛岃嚜鍔ㄥ～鍏咃級
-COMMENT ON COLUMN supply.create_time IS '璁板綍鏁版嵁鍒涘缓鐨勬椂闂存埑锛堝甫鏃跺尯锛夛紝绯荤粺鑷姩濉厖褰撳墠鏃堕棿';
+COMMENT ON COLUMN supply.deleted IS '杞垹闄ゆ爣蹇楋紝true琛ㄧず宸插垹闄�';
+COMMENT ON COLUMN supply.create_by IS '鍒涘缓浜虹敤鎴峰悕';
+COMMENT ON COLUMN supply.create_time IS '璁板綍鍒涘缓鏃堕棿';
+COMMENT ON COLUMN supply.update_by IS '鏈�鍚庢洿鏂颁汉鐢ㄦ埛鍚�';
+COMMENT ON COLUMN supply.update_time IS '璁板綍鏈�鍚庢洿鏂版椂闂�';
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java b/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java
index 85996a0..81c6558 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/handler/MyMetaObjectHandler.java
@@ -5,7 +5,7 @@
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
@Component
public class MyMetaObjectHandler implements MetaObjectHandler {
@@ -14,22 +14,22 @@
public void insertFill(MetaObject metaObject) {
// 鍒ゆ柇瀛楁鏄惁瀛樺湪锛屽瓨鍦ㄦ墠濉厖
if (metaObject.hasSetter("createBy")) {
- Long userId = 0L;
+ Long userId;
try {
if (SecurityUtils.getLoginUser() != null) {
userId = SecurityUtils.getLoginUser().getUserId();
- this.strictInsertFill(metaObject, "createBy", Long.class, userId);
+ this.strictInsertFill(metaObject, "createBy", String.class, userId.toString());
}
} catch (Exception ignored) {
}
}
if (metaObject.hasSetter("createTime")) {
- this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
+ this.strictInsertFill(metaObject, "createTime", OffsetDateTime.class, OffsetDateTime.now());
}
if (metaObject.hasSetter("updateTime")) {
- this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
+ this.strictUpdateFill(metaObject, "updateTime", OffsetDateTime.class, OffsetDateTime.now());
}
}
@@ -38,11 +38,11 @@
// 鍒ゆ柇瀛楁鏄惁瀛樺湪锛屽瓨鍦ㄦ墠濉厖
if (metaObject.hasSetter("updateBy")) {
Long userId = SecurityUtils.getLoginUser().getUserId();
- this.strictUpdateFill(metaObject, "updateBy", Long.class, userId);
+ this.strictUpdateFill(metaObject, "updateBy", String.class, userId.toString());
}
if (metaObject.hasSetter("updateTime")) {
- this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
+ this.strictUpdateFill(metaObject, "updateTime", OffsetDateTime.class, OffsetDateTime.now());
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3