diff --git a/src/main/entry/org/bdware/sc/bean/FunctionDesp.java b/src/main/entry/org/bdware/sc/bean/FunctionDesp.java index d54807d..b967a0f 100644 --- a/src/main/entry/org/bdware/sc/bean/FunctionDesp.java +++ b/src/main/entry/org/bdware/sc/bean/FunctionDesp.java @@ -10,11 +10,14 @@ public class FunctionDesp implements Serializable { public String functionName; public RouteInfo routeInfo; public boolean isView; + public JoinInfo joinInfo; - public FunctionDesp(String name, List annos, RouteInfo routeInfo, boolean isView) { + + public FunctionDesp(String name, List annos, RouteInfo routeInfo, JoinInfo joinInfo, boolean isView) { this.functionName = name; this.annotations = annos; this.routeInfo = routeInfo; + this.joinInfo = joinInfo; this.isView = isView; } diff --git a/src/main/entry/org/bdware/sc/bean/JoinInfo.java b/src/main/entry/org/bdware/sc/bean/JoinInfo.java index 3b70b75..ff7db2e 100644 --- a/src/main/entry/org/bdware/sc/bean/JoinInfo.java +++ b/src/main/entry/org/bdware/sc/bean/JoinInfo.java @@ -13,14 +13,8 @@ public class JoinInfo implements Serializable { JoinInfo info = new JoinInfo(); info.joinRule = null; if (annotationNode.getArgs().size() == 1) { - switch (annotationNode.getArgs().get(0)) { - case "add": - info.joinRule = DefaultJoinRule.add; - break; - case "multiply": - info.joinRule = DefaultJoinRule.multiply; - break; - } + String str = annotationNode.getArgs().get(0); + info = JsonUtil.fromJson(str, JoinInfo.class); } System.out.println("[JoinInfo] annotationNode:" + JsonUtil.toJson(annotationNode)); return info;