From 0516c170c28c5410daefc73d5bb86f1f82ed66b9 Mon Sep 17 00:00:00 2001 From: yuanxiangyu Date: Thu, 13 Mar 2025 15:44:07 +0800 Subject: [PATCH] =?UTF-8?q?VO=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A2=9E=E5=8A=A0=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=B5=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JavaBaseActionGenerator.java | 30 +++++-------------- .../JavaCodeFileGenerator.java | 2 +- .../viewmodel/common/ConvertUtils.java | 5 +++- .../viewmodel/common/VMParameterType.java | 9 ++++-- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java index a8503f6..2f2f62a 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaBaseActionGenerator.java @@ -131,6 +131,8 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator return "Integer[]"; case Object: return "Object[]"; + case Stream: + return "Response[]"; default: handleJavaInfo(param); if (ViewModelUtils.checkNull(param.getClassName())) { @@ -139,17 +141,6 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator } int index = param.getClassName().lastIndexOf("."); return param.getClassName().substring(index + 1, param.getClassName().length()) + "[]"; -// if (!IsGeneric(param)) -// { -// return param.getJavaClassName().substring(index + 1, index + 1 + param.getJavaClassName().length() - index - 1) + "[]"; -// } -// else -// { -// String result = GetGenericExpress(allGenericParamType.get(0)); -// allGenericParamType.clear(); -// return result + "[]"; -// } - } } @@ -170,6 +161,8 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator return "ArrayList"; case Object: return "ArrayList"; + case Stream: + return "ArrayList"; default: handleJavaInfo(param); if (ViewModelUtils.checkNull(param.getClassName())) { @@ -178,17 +171,6 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator } int index = param.getClassName().lastIndexOf("."); return "ArrayList<" + param.getClassName().substring(index + 1, param.getClassName().length()) + ">"; -// if (!IsGeneric(param)) -// { -// return "ArrayList<" + param.getJavaClassName().substring(index + 1, index + 1 + param.getJavaClassName().length() - index - 1) + ">"; -// } -// else -// { -// String result = GetGenericExpress(allGenericParamType.get(0)); -// allGenericParamType.clear(); -// return "ArrayList<" + result + ">"; -// } - } } @@ -208,6 +190,8 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator return "Integer"; case Object: return "Object"; + case Stream: + return "Response"; default: handleJavaInfo(param); if (ViewModelUtils.checkNull(param.getClassName())) { @@ -430,4 +414,4 @@ public abstract class JavaBaseActionGenerator extends JavaBaseCompCodeGenerator } return result; } -} \ No newline at end of file +} diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java index 2d033e5..59274ca 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/generatacmpcode/JavaCodeFileGenerator.java @@ -632,4 +632,4 @@ public class JavaCodeFileGenerator { iFsService.createFile(filePathCommon, codeGen.generateExecute()); } } -} \ No newline at end of file +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java index 8dbb684..5c0eb13 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/ConvertUtils.java @@ -866,9 +866,12 @@ public final class ConvertUtils { case String: vmParam.setParameterType(VMParameterType.String); break; + case Stream: + vmParam.setParameterType(VMParameterType.Stream); + break; default: throw new ViewModelException(VoModelErrorCodes.GSP_VIEWOBJECT_MODEL_1008, null, param.getParamCode(), param.getParamName(), param.getParameterType().toString()); } } -} \ No newline at end of file +} diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/VMParameterType.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/VMParameterType.java index 3176df4..dc41f21 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/VMParameterType.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/common/VMParameterType.java @@ -38,7 +38,12 @@ public enum VMParameterType { /** * 自定义 */ - Custom; + Custom, + + /** + * 响应流 + */ + Stream; public int getValue() { return this.ordinal(); @@ -47,4 +52,4 @@ public enum VMParameterType { public static VMParameterType forValue(int value) { return values()[value]; } -} \ No newline at end of file +} -- Gitee