diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java index f913d0f..c629367 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java @@ -21,13 +21,13 @@ public @interface AnnoOutputColumn { public String name() default ""; // 关系对象显示的字段 - public String value() default ""; + public String value() default "description"; // 显示格式 public FORMAT format() default FORMAT.STRING; // 关联关系对象的Key - public String refForeignKey() default ""; + public String refForeignKey() default "value"; // 关系对象 public Class refClass() default Object.class; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index fdd5391..b4f4a10 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -484,7 +484,8 @@ public class BlockSoftSwitchEnumUtil { MAP(40,"字典"), LIST(50,"列表"), JAVA_OBJECT(60,"Java Object"), - JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"); + JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"), + ARRAY(70,"数组"); private int value; private String description; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 772bee5..6257a7b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -8,13 +10,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.math.NumberUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.List; /** * @Description : 适配器出入参 @@ -44,6 +46,7 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "PARAM_TYPE_ID") @ApiParam(value = "参数类型,枚举(出,入)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_TYPE.class) private Integer paramTypeId; @Column(name = "PARAM_NAME") @@ -56,8 +59,13 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "PARAM_VAL_TYPE_ID") @ApiParam(value = "参数值类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class) private Integer paramValTypeId; + public int getParamValTypeIdVal() { + return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue(); + } + @Column(name = "PARAM_SORT") @ApiParam(value = "参数参数排序") private Integer paramSort;