fix #162

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.10.21</version>
+    <version>2.10.22</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.21</version>
+        <version>2.10.22</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.21</version>
+        <version>2.10.22</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -17,47 +17,62 @@
 class DynamicSQLBuilder {
 
     private final PageRequest request;
-    private final Class<?> clazz;
 
     private final List<Object> params = new ArrayList<>();
     private int paramIndex = 1;
+    private final StringBuilder hql;
+    private final StringBuilder countHql ;
 
     public DynamicSQLBuilder(PageRequest request, Class<?> clazz) {
         this.request = request;
-        this.clazz = clazz;
+        this.hql = new StringBuilder("FROM " + clazz.getSimpleName() + " WHERE ");
+        this.countHql = new StringBuilder("SELECT COUNT(1) FROM " + clazz.getSimpleName() + " WHERE ");
+        this.build();
     }
 
+    public String getHQL(){
+        return this.hql.toString();
+    }
+
+    public String getCountHQL(){
+        return this.countHql.toString();
+    }
 
-    public String getHQL() {
-        StringBuilder hql = new StringBuilder("FROM " + clazz.getSimpleName() + " WHERE ");
+    private void build() {
+        StringBuilder querySQL = new StringBuilder();
+        StringBuilder orderSQL = new StringBuilder();
         RequestFilter requestFilter = request.getRequestFilter();
         if (requestFilter.hasFilter()) {
             List<Filter> filters = requestFilter.getFilters();
             for (int i = 0; i < filters.size(); i++) {
                 Filter filter = filters.get(i);
-                this.buildSQL(filter, hql);
+                this.buildSQL(filter, querySQL);
                 if (i != filters.size() - 1) {
-                    hql.append(" AND ");
+                    querySQL.append(" AND ");
                 }
             }
         }
 
         Sort sort = request.getSort();
         if (sort.isSorted()) {
-            hql.append(" ORDER BY ");
+            orderSQL.append(" ORDER BY ");
             List<Sort.Order> orders = sort.toList();
             for (int i = 0; i < orders.size(); i++) {
                 Sort.Order order = orders.get(i);
-                hql.append(order.getProperty()).append(" ").append(order.getDirection().name());
+                orderSQL.append(order.getProperty()).append(" ").append(order.getDirection().name());
                 if (i != orders.size() - 1) {
-                    hql.append(",");
+                    orderSQL.append(",");
                 }
             }
         }
 
+        this.hql.append(querySQL);
+        this.hql.append(orderSQL);
+        this.countHql.append(querySQL);
+
         log.debug("hql:{}", hql);
         log.debug("params:{}", params);
-        return hql.toString();
+
     }
 
 
@@ -139,7 +154,6 @@ private void buildSQL(Filter filter, StringBuilder hql) {
             params.add(Arrays.asList(filter.getValue()));
             paramIndex++;
         }
-
         if (filter.isGreaterThan()) {
             hql.append(filter.getKey()).append(" > ?").append(paramIndex);
             params.add(filter.getValue()[0]);
@@ -172,4 +186,5 @@ private void buildSQL(Filter filter, StringBuilder hql) {
     public Object[] getParams() {
         return params.toArray();
     }
+
 }

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

@@ -29,7 +29,7 @@ default Page<T> pageRequest(PageRequest request) {
         if (request.hasFilter()) {
             Class<T> clazz = getEntityClass();
             DynamicSQLBuilder dynamicSQLBuilder = new DynamicSQLBuilder(request, clazz);
-            return dynamicPageQuery(dynamicSQLBuilder.getHQL(), request, dynamicSQLBuilder.getParams());
+            return dynamicPageQuery(dynamicSQLBuilder.getHQL(),dynamicSQLBuilder.getCountHQL(), request, dynamicSQLBuilder.getParams());
         }
         return findAll((org.springframework.data.domain.PageRequest) request);
     }

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.21</version>
+        <version>2.10.22</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.21</version>
+        <version>2.10.22</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.21</version>
+        <version>2.10.22</version>
     </parent>
     <artifactId>springboot-starter</artifactId>