From 8687f641a5806f7156d9f02247c67029cc8cac5c Mon Sep 17 00:00:00 2001 From: Carina Date: Wed, 26 May 2021 21:25:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E4=BC=98=E5=8C=96=E9=87=8D=E6=9E=84=20-=20?= =?UTF-8?q?=E5=8F=AF=E6=8F=90=E7=94=A8=E6=88=B7=E7=AD=9B=E9=80=89=E9=80=82?= =?UTF-8?q?=E5=90=88=E7=9A=84Java=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../converter/JavaColumnTypeConverter.java | 7 +++- .../database/mysql/MySqlSyncColumnType.java | 33 +++++++++---------- .../plugins/generator/enums/TypeEnum.java | 10 ++++++ 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/converter/JavaColumnTypeConverter.java b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/converter/JavaColumnTypeConverter.java index b0fdb928..5bb00613 100644 --- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/converter/JavaColumnTypeConverter.java +++ b/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 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 diff --git a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/database/mysql/MySqlSyncColumnType.java b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/database/mysql/MySqlSyncColumnType.java index 9e941d87..519e698a 100644 --- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/database/mysql/MySqlSyncColumnType.java +++ b/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)); } diff --git a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/enums/TypeEnum.java b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/enums/TypeEnum.java index 1c38167a..0bc48361 100644 --- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/plugins/generator/enums/TypeEnum.java +++ b/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")