Skip to content

Commit a322e49

Browse files
committed
fix RequestFilter.java
1 parent 233b0c8 commit a322e49

File tree

3 files changed

+34
-3
lines changed

3 files changed

+34
-3
lines changed

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.alibaba.fastjson.JSON;
44
import com.alibaba.fastjson.JSONArray;
55
import com.alibaba.fastjson.JSONObject;
6+
import com.codingapi.springboot.framework.dto.request.Filter;
67
import com.codingapi.springboot.framework.dto.request.PageRequest;
78
import com.codingapi.springboot.framework.dto.request.Relation;
89
import jakarta.servlet.http.HttpServletRequest;
@@ -46,6 +47,32 @@ public void setPageSize(int pageSize) {
4647
this.removeKeys.add("pageSize");
4748
}
4849

50+
public void addSort(Sort sort) {
51+
pageRequest.addSort(sort);
52+
}
53+
54+
public void removeFilter(String key) {
55+
pageRequest.removeFilter(key);
56+
}
57+
58+
public PageRequest addFilter(String key, Relation relation, Object... value) {
59+
return pageRequest.addFilter(key, relation, value);
60+
}
61+
62+
public PageRequest addFilter(String key, Object... value) {
63+
return pageRequest.addFilter(key, value);
64+
}
65+
66+
public PageRequest andFilter(Filter... filters) {
67+
return pageRequest.andFilter(filters);
68+
}
69+
70+
public PageRequest orFilters(Filter... filters) {
71+
return pageRequest.orFilters(filters);
72+
}
73+
74+
75+
4976
private String decode(String value) {
5077
return new String(Base64.getDecoder().decode(value));
5178
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ public void addSort(Sort sort) {
125125
}
126126
}
127127

128+
public void removeFilter(String key) {
129+
requestFilter.removeFilter(key);
130+
}
131+
128132
public PageRequest addFilter(String key, Relation relation, Object... value) {
129133
requestFilter.addFilter(key, relation, value);
130134
return this;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public Filter getFilter(String name) {
8989
return this.filterMap.get(name);
9090
}
9191

92-
public void deleteFilter(String current) {
93-
this.filterMap.remove(current);
94-
this.filterList.removeIf(item -> item.getKey().equals(current));
92+
public void removeFilter(String key) {
93+
this.filterMap.remove(key);
94+
this.filterList.removeIf(item -> item.getKey().equals(key));
9595
}
9696
}

0 commit comments

Comments
 (0)