Merge pull request #37 from codingapi/3.x

xlorne · web-flow · commit 6b9cd981f788 · 2024-01-11T11:30:37.000+08:00
3.x
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.1.8</version>
+    <version>3.1.9</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</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.1.8</version>
+        <version>3.1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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
@@ -24,6 +24,11 @@ public List<?> listQuery(Class<?> clazz, String sql, Object... params) {
         return query.getResultList();
     }
 
+
+    public Page<?> pageQuery(Class<?> 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);
         if (params != null) {
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
@@ -31,7 +31,7 @@ default Page<T> dynamicPageQuery(String sql, String countSql, PageRequest reques
     }
 
     default Page<T> dynamicPageQuery(String sql, PageRequest request, Object... params) {
-        return (Page<T>) JpaQueryContext.getInstance().getJPAQuery().pageQuery(getEntityClass(), sql, "select count(1) " + sql, request, params);
+        return (Page<T>) JpaQueryContext.getInstance().getJPAQuery().pageQuery(getEntityClass(), sql, request, params);
     }
 
     default <V> Page<V> dynamicPageQuery(Class<V> clazz, String sql, String countSql, PageRequest request, Object... params) {
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicSQLBuilder.java b/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,6 +55,8 @@ public String getHql() {
             }
         }
 
+        log.debug("hql:{}", hql);
+        log.debug("params:{}", params);
         return hql.toString();
     }
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/ExampleBuilder.java b/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;
     }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/FastRepository.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/FastRepository.java
@@ -1,20 +1,26 @@
 package com.codingapi.springboot.fast.jpa.repository;
 
 import com.codingapi.springboot.framework.dto.request.PageRequest;
+import com.codingapi.springboot.framework.dto.request.SearchRequest;
 import org.springframework.core.ResolvableType;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.repository.JpaRepository;
 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,10 +36,16 @@ 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);
     }
 
+
+    default Page<T> searchRequest(SearchRequest request) {
+        Class<T> clazz = getDomainClass();
+        return pageRequest(request.toPageRequest(clazz));
+    }
+
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/SortRepository.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/SortRepository.java
@@ -0,0 +1,39 @@
+package com.codingapi.springboot.fast.jpa.repository;
+
+import com.codingapi.springboot.framework.domain.ISort;
+import com.codingapi.springboot.framework.dto.request.SortRequest;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@NoRepositoryBean
+public interface SortRepository<T extends ISort, ID> extends JpaRepository<T, ID> {
+
+
+    default void reSort(SortRequest request) {
+        if (request != null && !request.getIds().isEmpty()) {
+            List<T> list = new ArrayList<>();
+            int minSort = Integer.MAX_VALUE;
+            for (Object objectId : request.getIds()) {
+                ID id = (ID) objectId;
+                T t = getReferenceById(id);
+                if (t.getSort() == null) {
+                    minSort = 0;
+                } else {
+                    if (t.getSort() < minSort) {
+                        minSort = t.getSort();
+                    }
+                }
+                list.add(t);
+            }
+            for (T t : list) {
+                t.setSort(minSort++);
+            }
+            saveAll(list);
+        }
+    }
+
+
+}
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
@@ -70,7 +70,7 @@ void pageRequest() {
         PageRequest request = new PageRequest();
         request.setCurrent(1);
         request.setPageSize(10);
-        request.andFilter("name", Relation.LIKE, "%2%");
+        request.addFilter("name", Relation.LIKE, "%2%");
 
         Page<Demo> page = demoRepository.pageRequest(request);
         assertEquals(1, page.getTotalElements());
@@ -92,7 +92,7 @@ void customInSearch() {
         request.setCurrent(1);
         request.setPageSize(10);
 
-        request.andFilter("id", Relation.IN, 1, 2, 3);
+        request.addFilter("id", Relation.IN, 1, 2, 3);
 
         Page<Demo> page = demoRepository.pageRequest(request);
         log.info("demo:{}", page.getContent());
@@ -112,7 +112,7 @@ void customOrSearch() {
         demoRepository.save(demo2);
 
         PageRequest request = new PageRequest();
-        request.setCurrent(1);
+        request.setCurrent(0);
         request.setPageSize(10);
 
 
@@ -172,7 +172,7 @@ void sortQuery() {
         demoRepository.save(demo2);
 
         PageRequest request = new PageRequest();
-        request.setCurrent(1);
+        request.setCurrent(0);
         request.setPageSize(10);
 
         request.addSort(Sort.by("id").descending());
diff --git a/springboot-starter-security-jwt/pom.xml b/springboot-starter-security-jwt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.1.8</version>
+        <version>3.1.9</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.1.8</version>
+        <version>3.1.9</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/domain/ISort.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/domain/ISort.java
@@ -0,0 +1,8 @@
+package com.codingapi.springboot.framework.domain;
+
+public interface ISort {
+
+    void setSort(Integer sort);
+
+    Integer getSort();
+}
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Filter.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Filter.java
@@ -25,7 +25,7 @@ public Filter(String key, Object... value) {
     }
 
     public Filter(String key, Filter... value) {
-        this(key, null, value);
+        this(key, null,  value);
     }
 
     public static Filter as(String key, Relation relation, Object... value) {
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java
@@ -1,25 +1,25 @@
 package com.codingapi.springboot.framework.dto.request;
 
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Optional;
 
 public class PageRequest extends org.springframework.data.domain.PageRequest {
 
     @Getter
+    @Setter
     private int current;
+
+    @Setter
+    @Getter
     private int pageSize;
 
     @Getter
     private final RequestFilter requestFilter = new RequestFilter();
 
-    @Getter
-    private HttpServletRequest servletRequest;
 
     private org.springframework.data.domain.PageRequest pageRequest;
 
@@ -28,43 +28,13 @@ public PageRequest(int current, int pageSize, Sort sort) {
         this.current = current;
         this.pageSize = pageSize;
         this.pageRequest = org.springframework.data.domain.PageRequest.of(current, pageSize, sort);
-
-        try {
-            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
-            this.servletRequest = attributes.getRequest();
-            requestFilter.syncParameter(servletRequest);
-        } catch (Exception e) {
-        }
     }
 
 
     public PageRequest() {
         this(0, 20, Sort.unsorted());
     }
 
-    public void setCurrent(int current) {
-        this.current = current > 0 ? current - 1 : 0;
-        this.requestFilter.deleteFilter("current");
-    }
-
-    public String getParameter(String key) {
-        return servletRequest.getParameter(key);
-    }
-
-    public String getParameter(String key, String defaultValue) {
-        String result = servletRequest.getParameter(key);
-        return result == null ? defaultValue : result;
-    }
-
-    public int getIntParameter(String key) {
-        return Integer.parseInt(servletRequest.getParameter(key));
-    }
-
-    public int getIntParameter(String key, int defaultValue) {
-        String result = servletRequest.getParameter(key);
-        return result == null ? defaultValue : Integer.parseInt(result);
-    }
-
     public String getStringFilter(String key) {
         return requestFilter.getStringFilter(key);
     }
@@ -85,15 +55,6 @@ public boolean hasFilter() {
         return requestFilter.hasFilter();
     }
 
-    @Override
-    public int getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-        this.requestFilter.deleteFilter("pageSize");
-    }
 
     @Override
     public Sort getSort() {
@@ -164,7 +125,11 @@ public void addSort(Sort sort) {
         }
     }
 
-    public PageRequest andFilter(String key, Relation relation, Object... value) {
+    public void removeFilter(String key) {
+        requestFilter.removeFilter(key);
+    }
+
+    public PageRequest addFilter(String key, Relation relation, Object... value) {
         requestFilter.addFilter(key, relation, value);
         return this;
     }
@@ -174,8 +139,8 @@ public PageRequest addFilter(String key, Object... value) {
         return this;
     }
 
-    public PageRequest andFilter(Filter... value) {
-        requestFilter.andFilters(value);
+    public PageRequest andFilter(Filter... filters) {
+        requestFilter.andFilters(filters);
         return this;
     }
 
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/RequestFilter.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/RequestFilter.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SortRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SortRequest.java
diff --git a/springboot-starter/src/test/java/com/codingapi/springboot/framework/dto/request/PageRequestTest.java b/springboot-starter/src/test/java/com/codingapi/springboot/framework/dto/request/PageRequestTest.java
diff --git a/springboot-starter/src/test/java/com/codingapi/springboot/framework/query/test/DemoRepositoryTest.java b/springboot-starter/src/test/java/com/codingapi/springboot/framework/query/test/DemoRepositoryTest.java

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ default Page<T> dynamicPageQuery(String sql, String countSql, PageRequest reques`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`default Page<T> dynamicPageQuery(String sql, PageRequest request, Object... params) {`
`34`		`- return (Page<T>) JpaQueryContext.getInstance().getJPAQuery().pageQuery(getEntityClass(), sql, "select count(1) " + sql, request, params);`
	`34`	`+ return (Page<T>) JpaQueryContext.getInstance().getJPAQuery().pageQuery(getEntityClass(), sql, request, params);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`default <V> Page<V> dynamicPageQuery(Class<V> clazz, String sql, String countSql, PageRequest request, Object... params) {`