From 355e29080171dc0099c118283fc98292174ecea4 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sun, 16 Jul 2023 17:09:52 +0800 Subject: [PATCH] readme update --- .gitignore | 1 + README.md | 15 ++++++++++++--- .../mybatis/jpa/annotations/CurrentTimestamp.java | 15 --------------- .../dromara/mybatis/jpa/test/entity/Students.java | 8 ++++---- 4 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/annotations/CurrentTimestamp.java diff --git a/.gitignore b/.gitignore index 0e8026d..9005026 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ jdk/* */.classpath *.xml.versionsBackup */*.xml.versionsBackup +.vscode/settings.json diff --git a/README.md b/README.md index 1569094..92625af 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,16 @@ ## 1、JPA 3注释 ## 1.1、注释 -仅支持6个注释 +支持9个注释 > * @Entity > * @Table > * @Column > * @Id > * @GeneratedValue > * @Transient +> * @Temporal +> * @ColumnDefault +> * @PartitionKey ## 1.2、主键策略 @@ -40,13 +43,16 @@ public class Students extends JpaBaseEntity implements Serializable{ @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue + //@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + //@GeneratedValue(strategy=GenerationType.SEQUENCE,generator="SEQ_MYBATIS_STUD") private String id; @Column private String stdNo; @Column private String stdName; @Column + @ColumnDefault("'M'") private String stdGender; @Column private int stdAge; @@ -56,7 +62,10 @@ public class Students extends JpaBaseEntity implements Serializable{ private String stdClass; @Column private byte[] images; - + @Column(insertable = false) + @GeneratedValue + @Temporal(TemporalType.TIMESTAMP) + private LocalDateTime modifyDate; //getter setter } ``` diff --git a/mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/annotations/CurrentTimestamp.java b/mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/annotations/CurrentTimestamp.java deleted file mode 100644 index cc0cd4f..0000000 --- a/mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/annotations/CurrentTimestamp.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.mybatis.jpa.annotations; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Retention(RUNTIME) -@Target({ FIELD, METHOD, ANNOTATION_TYPE }) -public @interface CurrentTimestamp { - -} \ No newline at end of file diff --git a/mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/entity/Students.java b/mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/entity/Students.java index 4f867a0..50b5480 100644 --- a/mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/entity/Students.java +++ b/mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/entity/Students.java @@ -17,6 +17,7 @@ package org.dromara.mybatis.jpa.test.entity; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import org.dromara.mybatis.jpa.annotations.ColumnDefault; @@ -73,11 +74,10 @@ public class Students extends JpaEntity implements Serializable { private String stdClass; @Column private byte[] images; - @Column(insertable = false) @GeneratedValue @Temporal(TemporalType.TIMESTAMP) - private Date modifyDate; + private LocalDateTime modifyDate; public Students() { super(); @@ -151,11 +151,11 @@ public class Students extends JpaEntity implements Serializable { this.images = images; } - public Date getModifyDate() { + public LocalDateTime getModifyDate() { return modifyDate; } - public void setModifyDate(Date modifyDate) { + public void setModifyDate(LocalDateTime modifyDate) { this.modifyDate = modifyDate; } -- GitLab