From 0dd2f3b3c3838600aeaa9d68bbce9f9628924a37 Mon Sep 17 00:00:00 2001 From: Wynne Date: Thu, 5 Aug 2021 12:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=95=8C=E9=9D=A2=20requestm?= =?UTF-8?q?odel=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E7=BB=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ScreenEnumUtil.java | 30 +++++++++++----------- .../i3plus/pojo/screen/bean/ScrModelField.java | 1 + .../i3plus/pojo/screen/model/ScrRequestModel.java | 8 +++--- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java index 9b51dbe..4901a17 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java @@ -1041,21 +1041,21 @@ public class ScreenEnumUtil { */ public enum ENUM_SOFT_TYPE { COMMON(10, "CommonEnumUtil", "通用枚举"), - IMPP(10, "ImppEnumUtil", "平台枚举"), - WMS(10, "WmsEnumUtil", "WMS枚举"), - SWEB(10, "SwebEnumUtil", "Sweb枚举"), - MES(10, "MesEnumUtil", "Mes枚举"), - MES_PCN(10, "MesPcnEnumUtil", "MesPcn枚举"), - ANDON(10, "AndonEnumUtil", "Andon枚举"), - APS(20, "ApsEnumUtil", "Aps枚举"), - BLOCK_FORM(20, "BlockFormEnumUtil", "动态表单枚举"), - BLOCK_REPORT(20, "BlockReportEnumUtil", "动态报表枚举"), - BLOCK_SOFT_SWITCH(20, "BlockSoftSwitchEnumUtil", "软适配枚举"), - LAC(20, "LacEnumUtil", "Lac枚举"), - MDM(20, "MdmEnumUtil", "主数据中心枚举"), - PTL(20, "PtlEnumUtil", "Ptl枚举"), - PTL_PCN(20, "PtlPcnEnumUtil", "PtlPcn枚举"), - SCREEN(20, "ScreenEnumUtil", "通用界面枚举"); + IMPP(20, "ImppEnumUtil", "平台枚举"), + WMS(30, "WmsEnumUtil", "WMS枚举"), + SWEB(40, "SwebEnumUtil", "Sweb枚举"), + MES(50, "MesEnumUtil", "Mes枚举"), + MES_PCN(60, "MesPcnEnumUtil", "MesPcn枚举"), + ANDON(70, "AndonEnumUtil", "Andon枚举"), + APS(80, "ApsEnumUtil", "Aps枚举"), + BLOCK_FORM(90, "BlockFormEnumUtil", "动态表单枚举"), + BLOCK_REPORT(100, "BlockReportEnumUtil", "动态报表枚举"), + BLOCK_SOFT_SWITCH(110, "BlockSoftSwitchEnumUtil", "软适配枚举"), + LAC(120, "LacEnumUtil", "Lac枚举"), + MDM(130, "MdmEnumUtil", "主数据中心枚举"), + PTL(140, "PtlEnumUtil", "Ptl枚举"), + PTL_PCN(150, "PtlPcnEnumUtil", "PtlPcn枚举"), + SCREEN(160, "ScreenEnumUtil", "通用界面枚举"); private Integer value; private String code; diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java index 2822d43..2bcd645 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java @@ -100,6 +100,7 @@ public class ScrModelField extends BaseBean implements Serializable { private String modelFieldSourceProps; @Transient + @ApiModelProperty(value="模型字段值") private Object fieldValue; } diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java index 55207a2..3d1381d 100644 --- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java +++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java @@ -61,8 +61,8 @@ public class ScrRequestModel implements Serializable { @ApiModelProperty("类名") private String className; - @ApiModelProperty("方法名") - private String methodName; + @ApiModelProperty("方法ID") + private Long methodGroupId; @ApiModelProperty("上传文件") private transient File file; @@ -82,8 +82,8 @@ public class ScrRequestModel implements Serializable { @ApiModelProperty("where条件补充") private String whereAppender; - @ApiModelProperty("调用接口参数") - private Map param; + @ApiModelProperty("字段转换") + private Map fieldConverter; }