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 a8503f620ac02e282e6e845d6719e59948c579b6..2f2f62a1cedf5734ffb59141c5b17f07df7aa696 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 2d033e51f9851f9ff9700cd71e78ee60c1dc97a6..59274ca823b16f8c720a9163b5904a6605ee6702 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 8dbb6841c3c119f5e9463f4015e934eb50c67aa9..5c0eb137107f5bafaa93e664594bbaa207fdc0eb 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 3176df44a6701f03943adcabb8a2995823f4b681..dc41f21a273368c5228ed02b7082dabf015df72d 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 +}