refactor: 代码生成器优化重构 - 可提用户筛选适合的Java类型

opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/converter/JavaColumnTypeConverter.java

@@ -36,18 +36,23 @@ public class JavaColumnTypeConverter implements ColumnTypeConverter {
     private static final Map<TypeEnum, JavaType> TYPE_MAP = new HashMap<>(64);
     static {
         TYPE_MAP.put(TypeEnum.BIT, JavaType.BOOLEAN);
-        TYPE_MAP.put(TypeEnum.BOOLEAN, JavaType.BOOLEAN);
         TYPE_MAP.put(TypeEnum.TINYINT, JavaType.BYTE);
         TYPE_MAP.put(TypeEnum.SMALLINT, JavaType.SHORT);
         TYPE_MAP.put(TypeEnum.INT, JavaType.INTEGER);
+        TYPE_MAP.put(TypeEnum.INTEGER, JavaType.INTEGER);
         TYPE_MAP.put(TypeEnum.BIGINT, JavaType.LONG);
         TYPE_MAP.put(TypeEnum.FLOAT, JavaType.FLOAT);
         TYPE_MAP.put(TypeEnum.DOUBLE, JavaType.DOUBLE);
         TYPE_MAP.put(TypeEnum.DECIMAL, JavaType.BIG_DECIMAL);
+        TYPE_MAP.put(TypeEnum.CHAR, JavaType.STRING);
         TYPE_MAP.put(TypeEnum.VARCHAR, JavaType.STRING);
+        TYPE_MAP.put(TypeEnum.TEXT, JavaType.STRING);
+        TYPE_MAP.put(TypeEnum.DATE, JavaType.DATE);
         TYPE_MAP.put(TypeEnum.DATETIME, JavaType.DATE);
+        TYPE_MAP.put(TypeEnum.TIMESTAMP, JavaType.DATE);
         TYPE_MAP.put(TypeEnum.BLOB, JavaType.BYTE_ARRAY);
         TYPE_MAP.put(TypeEnum.JSONB, JavaType.MAP_OBJECT) ;
+        TYPE_MAP.put(TypeEnum.BOOLEAN, JavaType.BOOLEAN);
     }
 
     @Override

opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/database/mysql/MySqlSyncColumnType.java

@@ -43,23 +43,22 @@ public enum MySqlSyncColumnType {
     private final ColumnTypeConverter columnTypeConverter = new JavaColumnTypeConverter();
 
     MySqlSyncColumnType(){
-        fieldTypeMap.put("bit", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("tinyint", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("smallint", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("int", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("integer", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("bigint", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("float", new FieldTypeAttribute(true, true));
-        fieldTypeMap.put("double", new FieldTypeAttribute(true, true));
-        fieldTypeMap.put("decimal", new FieldTypeAttribute(true, true));
-        fieldTypeMap.put("char", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("varchar", new FieldTypeAttribute(true, false));
-        fieldTypeMap.put("text", new FieldTypeAttribute(false, false));
-        fieldTypeMap.put("date", new FieldTypeAttribute(false, false));
-        fieldTypeMap.put("time", new FieldTypeAttribute(false, false));
-        fieldTypeMap.put("datetime", new FieldTypeAttribute(false, false));
-        fieldTypeMap.put("timestamp", new FieldTypeAttribute(false, false));
-        fieldTypeMap.put("blob", new FieldTypeAttribute(false, false));
+        fieldTypeMap.put(TypeEnum.BIT.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.TINYINT.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.SMALLINT.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.INT.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.INTEGER.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.BIGINT.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.FLOAT.getType(), new FieldTypeAttribute(true, true));
+        fieldTypeMap.put(TypeEnum.DOUBLE.getType(), new FieldTypeAttribute(true, true));
+        fieldTypeMap.put(TypeEnum.DECIMAL.getType(), new FieldTypeAttribute(true, true));
+        fieldTypeMap.put(TypeEnum.CHAR.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.VARCHAR.getType(), new FieldTypeAttribute(true, false));
+        fieldTypeMap.put(TypeEnum.TEXT.getType(), new FieldTypeAttribute(false, false));
+        fieldTypeMap.put(TypeEnum.DATE.getType(), new FieldTypeAttribute(false, false));
+        fieldTypeMap.put(TypeEnum.DATETIME.getType(), new FieldTypeAttribute(false, false));
+        fieldTypeMap.put(TypeEnum.TIMESTAMP.getType(), new FieldTypeAttribute(false, false));
+        fieldTypeMap.put(TypeEnum.BLOB.getType(), new FieldTypeAttribute(false, false));
     }
 
 

opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/enums/TypeEnum.java

@@ -33,6 +33,8 @@ public enum TypeEnum {
 
     INT("int"),
 
+    INTEGER("integer"),
+
     BIGINT("bigint"),
 
     FLOAT("float"),
@@ -41,10 +43,18 @@ public enum TypeEnum {
 
     DECIMAL("decimal"),
 
+    CHAR("char"),
+
     VARCHAR("varchar"),
 
+    TEXT("text"),
+
+    DATE("date"),
+
     DATETIME("datetime"),
 
+    TIMESTAMP("timestamp"),
+
     BLOB("blob"),
 
     JSONB("jsonb")