fix(core): 修复 ModelField 注解获取问题并增强 SQL 更新语句生成逻辑

- 修复在使用代理类时无法直接获取 ModelField 注解的问题
-增加对注解的动态检查，以适应字节码增强等场景
- 优化 SQL 更新语句生成逻辑，仅包含需要更新的字段
- 新增 带类型的groupBy 方法支持分组查询

Author: cjbi

flexmodel-codegen/src/main/groovy/tech/wetech/flexmodel/codegen/BuildItemSPIFileGenerator.groovy

@@ -1,6 +1,7 @@
 package tech.wetech.flexmodel.codegen
 
 import groovy.util.logging.Log
+import tech.wetech.flexmodel.BuildItem
 
 import java.nio.file.Path
 
@@ -15,7 +16,7 @@ class BuildItemSPIFileGenerator extends AbstractGenerator {
     return Path.of(
       targetDirectory,
       "target/classes/META-INF/services",
-      "tech.wetech.flexmodel.BuildItem"
+      BuildItem.class.getName()
     ).toString()
   }
 

flexmodel-core/src/main/java/tech/wetech/flexmodel/query/Expressions.java

@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 import tech.wetech.flexmodel.annotation.ModelField;
 
+import java.lang.annotation.Annotation;
 import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -98,10 +99,30 @@ private static <T, R> String getAnnotatedFieldName(Class<T> targetClass, String
       // 查找字段并获取 @ModelField 注解
       Field field = findFieldByName(targetClass, fieldName);
       if (field != null) {
+        // 首先尝试直接获取注解
         ModelField modelField = field.getAnnotation(ModelField.class);
         if (modelField != null) {
           return modelField.value();
         }
+
+        // 如果直接获取失败，可能是由于动态代理或字节码增强导致的
+        // 遍历所有注解，查找 ModelField 注解
+        Annotation[] annotations = field.getAnnotations();
+        for (Annotation annotation : annotations) {
+          // 检查注解是否为 ModelField 或其代理类
+          if (isModelFieldAnnotation(annotation)) {
+            // 通过反射获取注解的值
+            try {
+              Method valueMethod = annotation.getClass().getMethod("value");
+              Object value = valueMethod.invoke(annotation);
+              if (value instanceof String) {
+                return (String) value;
+              }
+            } catch (Exception e) {
+              log.warn("获取注解值失败: " + e.getMessage());
+            }
+          }
+        }
       }
 
       return null;
@@ -114,6 +135,35 @@ private static <T, R> String getAnnotatedFieldName(Class<T> targetClass, String
     }
   }
 
+  /**
+   * 检查注解是否为 ModelField 注解
+   */
+  private static boolean isModelFieldAnnotation(Annotation annotation) {
+    if (annotation == null) {
+      return false;
+    }
+
+    // 直接检查注解类型
+    if (annotation.annotationType() == ModelField.class) {
+      return true;
+    }
+
+    // 检查注解的类型名称（处理代理类的情况）
+    String annotationClassName = annotation.annotationType().getName();
+    if (ModelField.class.getName().equals(annotationClassName)) {
+      return true;
+    }
+
+    // 检查注解类是否实现了 ModelField 接口（代理类可能实现原始注解接口）
+    try {
+      // 通过反射检查注解类是否包含 value 方法
+      Method valueMethod = annotation.getClass().getMethod("value");
+      return valueMethod != null;
+    } catch (NoSuchMethodException e) {
+      return false;
+    }
+  }
+
   /**
    * 获取目标类
    */

flexmodel-core/src/main/java/tech/wetech/flexmodel/query/TypedDSLQueryBuilder.java

@@ -121,6 +121,16 @@ public TypedDSLQueryBuilder<T> groupBy(String... fields) {
     return this;
   }
 
+  @SafeVarargs
+  public final <R> TypedDSLQueryBuilder<T> groupBy(Expressions.SFunction<T, R>... getters) {
+    String[] fields = new String[getters.length];
+    for (int i = 0; i < fields.length; i++) {
+      fields[i] = Expressions.getFieldName(getters[i]);
+    }
+    delegate.groupBy(fields);
+    return this;
+  }
+
   /**
    * 设置连接
    */

flexmodel-core/src/main/java/tech/wetech/flexmodel/sql/SqlDataService.java

@@ -148,7 +148,8 @@ public int updateById(String modelName, Object objR, Object id) {
         .append(" set ");
       StringJoiner assignment = new StringJoiner(", ");
 
-      record.keySet().stream().filter(col -> !col.equals(idField.getName()))
+      record.keySet().stream()
+        .filter(col -> !col.equals(idField.getName()) && (data.containsKey(col) || processedData.get(col) != null))
         .forEach(col -> assignment.add(sqlDialect.quoteIdentifier(col) + "=:" + col));
 
       sql.append(assignment);
@@ -159,7 +160,7 @@ public int updateById(String modelName, Object objR, Object id) {
         .append(idField.getName())
         .append(")");
 
-      Map<String, Object> params = new HashMap<>(record);
+      Map<String, Object> params = new HashMap<>(processedData);
       params.put(idField.getName(), id);
 
       log.debug("Generated UPDATE SQL: {}", sql);
@@ -194,14 +195,14 @@ public int update(String modelName, Object objR, String filter) {
         .append(" set ");
       StringJoiner assignment = new StringJoiner(", ");
       processedData.keySet().stream()
-        .filter(col -> !col.equals(idField.getName()))
+        .filter(col -> !col.equals(idField.getName()) && (record.containsKey(col) || processedData.get(col) != null))
         .forEach(col -> assignment.add(sqlDialect.quoteIdentifier(col) + "=:" + col));
       sql.append(assignment);
 
       sql.append(" where ")
         .append(" (").append(sqlResult.sqlClause()).append(")");
 
-      Map<String, Object> params = new HashMap<>(record);
+      Map<String, Object> params = new HashMap<>(processedData);
       params.putAll(sqlResult.args());
 
       log.debug("Generated UPDATE SQL: {}", sql);