update 2.8.8

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.8.7</version>
+    <version>2.8.8</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.7</version>
+        <version>2.8.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -103,6 +103,16 @@ private void buildSQL(Filter filter, StringBuilder hql) {
             params.add("%" + filter.getValue()[0] + "%");
             paramIndex++;
         }
+        if (filter.isLeftLike()) {
+            hql.append(filter.getKey()).append(" LIKE ?").append(paramIndex);
+            params.add("%" + filter.getValue()[0]);
+            paramIndex++;
+        }
+        if (filter.isRightLike()) {
+            hql.append(filter.getKey()).append(" LIKE ?").append(paramIndex);
+            params.add(filter.getValue()[0] + "%");
+            paramIndex++;
+        }
         if (filter.isIn()) {
             hql.append(filter.getKey()).append(" IN (").append("?").append(paramIndex).append(")");
             params.add(Arrays.asList(filter.getValue()));
@@ -140,4 +150,4 @@ private void buildSQL(Filter filter, StringBuilder hql) {
     public Object[] getParams() {
         return params.toArray();
     }
-}
+}

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.8.7</version>
+        <version>2.8.8</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.8.7</version>
+        <version>2.8.8</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

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

@@ -52,6 +52,16 @@ public boolean isLike() {
         return relation == Relation.LIKE;
     }
 
+
+    public boolean isLeftLike() {
+        return relation == Relation.LEFT_LIKE;
+    }
+
+    public boolean isRightLike() {
+        return relation == Relation.RIGHT_LIKE;
+    }
+
+
     public boolean isBetween() {
         return relation == Relation.BETWEEN;
     }

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

@@ -4,6 +4,8 @@ public enum Relation {
 
     EQUAL,
     LIKE,
+    LEFT_LIKE,
+    RIGHT_LIKE,
     BETWEEN,
     IN,
     GREATER_THAN,

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

@@ -137,19 +137,34 @@ public void addFilter(String key, List<String> value) {
         }
 
 
+
         private Class<?> getKeyType(String key) {
             String[] keys = key.split("\\.");
             Class<?> keyClass = clazz;
+
             for (String k : keys) {
-                Field[] fields = keyClass.getDeclaredFields();
+                keyClass = findFieldInHierarchy(keyClass, k);
+
+                if (keyClass == null) {
+                    throw new IllegalArgumentException("Field " + k + " not found in class hierarchy.");
+                }
+            }
+            return keyClass;
+        }
+
+        private Class<?> findFieldInHierarchy(Class<?> clazz, String fieldName) {
+            Class<?> currentClass = clazz;
+
+            while (currentClass != null) {
+                Field[] fields = currentClass.getDeclaredFields();
                 for (Field field : fields) {
-                    if (field.getName().equals(k)) {
-                        keyClass = field.getType();
-                        break;
+                    if (field.getName().equals(fieldName)) {
+                        return field.getType();
                     }
                 }
+                currentClass = currentClass.getSuperclass(); // 向上查找父类
             }
-            return keyClass;
+            return null;
         }
 
     }