From 3fd17208e2022628b1013897e7982a9cfbe1ba8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 3 Apr 2020 17:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 47 +++++++++++++++++++ .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 44 ++++++++++++++++++ .../pojo/model/form/FormOperateDataModel.java | 41 ++++++++++++++++ .../pojo/model/platform/MissResourceModel.java | 54 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 4 ++ .../pojo/platform/bean/SysLocaleResource.java | 9 ++-- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 7 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index af0d7e3..7a4d706 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index fff23d9..4316e3d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/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; + } + } + + /** * 属性类型信息(属性转换器) * *
Form 核心转换器 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java new file mode 100644 index 0000000..edd899b --- /dev/null +++ b/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> operateDataList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java new file mode 100644 index 0000000..aa7c6a6 --- /dev/null +++ b/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; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 3a9268b..f0f7fb2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/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 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index f8b4f4e..17ac6d6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/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; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7891cdb..cc0e5e9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/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); } // 添加默认排序