From d74dca784ccb5b97d7b3402c851410120614c743 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Mon, 13 Jan 2025 13:47:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.oracle=E5=88=87=E6=8D=A2=E8=87=B3pgsql?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=20=E8=A7=A3=E5=86=B3qc=E8=B0=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mybatis/MybatisInterceptor.java | 20 +++++++++---------- .../base/entity/original/GardsAlertData.java | 1 + .../base/entity/original/GardsDOSData.java | 1 + .../base/entity/original/GardsGPSData.java | 6 ++---- .../base/entity/original/GardsMetData.java | 1 + .../base/entity/original/GardsSohData.java | 1 + 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java index 67f143f1..6bbe8f2b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java @@ -70,16 +70,16 @@ public class MybatisInterceptor implements Interceptor { field.setAccessible(false); } } - if ("moddate".equalsIgnoreCase(field.getName())) { - field.setAccessible(true); - Object localCreateDate = field.get(parameter); - field.setAccessible(false); - if (localCreateDate == null || "".equals(localCreateDate)) { - field.setAccessible(true); - field.set(parameter, new Date()); - field.setAccessible(false); - } - } +// if ("moddate".equalsIgnoreCase(field.getName())) { +// field.setAccessible(true); +// Object localCreateDate = field.get(parameter); +// field.setAccessible(false); +// if (localCreateDate == null || "".equals(localCreateDate)) { +// field.setAccessible(true); +// field.set(parameter, new Date()); +// field.setAccessible(false); +// } +// } //注入部门编码 if ("sysOrgCode".equals(field.getName())) { field.setAccessible(true); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java index f1409ac3..fd3ec81f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java @@ -10,6 +10,7 @@ import java.util.Date; @Data @TableName("ORIGINAL.GARDS_ALERT_DATA") +@KeySequence("original.gards_alert_data_seq") public class GardsAlertData implements Serializable { @TableField(value = "STATION_ID") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java index 0b61734e..3f96f896 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java @@ -11,6 +11,7 @@ import java.util.Date; @Data @TableName(value = "ORIGINAL.GARDS_DOS_DATA") +@KeySequence("original.gards_dos_data_seq") public class GardsDOSData implements Serializable { /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java index 97c64e4c..da619360 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java @@ -1,9 +1,6 @@ package org.jeecg.modules.base.entity.original; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -13,6 +10,7 @@ import java.util.Date; @Data @TableName("ORIGINAL.GARDS_GPS_DATA") +@KeySequence("original.gards_gps_data_seq") public class GardsGPSData implements Serializable { @TableField(value = "STATION_ID") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java index d50f733f..82b170cc 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java @@ -11,6 +11,7 @@ import java.util.Date; @Data @TableName(value = "ORIGINAL.GARDS_MET_DATA") +@KeySequence("original.gards_met_data_seq") public class GardsMetData implements Serializable { /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java index ba977b99..c96a4703 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java @@ -10,6 +10,7 @@ import java.util.Date; @Data @TableName(value = "ORIGINAL.GARDS_SOH_DATA") +@KeySequence("original.gards_soh_data_seq") public class GardsSohData implements Serializable { /**