Merge pull request #129 from codingapi/dev

xlorne · web-flow · commit b0b74b63e67a · 2025-07-14T09:13:37.000+08:00
support SQLBuilder&lt;T&gt;
diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.9</version>
+       <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-       <version>3.4.9</version>
+       <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.9</version>
+        <version>3.4.10</version>
     </parent>
 
     <artifactId>example-interface</artifactId>
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.9</version>
+       <version>3.4.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.9</version>
+    <version>3.4.10</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.9</version>
+    <version>3.4.10</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.9</version>
+       <version>3.4.10</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.9</version>
+       <version>3.4.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jdbc/JdbcQuery.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jdbc/JdbcQuery.java
@@ -38,49 +38,49 @@ public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException
         }
     }
 
-    public List<Map<String, Object>> queryForMapList(SQLBuilder builder) {
+    public List<Map<String, Object>> queryForMapList(SQLBuilder<?> builder) {
         return queryForMapList(builder.getSQL(), builder.getParams());
     }
 
     public List<Map<String, Object>> queryForMapList(String sql, Object... params) {
-        return jdbcTemplate.query(sql, params, new CamelCaseRowMapper());
+        return jdbcTemplate.query(sql, new CamelCaseRowMapper(), params);
     }
 
-    public <T> List<T> queryForList(SQLBuilder builder) {
-        return (List<T>) queryForList(builder.getSQL(), builder.getClazz(), builder.getParams());
+    public <T> List<T> queryForList(SQLBuilder<T> builder) {
+        return queryForList(builder.getSQL(), builder.getClazz(), builder.getParams());
     }
 
     public <T> List<T> queryForList(String sql, Class<T> clazz, Object... params) {
-        return jdbcTemplate.query(sql, params, new BeanPropertyRowMapper<>(clazz));
+        return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(clazz), params);
     }
 
-    public <T> Page<T> queryForPage(SQLBuilder builder, PageRequest pageRequest) {
-        return (Page<T>)queryForPage(builder.getSQL(), builder.getCountSQL(), builder.getClazz(), pageRequest, builder.getParams());
+    public <T> Page<T> queryForPage(SQLBuilder<T> builder, PageRequest pageRequest) {
+        return queryForPage(builder.getSQL(), builder.getCountSQL(), builder.getClazz(), pageRequest, builder.getParams());
     }
 
     public <T> Page<T> queryForPage(String sql, String countSql, Class<T> clazz, PageRequest pageRequest, Object... params) {
-        List<T> list = jdbcTemplate.query(sql, params, new BeanPropertyRowMapper<>(clazz));
+        List<T> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(clazz), params);
         long count = this.countQuery(countSql, params);
         return new PageImpl<>(list, pageRequest, count);
     }
 
     public <T> Page<T> queryForPage(String sql, Class<T> clazz, PageRequest pageRequest, Object... params) {
-        String countSql = "select count(1) " + sql;
+        String countSql = "SELECT COUNT(1) " + sql;
         return this.queryForPage(sql, countSql, clazz, pageRequest, params);
     }
 
-    public Page<Map<String, Object>> queryForMapPage(SQLBuilder builder, PageRequest pageRequest) {
+    public Page<Map<String, Object>> queryForMapPage(SQLBuilder<?> builder, PageRequest pageRequest) {
         return queryForMapPage(builder.getSQL(), builder.getCountSQL(), pageRequest, builder.getParams());
     }
 
     public Page<Map<String, Object>> queryForMapPage(String sql, String countSql, PageRequest pageRequest, Object... params) {
-        List<Map<String, Object>> list = jdbcTemplate.query(sql, params, new CamelCaseRowMapper());
+        List<Map<String, Object>> list = jdbcTemplate.query(sql, new CamelCaseRowMapper(), params);
         long count = this.countQuery(countSql, params);
         return new PageImpl<>(list, pageRequest, count);
     }
 
     public Page<Map<String, Object>> queryForMapPage(String sql, PageRequest pageRequest, Object... params) {
-        String countSql = "select count(1) " + sql;
+        String countSql = "SELECT COUNT(1) " + sql;
         return this.queryForMapPage(sql, countSql, pageRequest, params);
     }
 
@@ -92,6 +92,6 @@ private long countQuery(String sql, Object... params) {
         if (paramsLength > countSqlParamsLength) {
             System.arraycopy(params, 0, newParams, 0, countSqlParamsLength);
         }
-        return jdbcTemplate.queryForObject(sql, newParams, Long.class);
+        return jdbcTemplate.queryForObject(sql, Long.class, newParams);
     }
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JPAQuery.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JPAQuery.java
@@ -17,12 +17,12 @@ public class JPAQuery {
 
     private final EntityManager entityManager;
 
-    public List<?> listQuery(SQLBuilder builder) {
+    public <T> List<T> listQuery(SQLBuilder<T> builder) {
         return listQuery(builder.getClazz(),builder.getSQL(),builder.getParams());
     }
 
-    public List<?> listQuery(Class<?> clazz, String sql, Object... params) {
-        TypedQuery<?> query = entityManager.createQuery(sql, clazz);
+    public <T> List<T> listQuery(Class<T> clazz, String sql, Object... params) {
+        TypedQuery<T> query = entityManager.createQuery(sql, clazz);
         if (params != null) {
             for (int i = 0; i < params.length; i++) {
                 query.setParameter(i + 1, params[i]);
@@ -31,25 +31,25 @@ public List<?> listQuery(Class<?> clazz, String sql, Object... params) {
         return query.getResultList();
     }
 
-    public Page<?> pageQuery(SQLBuilder builder,PageRequest pageRequest) {
+    public <T> Page<T> pageQuery(SQLBuilder<T> builder,PageRequest pageRequest) {
         return pageQuery(builder.getClazz(), builder.getSQL(), builder.getCountSQL(),pageRequest,builder.getParams());
     }
 
 
-    public Page<?> pageQuery(Class<?> clazz, String sql, PageRequest pageRequest, Object... params) {
-        return pageQuery(clazz,sql,"select count(1) " + sql,pageRequest,params);
+    public <T> Page<T> pageQuery(Class<T> clazz, String sql, PageRequest pageRequest, Object... params) {
+        return pageQuery(clazz,sql,"SELECT COUNT(1) " + sql,pageRequest,params);
     }
 
-    public Page<?> pageQuery(Class<?> clazz, String sql, String countSql, PageRequest pageRequest, Object... params) {
-        TypedQuery<?> query = entityManager.createQuery(sql, clazz);
+    public <T> Page<T> pageQuery(Class<T> clazz, String sql, String countSql, PageRequest pageRequest, Object... params) {
+        TypedQuery<T> query = entityManager.createQuery(sql, clazz);
         if (params != null) {
             for (int i = 0; i < params.length; i++) {
                 query.setParameter(i + 1, params[i]);
             }
         }
         query.setFirstResult(pageRequest.getPageNumber() * pageRequest.getPageSize());
         query.setMaxResults(pageRequest.getPageSize());
-        return new PageImpl<>(query.getResultList(), pageRequest, countQuery(countSql, params));
+        return new PageImpl<T>(query.getResultList(), pageRequest, countQuery(countSql, params));
     }
 
 
@@ -64,16 +64,16 @@ private long countQuery(String sql, Object... params) {
     }
 
     public Page<MapViewResult> pageMapQuery(QueryColumns columns, String sql, String countSql, PageRequest pageRequest, Object... params) {
-        String querySql = "select new com.codingapi.springboot.fast.jpa.map.MapViewResult('"+columns.getKey()+"',"+ String.join(",", columns.getColumnSql()) + ") " + sql;
-        String countQuerySql = "select count(1) " + countSql;
-        Page<MapViewResult> result = (Page<MapViewResult>) pageQuery(MapViewResult.class,querySql,countQuerySql,pageRequest,params);
+        String querySql = "SELECT new com.codingapi.springboot.fast.jpa.map.MapViewResult('"+columns.getKey()+"',"+ String.join(",", columns.getColumnSql()) + ") " + sql;
+        String countQuerySql = "SELECT COUNT(1) " + countSql;
+        Page<MapViewResult> result = pageQuery(MapViewResult.class,querySql,countQuerySql,pageRequest,params);
         QueryColumnsContext.getInstance().clearCache(columns.getKey());
         return result;
     }
 
-    public List<?> listMapQuery(QueryColumns columns, String sql, Object... params) {
-        String querySql = "select new com.codingapi.springboot.fast.jpa.map.MapViewResult('"+columns.getKey()+"',"+ String.join(",", columns.getColumnSql()) + ") " + sql;
-        List<?> result =  listQuery(MapViewResult.class,querySql,params);
+    public List<MapViewResult> listMapQuery(QueryColumns columns, String sql, Object... params) {
+        String querySql = "SELECT new com.codingapi.springboot.fast.jpa.map.MapViewResult('"+columns.getKey()+"',"+ String.join(",", columns.getColumnSql()) + ") " + sql;
+        List<MapViewResult> result =  listQuery(MapViewResult.class,querySql,params);
         QueryColumnsContext.getInstance().clearCache(columns.getKey());
         return result;
     }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/SQLBuilder.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/SQLBuilder.java
@@ -5,15 +5,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class SQLBuilder {
+public class SQLBuilder<T> {
 
-    private final StringBuilder sqlBuilder;
+    private final StringBuilder querySqlBuilder;
     private final StringBuilder countSQLBuilder;
     @Getter
     private int index;
     private final List<Object> params;
     @Getter
-    private final Class<?> clazz;
+    private final Class<T> clazz;
 
     public SQLBuilder(String sql) {
         this(null, sql, "select count(1) from " + sql);
@@ -23,21 +23,26 @@ public SQLBuilder(String sql,String countSql) {
         this(null, sql, countSql);
     }
 
-    public SQLBuilder(Class<?> clazz, String sql) {
+    public SQLBuilder(Class<T> clazz, String sql) {
         this(clazz, sql, "select count(1) from " + sql);
     }
 
-    public SQLBuilder(Class<?> clazz, String sql, String countSQL) {
+    public SQLBuilder(Class<T> clazz, String sql, String countSQL) {
         this.countSQLBuilder = new StringBuilder(countSQL);
-        this.sqlBuilder = new StringBuilder(sql);
+        this.querySqlBuilder = new StringBuilder(sql);
         this.index = 1;
         this.params = new ArrayList<>();
         this.clazz = clazz;
     }
 
+    /**
+     * Append SQL condition with a value.sql end value must be a placeholder (e.g., "?").
+     * @param sql the SQL condition to append, e.g., "where id = ?"
+     * @param value the value to bind to the SQL condition
+     */
     public void append(String sql, Object value) {
         if (value != null) {
-            sqlBuilder.append(" ").append(sql).append(index).append(" ");
+            querySqlBuilder.append(" ").append(sql).append(index).append(" ");
             countSQLBuilder.append(" ").append(sql).append(index).append(" ");
             params.add(value);
             index++;
@@ -55,12 +60,12 @@ public void addParam(Object value,int index){
     }
 
     public void appendSql(String sql){
-        sqlBuilder.append(" ").append(sql).append(" ");
+        querySqlBuilder.append(" ").append(sql).append(" ");
         countSQLBuilder.append(" ").append(sql).append(" ");
     }
 
     public String getSQL() {
-        return sqlBuilder.toString();
+        return querySqlBuilder.toString();
     }
 
     public String getCountSQL() {
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicNativeRepository.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicNativeRepository.java
@@ -12,7 +12,7 @@
 @NoRepositoryBean
 public interface DynamicNativeRepository<T, ID> extends BaseRepository<T, ID> {
 
-    default List<Map<String, Object>> dynamicNativeListMapQuery(SQLBuilder builder) {
+    default List<Map<String, Object>> dynamicNativeListMapQuery(SQLBuilder<?> builder) {
         return JdbcQueryContext.getInstance().getJdbcQuery().queryForMapList(builder);
     }
 
@@ -28,7 +28,7 @@ default <V> List<V> dynamicNativeListQuery(Class<V> clazz, String sql, Object...
         return JdbcQueryContext.getInstance().getJdbcQuery().queryForList(sql, clazz, params);
     }
 
-    default <V> List<V> dynamicNativeListQuery(SQLBuilder sqlBuilder) {
+    default <V> List<V> dynamicNativeListQuery(SQLBuilder<V> sqlBuilder) {
         return JdbcQueryContext.getInstance().getJdbcQuery().queryForList(sqlBuilder);
     }
 
@@ -48,11 +48,11 @@ default <V> Page<V> dynamicNativePageQuery(Class<V> clazz, String sql, PageReque
         return JdbcQueryContext.getInstance().getJdbcQuery().queryForPage(sql, clazz, request, params);
     }
 
-    default <V> Page<V> dynamicNativePageQuery(SQLBuilder sqlBuilder, PageRequest request) {
+    default <V> Page<V> dynamicNativePageQuery(SQLBuilder<V> sqlBuilder, PageRequest request) {
         return JdbcQueryContext.getInstance().getJdbcQuery().queryForPage(sqlBuilder, request);
     }
 
-    default Page<Map<String, Object>> dynamicNativeMapPageMapQuery(SQLBuilder sqlBuilder,PageRequest request) {
+    default Page<Map<String, Object>> dynamicNativeMapPageMapQuery(SQLBuilder<?> sqlBuilder,PageRequest request) {
         return JdbcQueryContext.getInstance().getJdbcQuery().queryForMapPage(sqlBuilder,request);
     }
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicRepository.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicRepository.java
diff --git a/springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/DemoRepositoryTest.java b/springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/DemoRepositoryTest.java
diff --git a/springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/dto/DemoDTO.java b/springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/dto/DemoDTO.java
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
