增加了@BizAction的函数需要为参数增加@name注解

entropy-cloud · Oct 30, 2024 · e383f38 · e383f38
1 parent a9d6a83
commit e383f38
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/nop-biz/src/main/java/io/nop/biz/crud/AutoExprRunner.java b/nop-biz/src/main/java/io/nop/biz/crud/AutoExprRunner.java
@@ -7,6 +7,7 @@
  */
 package io.nop.biz.crud;
 
+import io.nop.api.core.exceptions.NopException;
 import io.nop.biz.BizConstants;
 import io.nop.commons.lang.Undefined;
 import io.nop.core.lang.eval.IEvalScope;
@@ -38,26 +39,31 @@ public static void runAutoExpr(String action,
             if (ignoreFields != null && ignoreFields.contains(propMeta.getName()))
                 continue;
 
-            ObjConditionExpr autoExpr = propMeta.getAutoExpr();
-            if (autoExpr == null) {
-                // 只有save的时候才考虑设置缺省值。
-                if (propMeta.getDefaultValue() != null && BizConstants.METHOD_SAVE.equals(action)) {
-                    BeanTool.setProperty(entity, name, propMeta.getDefaultValue());
+            try {
+                ObjConditionExpr autoExpr = propMeta.getAutoExpr();
+                if (autoExpr == null) {
+                    // 只有save的时候才考虑设置缺省值。
+                    if (propMeta.getDefaultValue() != null && BizConstants.METHOD_SAVE.equals(action)) {
+                        BeanTool.setProperty(entity, name, propMeta.getDefaultValue());
+                    }
+                    continue;
                 }
-                continue;
-            }
 
-            if (autoExpr.getWhen() != null && !autoExpr.getWhen().contains(action))
-                continue;
+                if (autoExpr.getWhen() != null && !autoExpr.getWhen().contains(action))
+                    continue;
 
-            Object value = null;
-            if (autoExpr.getSource() != null) {
-                scope.setLocalValue(null, OrmConstants.VAR_PROP_META, propMeta);
-                value = autoExpr.getSource().invoke(scope);
-            }
+                Object value = null;
+                if (autoExpr.getSource() != null) {
+                    scope.setLocalValue(null, OrmConstants.VAR_PROP_META, propMeta);
+                    value = autoExpr.getSource().invoke(scope);
+                }
 
-            if (value != Undefined.undefined)
-                BeanTool.setProperty(entity, name, value);
+                if (value != Undefined.undefined)
+                    BeanTool.setProperty(entity, name, value);
+            } catch (NopException e) {
+                e.addXplStack("runAutoExprForProp:" + propMeta.getName());
+                throw e;
+            }
         }
     }
 }
diff --git a/...n/nop-dyn-service/src/main/java/io/nop/dyn/service/entity/NopDynFunctionMetaBizModel.java b/...n/nop-dyn-service/src/main/java/io/nop/dyn/service/entity/NopDynFunctionMetaBizModel.java
@@ -9,6 +9,7 @@
 
 import io.nop.api.core.annotations.biz.BizAction;
 import io.nop.api.core.annotations.biz.BizModel;
+import io.nop.api.core.annotations.core.Name;
 import io.nop.biz.crud.CrudBizModel;
 import io.nop.core.context.IServiceContext;
 import io.nop.dyn.dao.entity.NopDynFunctionMeta;
@@ -27,7 +28,7 @@ public NopDynFunctionMetaBizModel() {
 
     @BizAction
     @Override
-    protected void afterEntityChange(NopDynFunctionMeta entity, IServiceContext context, String action) {
+    protected void afterEntityChange(@Name("entity") NopDynFunctionMeta entity, IServiceContext context, @Name("action") String action) {
         super.afterEntityChange(entity, context, action);
 
         codeGen.generateBizModel(entity.getEntityMeta());