diff --git a/.gitignore b/.gitignore index 0e8026dfc5e69f6d6d2be2bf16d2cc48d563f81f..9005026528e02d597d6f883e7fcb44ab9c2b06a8 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 1569094dd41df29dc75dcc6e04b1082b95d76ff4..92625afbce3e2c7a5cc68fab79274483d6726c4f 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 cc0cd4f0694b960045822f49ce5d0e519fe6e5ff..0000000000000000000000000000000000000000 --- 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 4f867a06b8d828263c7ffac2874f1e52214ee46f..50b548038b58461184b2e0514d119eb7d1c05be2 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; }