add SearchRequest

Author: xlorne

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

@@ -3,27 +3,32 @@
 import com.codingapi.springboot.framework.dto.request.Filter;
 import com.codingapi.springboot.framework.dto.request.PageRequest;
 import com.codingapi.springboot.framework.dto.request.RequestFilter;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class DynamicRequest {
+/**
+ * 动态条件查询组装
+ */
+@Slf4j
+class DynamicSQLBuilder {
 
     private final PageRequest request;
     private final Class<?> clazz;
 
     private final List<Object> params = new ArrayList<>();
     private int paramIndex = 1;
 
-    public DynamicRequest(PageRequest request, Class<?> clazz) {
+    public DynamicSQLBuilder(PageRequest request, Class<?> clazz) {
         this.request = request;
         this.clazz = clazz;
     }
 
 
-    public String getHql() {
+    public String getHQL() {
         StringBuilder hql = new StringBuilder("FROM " + clazz.getSimpleName() + " WHERE ");
         RequestFilter requestFilter = request.getRequestFilter();
         if (requestFilter.hasFilter()) {
@@ -50,8 +55,8 @@ public String getHql() {
             }
         }
 
-        System.out.println(hql);
-        System.out.println(params);
+        log.debug("hql:{}", hql);
+        log.debug("params:{}", params);
         return hql.toString();
     }
 

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/ExampleRequest.java renamed to springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/ExampleBuilder.java

@@ -8,12 +8,15 @@
 
 import java.beans.PropertyDescriptor;
 
-public class ExampleRequest {
+/**
+ *  Example组装
+ */
+class ExampleBuilder {
 
     private final PageRequest request;
     private final Class<?> clazz;
 
-    public ExampleRequest(PageRequest request, Class<?> clazz) {
+    public ExampleBuilder(PageRequest request, Class<?> clazz) {
         this.request = request;
         this.clazz = clazz;
     }

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

@@ -7,14 +7,19 @@
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.NoRepositoryBean;
 
+/**
+ * 更强大的Repository对象
+ * @param <T>
+ * @param <ID>
+ */
 @NoRepositoryBean
 public interface FastRepository<T, ID> extends JpaRepository<T, ID>, JpaSpecificationExecutor<T>, DynamicRepository<T, ID> {
 
     default Page<T> findAll(PageRequest request) {
         if (request.hasFilter()) {
             Class<T> clazz = getDomainClass();
-            ExampleRequest exampleRequest = new ExampleRequest(request, clazz);
-            return findAll(exampleRequest.getExample(), request);
+            ExampleBuilder exampleBuilder = new ExampleBuilder(request, clazz);
+            return findAll(exampleBuilder.getExample(), request);
         }
         return findAll((org.springframework.data.domain.PageRequest) request);
     }
@@ -30,8 +35,8 @@ default Class<T> getDomainClass() {
     default Page<T> pageRequest(PageRequest request) {
         if (request.hasFilter()) {
             Class<T> clazz = getDomainClass();
-            DynamicRequest dynamicRequest = new DynamicRequest(request, clazz);
-            return dynamicPageQuery(dynamicRequest.getHql(), request, dynamicRequest.getParams());
+            DynamicSQLBuilder dynamicSQLBuilder = new DynamicSQLBuilder(request, clazz);
+            return dynamicPageQuery(dynamicSQLBuilder.getHQL(), request, dynamicSQLBuilder.getParams());
         }
         return findAll((org.springframework.data.domain.PageRequest) request);
     }

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

@@ -16,7 +16,9 @@
 import java.util.Base64;
 import java.util.List;
 
-
+/**
+ *  HttpServletRequest 请求参数解析成 PageRequest对象
+ */
 public class SearchRequest {
 
     private int current;
@@ -60,21 +62,21 @@ public ClassContent(Class<?> clazz, PageRequest pageRequest) {
         }
 
         public void addFilter(String key, String value) {
-            Class<?> keyClass = getKeyClass(key);
+            Class<?> keyClass = getKeyType(key);
             Object v = JSON.parseObject(value, keyClass);
             pageRequest.addFilter(key, Relation.EQUAL, v);
         }
 
         public void addFilter(String key, List<String> value) {
-            Class<?> keyClass = getKeyClass(key);
+            Class<?> keyClass = getKeyType(key);
             pageRequest.addFilter(key, Relation.IN, value.stream()
                     .map(v -> JSON.parseObject(v, keyClass))
                     .toArray()
             );
         }
 
 
-        private Class<?> getKeyClass(String key) {
+        private Class<?> getKeyType(String key) {
             String[] keys = key.split("\\.");
             Class<?> keyClass = clazz;
             for (String k : keys) {