feat-IDatabaseAccess-提升insertItem、updateItem对特殊数据类型的兼容性

ximatai · Sep 5, 2024 · 37a16fa · 37a16fa
1 parent d3fe0b0
commit 37a16fa
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 58 deletions.
diff --git a/my-core-uni/src/main/java/net/ximatai/muyun/ability/uni/curd/ICreateAbilityUni.java b/my-core-uni/src/main/java/net/ximatai/muyun/ability/uni/curd/ICreateAbilityUni.java
@@ -13,7 +13,7 @@ public interface ICreateAbilityUni extends IDatabaseUniAbility, IMetadataAbility
     @POST
     @Path("/create")
     default Uni<String> create(Map body) {
-        return getDatabase().insertItem(getMainTable(), body);
+        return getDatabase().insertItem(getSchemaName(), getMainTable(), body);
     }
 
 }
diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICreateAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICreateAbility.java
@@ -12,7 +12,7 @@ public interface ICreateAbility extends IDatabaseAbility, IMetadataAbility {
     @POST
     @Path("/create")
     default String create(Map body) {
-        return getDatabase().insertItem(getMainTable(), body);
+        return getDatabase().insertItem(getSchemaName(), getMainTable(), body);
     }
 
 }
diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java
@@ -16,7 +16,7 @@ public interface IUpdateAbility extends IDatabaseAbility, IMetadataAbility {
     @Transactional
     default Integer update(@PathParam("id") String id, Map body) {
         body.put("id", id);
-        return getDatabase().updateItem(getMainTable(), body);
+        return getDatabase().updateItem(getSchemaName(), getMainTable(), body);
     }
 
 }
diff --git a/my-database-std/build.gradle b/my-database-std/build.gradle
@@ -10,6 +10,7 @@ dependencies {
     api enforcedPlatform(libs.quarkus.platform.bom)
     api project(':my-database')
 
+    api "org.eclipse:yasson:3.0.4"
     api "io.quarkus:quarkus-hibernate-orm"
     api "io.quarkus:quarkus-jdbc-postgresql"
 }
diff --git a/my-database-std/src/main/java/net/ximatai/muyun/database/std/DataAccessStd.java b/my-database-std/src/main/java/net/ximatai/muyun/database/std/DataAccessStd.java
@@ -1,40 +1,78 @@
 package net.ximatai.muyun.database.std;
 
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
 import jakarta.transaction.Transactional;
 import net.ximatai.muyun.database.DBInfoProvider;
 import net.ximatai.muyun.database.IDatabaseAccessStd;
 import net.ximatai.muyun.database.exception.MyDatabaseException;
-
+import net.ximatai.muyun.database.metadata.DBColumn;
+import net.ximatai.muyun.database.metadata.DBTable;
+import org.postgresql.util.PGobject;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @ApplicationScoped
 public class DataAccessStd extends DBInfoProvider implements IDatabaseAccessStd {
 
+    Jsonb jsonb = JsonbBuilder.create();
+
     @Override
-    public <T> T insert(String sql, Map<String, ?> params, String pk, Class<T> idType) {
-        return getJdbi().withHandle(handle -> {
-            var query = handle.createUpdate(sql);
-            if (params != null) {
-                params.forEach(query::bind);
+    public Map<String, ?> transformDataForDB(DBTable dbTable, Map<String, ?> data) {
+        // 创建一个新的 Map 来存储修改后的数据
+        Map<String, Object> transformedData = new HashMap<>(data);
+
+        // 遍历原数据并修改
+        transformedData.forEach((k, v) -> {
+            DBColumn dbColumn = dbTable.getColumn(k);
+            if (dbColumn != null) {
+                transformedData.put(k, getDBValue(v, dbColumn.getType()));
             }
-            return query.executeAndReturnGeneratedKeys(pk).mapTo(idType).one();
-
         });
+
+        return transformedData;
+    }
+
+    public Object getDBValue(Object value, String type) {
+        if (value == null || isBlank(value.toString())) {
+            return null;
+        }
+
+        return switch (type) {
+            case "varchar" -> value.toString();
+            case "int8" -> convertToBigInteger(value);
+            case "int4", "int2" -> convertToInteger(value);
+            case "bool" -> isTrue(value);
+            case "date", "timestamp" -> handleDateTimestamp(value);
+            case "numeric" -> convertToBigDecimal(value);
+            case "json", "jsonb" -> convertToJson(value);
+            case "bytea" -> convertToByteArray(value);
+            default -> value;
+        };
     }
 
     @Override
-    public Map<String, Object> row(String sql, Map<String, ?> params) {
-        var row = getJdbi().withHandle(handle -> {
-            var query = handle.createQuery(sql);
-            if (params != null) {
-                params.forEach(query::bind);
-            }
+    public <T> T insert(String sql, Map<String, ?> params, String pk, Class<T> idType) {
+        return getJdbi().withHandle(handle -> handle.createUpdate(sql)
+            .bindMap(params)
+            .executeAndReturnGeneratedKeys(pk).mapTo(idType).one());
+    }
 
-            return query.mapToMap().findOne().orElse(null);
-        });
+    @Override
+    public Map<String, Object> row(String sql, Map<String, ?> params) {
+        var row = getJdbi().withHandle(handle -> handle.createQuery(sql)
+            .bindMap(params)
+            .mapToMap().findOne().orElse(null));
 
         if (row == null) {
             throw new MyDatabaseException(null, MyDatabaseException.Type.DATA_NOT_FOUND);
@@ -47,7 +85,6 @@ public Map<String, Object> row(String sql, Map<String, ?> params) {
     public Map<String, Object> row(String sql, List<?> params) {
         var row = getJdbi().withHandle(handle -> {
             var query = handle.createQuery(sql);
-
             if (params != null && !params.isEmpty()) {
                 for (int i = 0; i < params.size(); i++) {
                     query.bind(i, params.get(i));  // 通过索引绑定参数
@@ -71,14 +108,9 @@ public Map<String, Object> row(String sql) {
 
     @Override
     public List<Map<String, Object>> query(String sql, Map<String, ?> params) {
-        return getJdbi().withHandle(handle -> {
-            var query = handle.createQuery(sql);
-            if (params != null) {
-                params.forEach(query::bind);
-            }
-
-            return query.mapToMap().list();
-        });
+        return getJdbi().withHandle(handle -> handle.createQuery(sql)
+            .bindMap(params)
+            .mapToMap().list());
     }
 
     @Override
@@ -104,13 +136,9 @@ public List<Map<String, Object>> query(String sql) {
     @Override
     @Transactional
     public Integer update(String sql, Map<String, ?> params) {
-        return getJdbi().withHandle(handle -> {
-            var update = handle.createUpdate(sql);
-            if (params != null) {
-                params.forEach(update::bind);
-            }
-            return update.execute();
-        });
+        return getJdbi().withHandle(handle -> handle.createUpdate(sql)
+            .bindMap(params)
+            .execute());
     }
 
     @Override
@@ -123,4 +151,79 @@ public Object execute(String sql) {
         getJdbi().withHandle(handle -> handle.execute(sql));
         return null;
     }
+
+    private BigInteger convertToBigInteger(Object value) {
+        if (value instanceof String) {
+            return new BigInteger((String) value);
+        } else if (value instanceof Number) {
+            return BigInteger.valueOf(((Number) value).longValue());
+        }
+        throw new IllegalArgumentException("Cannot convert to BigInteger: " + value);
+    }
+
+    private Integer convertToInteger(Object value) {
+        if (value instanceof String) {
+            return Integer.valueOf((String) value);
+        } else if (value instanceof Number) {
+            return ((Number) value).intValue();
+        }
+        throw new IllegalArgumentException("Cannot convert to Integer: " + value);
+    }
+
+    private BigDecimal convertToBigDecimal(Object value) {
+        if (value instanceof String && !isBlank((String) value)) {
+            return new BigDecimal((String) value);
+        } else if (value instanceof Number) {
+            return BigDecimal.valueOf(((Number) value).doubleValue());
+        }
+        return null;
+    }
+
+    private byte[] convertToByteArray(Object value) {
+        if (value instanceof byte[]) {
+            return (byte[]) value;
+        }
+        return value.toString().getBytes();
+    }
+
+    private PGobject convertToJson(Object value) {
+        try {
+            PGobject jsonObject = new PGobject();
+            jsonObject.setType("json");
+
+            if (value instanceof String string) {
+                jsonObject.setValue(string);
+            } else if (value instanceof Map || value instanceof List) {
+                jsonObject.setValue(jsonb.toJson(value));
+            } else {
+                throw new MyDatabaseException("Invalid JSON content: value type is " + value.getClass().getName());
+            }
+
+            return jsonObject;
+
+        } catch (SQLException e) {
+            throw new MyDatabaseException("Error converting to PGobject for JSON type: " + e.getMessage());
+        }
+    }
+
+    private Timestamp handleDateTimestamp(Object value) {
+        if (value instanceof Date) {
+            return new Timestamp(((Date) value).getTime());
+        } else if (value instanceof String strValue) {
+            try {
+                return strValue.length() == 10 ? Timestamp.valueOf(strValue + " 00:00:00") : Timestamp.valueOf(strValue);
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException("Invalid date format: " + value);
+            }
+        }
+        return null;
+    }
+
+    private boolean isBlank(String value) {
+        return value == null || value.trim().isEmpty();
+    }
+
+    private boolean isTrue(Object value) {
+        return Objects.equals(value, Boolean.TRUE) || "true".equalsIgnoreCase(value.toString());
+    }
 }
diff --git a/my-database-uni/src/main/java/net/ximatai/muyun/database/uni/IDatabaseAccessUni.java b/my-database-uni/src/main/java/net/ximatai/muyun/database/uni/IDatabaseAccessUni.java
@@ -9,12 +9,12 @@
 public interface IDatabaseAccessUni extends IDatabaseAccess {
 
     @Override
-    default Uni<String> insertItem(String tableName, Map<String, ?> params) {
-        return (Uni<String>) IDatabaseAccess.super.insertItem(tableName, params);
+    default Uni<String> insertItem(String schema, String tableName, Map<String, ?> params) {
+        return (Uni<String>) IDatabaseAccess.super.insertItem(schema, tableName, params);
     }
 
-    default Uni<Boolean> updateItem(String tableName, Map<String, ?> params) {
-        Uni<Integer> updated = (Uni<Integer>) IDatabaseAccess.super.updateItem(tableName, params);
+    default Uni<Boolean> updateItem(String schema, String tableName, Map<String, ?> params) {
+        Uni<Integer> updated = (Uni<Integer>) IDatabaseAccess.super.updateItem(schema, tableName, params);
         return updated.onItem().transform(rowsUpdated -> rowsUpdated == 1);
     }
 

diff --git a/my-database/build.gradle b/my-database/build.gradle
@@ -7,5 +7,6 @@ plugins {
 
 dependencies {
     api libs.jdbi.core
+    testImplementation 'com.h2database:h2:2.1.214'
 }
 
diff --git a/my-database/src/main/java/net/ximatai/muyun/database/IDatabaseAccess.java b/my-database/src/main/java/net/ximatai/muyun/database/IDatabaseAccess.java
@@ -10,6 +10,10 @@
 
 public interface IDatabaseAccess extends IDBInfoProvider {
 
+    default Map<String, ?> transformDataForDB(DBTable dbTable, Map<String, ?> data) {
+        return data;
+    }
+
     default String buildInsertSql(String tableName, Map<String, ?> params) {
         DBTable dbTable = getDBInfo().getTables().get(tableName);
         Objects.requireNonNull(dbTable);
@@ -44,12 +48,16 @@ default String buildUpdateSql(String tableName, Map<String, ?> params, String pk
         return "UPDATE " + tableName + " SET " + setClause + " WHERE " + pk + "=:" + pk;
     }
 
-    default Object insertItem(String tableName, Map<String, ?> params) {
-        return this.insert(buildInsertSql(tableName, params), params, "id", String.class);
+    default Object insertItem(String schema, String tableName, Map<String, ?> params) {
+        DBTable table = getDBInfo().getSchema(schema).getTable(tableName);
+        Map<String, ?> transformed = transformDataForDB(table, params);
+        return this.insert(buildInsertSql(tableName, transformed), transformed, "id", String.class);
     }
 
-    default Object updateItem(String tableName, Map<String, ?> params) {
-        return this.update(buildUpdateSql(tableName, params, "id"), params);
+    default Object updateItem(String schema, String tableName, Map<String, ?> params) {
+        DBTable table = getDBInfo().getSchema(schema).getTable(tableName);
+        Map<String, ?> transformed = transformDataForDB(table, params);
+        return this.update(buildUpdateSql(tableName, transformed, "id"), transformed);
     }
 
     default Object deleteItem(String tableName, String id) {

diff --git a/my-database/src/main/java/net/ximatai/muyun/database/IDatabaseAccessStd.java b/my-database/src/main/java/net/ximatai/muyun/database/IDatabaseAccessStd.java
@@ -7,12 +7,12 @@
 
 public interface IDatabaseAccessStd extends IDatabaseAccess {
 
-    default String insertItem(String tableName, Map<String, ?> params) {
-        return (String) IDatabaseAccess.super.insertItem(tableName, params);
+    default String insertItem(String schema, String tableName, Map<String, ?> params) {
+        return (String) IDatabaseAccess.super.insertItem(schema, tableName, params);
     }
 
-    default Integer updateItem(String tableName, Map<String, ?> params) {
-        Integer num = (Integer) IDatabaseAccess.super.updateItem(tableName, params);
+    default Integer updateItem(String schema, String tableName, Map<String, ?> params) {
+        Integer num = (Integer) IDatabaseAccess.super.updateItem(schema, tableName, params);
         if (num == 0) {
             throw new MyDatabaseException(MyDatabaseException.Type.DATA_NOT_FOUND);
         }

diff --git a/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java b/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java
@@ -1,15 +1,11 @@
 package net.ximatai.muyun.platform.controller;
 
-import jakarta.inject.Inject;
 import jakarta.ws.rs.Path;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
-import net.ximatai.muyun.database.IDatabaseAccess;
+import net.ximatai.muyun.core.Scaffold;
 
 @Path("/module")
-public class ModuleController implements ICURDAbility {
-
-    @Inject
-    IDatabaseAccess databaseAccess;
+public class ModuleController extends Scaffold implements ICURDAbility {
 
     @Override
     public String getSchemaName() {
@@ -21,8 +17,4 @@ public String getMainTable() {
         return "app_module";
     }
 
-    @Override
-    public IDatabaseAccess getDatabaseAccess() {
-        return databaseAccess;
-    }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -2,7 +2,7 @@ plugins {
     id "com.gradle.develocity" version "3.17.5"
 }
 
-rootProject.name = 'MuYun'
+rootProject.name = 'muyun'
 
 assert JavaVersion.current() >= JavaVersion.VERSION_21:
     "You must use at least Java 21 to build the project, you're currently using ${System.getProperty("java.version")}"