add not equal

xlorne · xlorne · commit 004a90e9b5b3 · 2024-12-06T14:58:30.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.7</version>
+    <version>2.9.8</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>2.9.7</version>
+        <version>2.9.8</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,25 @@ 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>2.9.7</version>
+        <version>2.9.8</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>2.9.7</version>
+        <version>2.9.8</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>2.9.7</version>
+        <version>2.9.8</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
@@ -2,6 +2,7 @@
 
 public enum Relation {
 
+    NOT_EQUAL,
     EQUAL,
     LIKE,
     LEFT_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
@@ -224,11 +224,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).collect(Collectors.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).collect(Collectors.toList());
+                            content.addFilter(key, values);
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ public boolean isEqual() {`
`48`	`48`	`return relation == Relation.EQUAL;`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ public boolean isNotEqual() {`
	`52`	`+ return relation == Relation.NOT_EQUAL;`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`public boolean isLike() {`
`52`	`56`	`return relation == Relation.LIKE;`
`53`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,11 +224,13 @@ public PageRequest toPageRequest(Class<?> clazz) {`
`224`	`224`	`if (JSON.isValid(filter)) {`
`225`	`225`	`removeKeys.add("filter");`
`226`	`226`	`JSONObject jsonObject = JSON.parseObject(filter);`
`227`		`- for (String key : jsonObject.keySet()) {`
`228`		`- JSONArray value = jsonObject.getJSONArray(key);`
`229`		`- if (value != null && !value.isEmpty()) {`
`230`		`- List<String> values = value.stream().map(Object::toString).collect(Collectors.toList());`
`231`		`- content.addFilter(key, values);`
	`227`	`+ if(jsonObject!=null) {`
	`228`	`+ for (String key : jsonObject.keySet()) {`
	`229`	`+ JSONArray value = jsonObject.getJSONArray(key);`
	`230`	`+ if (value != null && !value.isEmpty()) {`
	`231`	`+ List<String> values = value.stream().map(Object::toString).collect(Collectors.toList());`
	`232`	`+ content.addFilter(key, values);`
	`233`	`+ }`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`	`}`