Skip to content

Commit 4574df7

Browse files
committed
update 3.3.30
1 parent bd44ee8 commit 4574df7

File tree

17 files changed

+51
-17
lines changed

17 files changed

+51
-17
lines changed

example/example-application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-domain/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-infra-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-infra-jpa/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</parent>
1818

1919
<artifactId>springboot-example</artifactId>
20-
<version>3.3.29</version>
20+
<version>3.3.30</version>
2121

2222
<name>springboot-example</name>
2323
<description>springboot-example project for Spring Boot</description>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<groupId>com.codingapi.springboot</groupId>
1717
<artifactId>springboot-parent</artifactId>
18-
<version>3.3.29</version>
18+
<version>3.3.30</version>
1919

2020
<url>https://github.com/codingapi/springboot-framewrok</url>
2121
<name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.codingapi.springboot</groupId>
88
<artifactId>springboot-parent</artifactId>
9-
<version>3.3.29</version>
9+
<version>3.3.30</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ private void buildSQL(Filter filter, StringBuilder hql) {
9898
params.add(filter.getValue()[0]);
9999
paramIndex++;
100100
}
101+
102+
if (filter.isNotEqual()) {
103+
hql.append(filter.getKey()).append(" != ?").append(paramIndex);
104+
params.add(filter.getValue()[0]);
105+
paramIndex++;
106+
}
107+
101108
if (filter.isLike()) {
102109
hql.append(filter.getKey()).append(" LIKE ?").append(paramIndex);
103110
params.add("%" + filter.getValue()[0] + "%");

springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/DemoRepositoryTest.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,26 @@ void findAll() {
5656
assertEquals(1, page.getTotalElements());
5757
}
5858

59+
@Test
60+
void pageRequestNotEqual() {
61+
demoRepository.deleteAll();
62+
Demo demo1 = new Demo();
63+
demo1.setName("123");
64+
demo1 = demoRepository.save(demo1);
65+
66+
Demo demo2 = new Demo();
67+
demo2.setName("456");
68+
demoRepository.save(demo2);
69+
70+
PageRequest request = new PageRequest();
71+
request.setCurrent(1);
72+
request.setPageSize(10);
73+
request.addFilter("id", Relation.NOT_EQUAL, demo1.getId());
74+
75+
Page<Demo> page = demoRepository.pageRequest(request);
76+
assertEquals(1, page.getTotalElements());
77+
}
78+
5979

6080
@Test
6181
void pageRequest() {

springboot-starter-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.3.29</version>
9+
<version>3.3.30</version>
1010
</parent>
1111

1212
<name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.3.29</version>
9+
<version>3.3.30</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>3.3.29</version>
8+
<version>3.3.30</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Filter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ public boolean isEqual() {
4848
return relation == Relation.EQUAL;
4949
}
5050

51+
public boolean isNotEqual() {
52+
return relation == Relation.NOT_EQUAL;
53+
}
54+
5155
public boolean isLike() {
5256
return relation == Relation.LIKE;
5357
}

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Relation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
public enum Relation {
44

55
EQUAL,
6+
NOT_EQUAL,
67
LIKE,
78
LEFT_LIKE,
89
RIGHT_LIKE,

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,13 @@ public PageRequest toPageRequest(Class<?> clazz) {
222222
if (JSON.isValid(filter)) {
223223
removeKeys.add("filter");
224224
JSONObject jsonObject = JSON.parseObject(filter);
225-
for (String key : jsonObject.keySet()) {
226-
JSONArray value = jsonObject.getJSONArray(key);
227-
if (value != null && !value.isEmpty()) {
228-
List<String> values = value.stream().map(Object::toString).toList();
229-
content.addFilter(key, values);
225+
if(jsonObject!=null) {
226+
for (String key : jsonObject.keySet()) {
227+
JSONArray value = jsonObject.getJSONArray(key);
228+
if (value != null && !value.isEmpty()) {
229+
List<String> values = value.stream().map(Object::toString).toList();
230+
content.addFilter(key, values);
231+
}
230232
}
231233
}
232234
}

0 commit comments

Comments
 (0)