枚举更新

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

@@ -2133,4 +2133,51 @@ public class BlockFormEnumUtil {
         }
     }
 
+
+    /**
+     * 操作触发来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FORM_TRIGGER_SOURCE {
+        INTERCEPTOR(10,  "拦截器"),
+        BUTTON(20,  "按钮");
+
+        private int value;
+        private String description;
+
+        private FORM_TRIGGER_SOURCE (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static FORM_TRIGGER_SOURCE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
 }

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

@@ -1483,6 +1483,50 @@ public class CommonEnumUtil {
     }
 
     /**
+     * 缺失资源来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MiSS_RESOURCE_SOURCE {
+        WEB(10, "网页端"),
+        SERVER(20, "服务端");
+
+        private int value;
+        private String description;
+
+        private MiSS_RESOURCE_SOURCE(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static MiSS_RESOURCE_SOURCE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
      * 属性类型信息(属性转换器)
      * <per>
      * <br/>    Form 核心转换器

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 表单操作数据模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-02 10:22
+ * @Modify:
+ **/
+@Data
+@ApiModel("表单操作数据模型")
+@NoArgsConstructor
+public class FormOperateDataModel {
+
+    @ApiModelProperty("元素代码")
+    private Long refId;
+
+    @ApiModelProperty("元素名称")
+    private String refName;
+
+    @ApiModelProperty("操作来源")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TRIGGER_SOURCE.class)
+    private String triggerSource;
+
+    @ApiModelProperty("来源名称")
+    private String sourceName;
+
+    @ApiModelProperty("操作数据集合")
+    private List<Map<String,String>> operateDataList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 缺失资源
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-01 09:31
+ * @Modify:
+ **/
+@Data
+public class MissResourceModel implements Serializable {
+
+    private static final long serialVersionUID = 677360677490162891L;
+
+    @ApiParam(value = "主键")
+    @AnnoOutputColumn
+    private String key;
+
+    @ApiParam(value = "产品类型", example = "0", access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, required = false)
+    private Integer softType;
+
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class)
+    @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
+    private Integer resourceType;
+
+    @ApiParam(value = "语言编码", example = "浏览器语言编码")
+    @AnnoOutputColumn
+    private String languageCode;
+
+    @ApiParam(value = "资源KEY")
+    @AnnoOutputColumn
+    private String resourceKey;
+
+    @ApiParam(value = "资源Value")
+    @AnnoOutputColumn
+    private String resourceValue;
+
+    @ApiParam(value = "数据来源")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class)
+    private Integer resourceSource;
+
+    @ApiParam(value = "数据来源")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class)
+    private Integer isValid;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -1,12 +1,15 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -43,6 +46,7 @@ public class SysConfig extends BaseBean {
     // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
     @Column(name="CONFIG_GROUP")
     @ApiParam(value ="参数组")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.SYS_CONFIG_GROUP.class)
     private Integer configGroup;
 
     // 枚举 ImppEnumUtil.SYS_VALUE_TYPE

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -37,9 +37,6 @@ public class SysLocaleResource  extends BaseBean {
     private Integer resourceType;
 
     @Transient
-    private String resourceTypes;
-
-    @Transient
     private String resourceTypeTxt;
 
     public String getResourceTypeTxt(){
@@ -87,4 +84,10 @@ public class SysLocaleResource  extends BaseBean {
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isSystem;
 
+    /**
+     * 检索条件
+     */
+    @Transient
+    private String resourceTypes;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -754,7 +754,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
         DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
         if (orderNoRule.getSerialNo() != null) {
-            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result);
+            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
         }
 
         // 添加默认排序