update 3.3.30

xlorne · xlorne · commit 4574df74419e · 2024-12-06T15:00:48.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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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.29</version>
+    <version>3.3.30</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.29</version>
+    <version>3.3.30</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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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
@@ -98,6 +98,13 @@ private void buildSQL(Filter filter, StringBuilder hql) {
             params.add(filter.getValue()[0]);
             paramIndex++;
         }
+
+        if (filter.isNotEqual()) {
+            hql.append(filter.getKey()).append(" != ?").append(paramIndex);
+            params.add(filter.getValue()[0]);
+            paramIndex++;
+        }
+
         if (filter.isLike()) {
             hql.append(filter.getKey()).append(" LIKE ?").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,26 @@ void findAll() {
         assertEquals(1, page.getTotalElements());
     }
 
+    @Test
+    void pageRequestNotEqual() {
+        demoRepository.deleteAll();
+        Demo demo1 = new Demo();
+        demo1.setName("123");
+        demo1 = 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_EQUAL, demo1.getId());
+
+        Page<Demo> page = demoRepository.pageRequest(request);
+        assertEquals(1, page.getTotalElements());
+    }
+
 
     @Test
     void pageRequest() {
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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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.29</version>
+        <version>3.3.30</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,10 @@ public boolean isEqual() {
         return relation == Relation.EQUAL;
     }
 
+    public boolean isNotEqual() {
+        return relation == Relation.NOT_EQUAL;
+    }
+
     public boolean isLike() {
         return relation == Relation.LIKE;
     }
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
@@ -3,6 +3,7 @@
 public enum Relation {
 
     EQUAL,
+    NOT_EQUAL,
     LIKE,
     LEFT_LIKE,
     RIGHT_LIKE,
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
@@ -222,11 +222,13 @@ public PageRequest toPageRequest(Class<?> clazz) {
             if (JSON.isValid(filter)) {
                 removeKeys.add("filter");
                 JSONObject jsonObject = JSON.parseObject(filter);
-                for (String key : jsonObject.keySet()) {
-                    JSONArray value = jsonObject.getJSONArray(key);
-                    if (value != null && !value.isEmpty()) {
-                        List<String> values = value.stream().map(Object::toString).toList();
-                        content.addFilter(key, values);
+                if(jsonObject!=null) {
+                    for (String key : jsonObject.keySet()) {
+                        JSONArray value = jsonObject.getJSONArray(key);
+                        if (value != null && !value.isEmpty()) {
+                            List<String> values = value.stream().map(Object::toString).toList();
+                            content.addFilter(key, values);
+                        }
                     }
                 }
             }
