diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 6a0a0d2..eddecd7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -21,4 +21,5 @@ public @interface FieldAnnotation { int pric() default 2; // 对于浮点型,界面显示的精度 boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 + boolean popSearch() default false; // 弹出选择对象时是否显示 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index f302131..aedbbcd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -44,6 +44,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="类型名称") private String typeName; + @Column(name="TYPE_FULL_NAME") + @ApiParam(value ="类型全名称包含路径") + private String typeFullName; + @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") private Boolean customize; @@ -84,6 +88,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @Column(name="POP_SEARCH") + @ApiParam(value ="弹出选择时是否显示") + private Boolean popSearch; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 70f77de..261164e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,4 +30,9 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; + + @Column(name="RULE_GROUP_ID") + @ApiParam(value ="规则组id") + @FieldAnnotation(display = false) + private Long ruleGroupId; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index b434092..0cb563a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,10 +19,12 @@ import javax.persistence.MappedSuperclass; public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true) private String code; @Column(name="NAME") @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) private String name; @Column(name="REMARK")