support search isNull isNotNull notIn

xlorne · xlorne · commit ea12d571407e · 2025-03-12T17:45:32.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-   <version>3.3.65</version>
+   <version>3.3.66</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.65</version>
+    <version>3.3.66</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.3.65</version>
+       <version>3.3.66</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
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.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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
@@ -99,6 +99,14 @@ private void buildSQL(Filter filter, StringBuilder hql) {
             paramIndex++;
         }
 
+        if (filter.isNull()) {
+            hql.append(filter.getKey()).append(" IS NULL ");
+        }
+
+        if (filter.isNotNull()) {
+            hql.append(filter.getKey()).append(" IS NOT NULL ");
+        }
+
         if (filter.isNotEqual()) {
             hql.append(filter.getKey()).append(" != ?").append(paramIndex);
             params.add(filter.getValue()[0]);
@@ -125,6 +133,12 @@ private void buildSQL(Filter filter, StringBuilder hql) {
             params.add(Arrays.asList(filter.getValue()));
             paramIndex++;
         }
+
+        if (filter.isNotIn()) {
+            hql.append(filter.getKey()).append(" NOT IN (").append("?").append(paramIndex).append(")");
+            params.add(Arrays.asList(filter.getValue()));
+            paramIndex++;
+        }
         if (filter.isGreaterThan()) {
             hql.append(filter.getKey()).append(" > ?").append(paramIndex);
             params.add(filter.getValue()[0]);
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
@@ -56,6 +56,44 @@ void findAll() {
         assertEquals(1, page.getTotalElements());
     }
 
+    @Test
+    void pageRequestIsNull() {
+        demoRepository.deleteAll();
+        Demo demo1 = new Demo();
+        demo1.setName("123");
+        demo1 = demoRepository.save(demo1);
+
+        Demo demo2 = new Demo();
+        demoRepository.save(demo2);
+
+        PageRequest request = new PageRequest();
+        request.setCurrent(1);
+        request.setPageSize(10);
+        request.addFilter("name", Relation.IS_NULL);
+
+        Page<Demo> page = demoRepository.pageRequest(request);
+        assertEquals(1, page.getTotalElements());
+    }
+
+    @Test
+    void pageRequestIsNotNull() {
+        demoRepository.deleteAll();
+        Demo demo1 = new Demo();
+        demo1.setName("123");
+        demo1 = demoRepository.save(demo1);
+
+        Demo demo2 = new Demo();
+        demoRepository.save(demo2);
+
+        PageRequest request = new PageRequest();
+        request.setCurrent(1);
+        request.setPageSize(10);
+        request.addFilter("name", Relation.IS_NOT_NULL);
+
+        Page<Demo> page = demoRepository.pageRequest(request);
+        assertEquals(1, page.getTotalElements());
+    }
+
     @Test
     void pageRequestNotEqual() {
         demoRepository.deleteAll();
@@ -74,6 +112,7 @@ void pageRequestNotEqual() {
 
         Page<Demo> page = demoRepository.pageRequest(request);
         assertEquals(1, page.getTotalElements());
+
     }
 
 
@@ -116,8 +155,28 @@ void customInSearch() {
         request.addFilter("id", Relation.IN, 1, 2, 3);
 
         Page<Demo> page = demoRepository.pageRequest(request);
-        log.info("demo:{}", page.getContent());
-//        assertEquals(2, page.getTotalElements());
+        assertEquals(2, page.getTotalElements());
+    }
+
+    @Test
+    void customNotInSearch() {
+        demoRepository.deleteAll();
+        Demo demo1 = new Demo();
+        demo1.setName("123");
+        demoRepository.save(demo1);
+
+        Demo demo2 = new Demo();
+        demo2.setName("456");
+        demoRepository.save(demo2);
+
+        PageRequest request = new PageRequest();
+        request.setCurrent(1);
+        request.setPageSize(10);
+
+        request.addFilter("id", Relation.NOT_IN, 3);
+
+        Page<Demo> page = demoRepository.pageRequest(request);
+        assertEquals(2, page.getTotalElements());
     }
 
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.3.65</version>
+       <version>3.3.66</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.3.65</version>
+       <version>3.3.66</version>
     </parent>
 
     <artifactId>springboot-starter-security</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.3.65</version>
+       <version>3.3.66</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
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
@@ -48,6 +48,18 @@ public boolean isEqual() {
         return relation == Relation.EQUAL;
     }
 
+    public boolean isNull() {
+        return relation == Relation.IS_NULL;
+    }
+
+    public boolean isNotNull() {
+        return relation == Relation.IS_NOT_NULL;
+    }
+
+    public boolean isNotIn() {
+        return relation == Relation.NOT_IN;
+    }
+
     public boolean isNotEqual() {
         return relation == Relation.NOT_EQUAL;
     }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Relation.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Relation.java
@@ -9,6 +9,9 @@ public enum Relation {
     RIGHT_LIKE,
     BETWEEN,
     IN,
+    NOT_IN,
+    IS_NULL,
+    IS_NOT_NULL,
     GREATER_THAN,
     LESS_THAN,
     GREATER_THAN_EQUAL,
diff --git a/springboot-starter/src/main/resources/banner.txt b/springboot-starter/src/main/resources/banner.txt
@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 3.3.65
+CodingApi SpringBoot-Starter 3.3.66
 springboot version (${spring-boot.version})
 ------------------------------------------------------
