add annotationClasses

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.10.40</version>
+    <version>2.10.41</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.40</version>
+        <version>2.10.41</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.40</version>
+        <version>2.10.41</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryContextRegister.java

@@ -6,7 +6,7 @@
 @AllArgsConstructor
 public class JpaQueryContextRegister implements InitializingBean {
 
-    private JpaQuery JPAQuery;
+    private final JpaQuery JPAQuery;
 
     @Override
     public void afterPropertiesSet() throws Exception {

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityClassBuilder.java

@@ -12,6 +12,7 @@
 import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
+import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -146,6 +147,12 @@ private List<AnnotationDescription> buildFieldAnnotations(
             TableEntityMetadata.ColumnMeta columnMeta) {
         List<AnnotationDescription> annotations = new ArrayList<>();
 
+        if (columnMeta.getAnnotationClasses() != null) {
+            for(Class<? extends Annotation> annotaionClass: columnMeta.getAnnotationClasses()) {
+                annotations.add(AnnotationDescription.Builder.ofType(annotaionClass).build());
+            }
+        }
+
         // @Id 注解
         if (columnMeta.isPrimaryKey()) {
             annotations.add(AnnotationDescription.Builder.ofType(Id.class).build());

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityMetadata.java

@@ -4,8 +4,10 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 表实体元数据
@@ -64,6 +66,10 @@ public static class ColumnMeta {
          * 主键自增策略
          */
         private GeneratedValueMeta generatedValue;
+        /**
+         * 字段注解
+         */
+        private Set<Class<? extends Annotation>> annotationClasses;
         /**
          * 备注
          */
@@ -149,8 +155,12 @@ public void setTable(String name) {
         this.setTable(name, null, null, null);
     }
 
+    public void addColumn(ColumnMeta column) {
+        this.columns.add(column);
+    }
+
     public void addPrimaryKeyColumn(Class<?> type, String fieldName, String columnName, GenerationType strategy,
-                                    String generator, String comment, boolean isLob, boolean unique, boolean nullable,
+                                    String generator, Set<Class<? extends Annotation>> annotationClasses, String comment, boolean isLob, boolean unique, boolean nullable,
                                     boolean insertable, boolean updatable, String columnDefinition,
                                     int length, int precision, int scale) {
         ColumnMeta column = new ColumnMeta();
@@ -161,6 +171,7 @@ public void addPrimaryKeyColumn(Class<?> type, String fieldName, String columnNa
         GeneratedValueMeta generatedValueMeta = new GeneratedValueMeta();
         generatedValueMeta.setGenerator(generator);
         generatedValueMeta.setStrategy(strategy);
+        column.setAnnotationClasses(annotationClasses);
         column.setGeneratedValue(generatedValueMeta);
         column.setLob(isLob);
         column.setComment(comment);
@@ -172,7 +183,7 @@ public void addPrimaryKeyColumn(Class<?> type, String fieldName, String columnNa
         column.setLength(length);
         column.setPrecision(precision);
         column.setScale(scale);
-        this.columns.add(column);
+        this.addColumn(column);
     }
 
     public void addColumn(Class<?> type, String fieldName, String columnName, String comment, boolean isLob,
@@ -194,7 +205,7 @@ public void addColumn(Class<?> type, String fieldName, String columnName, String
         column.setLength(length);
         column.setPrecision(precision);
         column.setScale(scale);
-        this.columns.add(column);
+        this.addColumn(column);
     }
 
     public void addColumn(Class<?> type, String name, String comment) {
@@ -214,15 +225,23 @@ public void addColumn(Class<?> type, String name) {
     }
 
     public void addPrimaryKeyColumn(Class<?> type, String name) {
-        this.addPrimaryKeyColumn(type, name, name, null, null, null, false, false, false, false, false, null, 255, 0, 0);
+        this.addPrimaryKeyColumn(type, name, name, null, null, null, null, false, false, false, false, false, null, 255, 0, 0);
+    }
+
+    public void addPrimaryKeyColumn(Class<?> type, String name, String comment) {
+        this.addPrimaryKeyColumn(type, name, name, null, null, null, comment, false, false, false, false, false, null, 255, 0, 0);
     }
 
     public void addPrimaryKeyColumn(Class<?> type, String name, GenerationType strategy) {
-        this.addPrimaryKeyColumn(type, name, name, strategy, null, null, false, false, false, false, false, null, 255, 0, 0);
+        this.addPrimaryKeyColumn(type, name, name, strategy, null, null, null, false, false, false, false, false, null, 255, 0, 0);
     }
 
     public void addPrimaryKeyColumn(Class<?> type, String name, GenerationType strategy, String comment) {
-        this.addPrimaryKeyColumn(type, name, name, strategy, null, comment, false, false, false, false, false, null, 255, 0, 0);
+        this.addPrimaryKeyColumn(type, name, name, strategy, null, null, comment, false, false, false, false, false, null, 255, 0, 0);
+    }
+
+    public void addPrimaryKeyColumn(Class<?> type, String name, Set<Class<? extends Annotation>> annotationClasses, String comment) {
+        this.addPrimaryKeyColumn(type, name, name, null, null, annotationClasses, comment, false, false, false, false, false, null, 255, 0, 0);
     }
 
     public void verify() {

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.40</version>
+        <version>2.10.41</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.40</version>
+        <version>2.10.41</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.10.40</version>
+        <version>2.10.41</version>
     </parent>
     <artifactId>springboot-starter</artifactId>