feat(Screen): 界面回显

界面回显

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java

@@ -530,21 +530,20 @@ public class ScreenEnumUtil {
         }
     }
 
-    public enum MODEL_FIELD_DATASOURCE {
-        FROM_TEXT(10, "TEXT", "文本"),
-        FROM_NUMBER(20, "NUMBER", "数字"),
-        FROM_PASSWORD(30, "PASSWORD", "密码"),
-        FROM_DATETIME(40, "DATETIME", "时间"),
-        FROM_PICK_UP(50, "PICK_UP", "拾取"),
-        FROM_ENUM(60, "ENUM", "枚举"),
-        FROM_DICTIONARY(70, "DICTIONARY", "字典"),
-        FROM_API(80, "API", "API调用");
+    public enum MODEL_FIELD_SOURCE {
+        FORM_TEXT(10, "TEXT", "文本"),
+        FORM_NUMBER(20, "NUMBER", "数字"),
+        FORM_PASSWORD(30, "PASSWORD", "密码"),
+        FORM_DATETIME(40, "DATETIME", "时间"),
+        FORM_PICK_UP(50, "PICK_UP", "拾取"),
+        FORM_ENUM(60, "ENUM", "枚举"),
+        FORM_DICTIONARY(70, "DICTIONARY", "字典");
 
         private Integer value;
         private String code;
         private String description;
 
-        MODEL_FIELD_DATASOURCE(Integer value, String code, String description) {
+        MODEL_FIELD_SOURCE(Integer value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1036,4 +1035,68 @@ public class ScreenEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 等待平台枚举抽入数据库或redis
+     */
+    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", "通用界面枚举");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        ENUM_SOFT_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static ENUM_SOFT_TYPE valueOfEnum(Integer value) {
+            ENUM_SOFT_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java

@@ -71,6 +71,10 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("是否支持排序")
     private Integer isAllowSort;
 
+    @Column(name = "IS_ALLOW_MODIFY")
+    @ApiModelProperty("是否支持修改")
+    private Integer isAllowModify;
+
     @Column(name = "IS_REQUIRED")
     @ApiModelProperty("是否必填")
     private Integer isRequired;
@@ -87,13 +91,13 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("是否是虚拟的")
     private Integer isVirtual;
 
-    @Column(name = "MODEL_FIELD_DATASOURCE")
+    @Column(name = "MODEL_FIELD_SOURCE")
     @ApiModelProperty("字段数据来源")
-    private Integer modelFieldDatasource;
+    private Integer modelFieldSource;
 
-    @Column(name = "MODEL_FIELD_DATASOURCE_PROPS")
+    @Column(name = "MODEL_FIELD_SOURCE_PROPS")
     @ApiModelProperty("model字段来源属性")
-    private String modelFieldDatasourceProps;
+    private String modelFieldSourceProps;
 
     @Transient
     private Object fieldValue;

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java

@@ -6,8 +6,8 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -65,11 +65,14 @@ public class ScrRequestModel implements Serializable {
     private String methodName;
 
     @ApiModelProperty("上传文件")
-    private MultipartFile file;
+    private transient File file;
 
     @ApiModelProperty("模型字段")
     private List<ScrModelField> modelFields;
 
+    @ApiModelProperty("模型字段代码")
+    private Map<String, Object> modelFieldMap;
+
     @ApiModelProperty("父代码")
     private String parentCode;
 
@@ -80,7 +83,7 @@ public class ScrRequestModel implements Serializable {
     private String whereAppender;
 
     @ApiModelProperty("调用接口参数")
-    private Map<String,Object> param;
+    private Map<String, Object> param;
 
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrResponseModel.java

@@ -1,13 +1,11 @@
 package cn.estsh.i3plus.pojo.screen.model;
 
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.Serializable;
 import java.util.List;