diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java index 09c6388..ae42d1b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -42,20 +43,15 @@ public class MesArea extends BaseBean { @Transient @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) private List childTreeList; @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return areaName; } - - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java index 1933b6e..59d6249 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -41,6 +43,7 @@ public class MesEquipment extends BaseBean { @Column(name="STATUS") @ApiParam("设备状态") + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_EQUIPMENT_STATUS.class,refForeignKey = "value",value = "description") private String status; @Column(name="WORK_CELL_CODE") @@ -57,15 +60,10 @@ public class MesEquipment extends BaseBean { @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return this.equipmentName; } - - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java index 25f802f..7b95b63 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -49,19 +50,15 @@ public class MesWorkCell extends BaseBean { @Transient @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) private List childTreeList; @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return this.workCellName; } - - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index 575fd1c..eb81426 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -53,22 +54,18 @@ public class MesWorkCenter extends BaseBean { @Transient @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) private List childTreeList; @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return this.workCenterName; } - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - public MesWorkCenter(String organizeCode) { this.organizeCode = organizeCode; } 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 b6d4ef7..5e00634 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; /** * @Description : @@ -900,6 +901,64 @@ public class CommonEnumUtil { } } + /** + * Content-Type + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTENT_TYPE { + FORM("x-www-form-urlencoded", "表单"), + FILE(" multipart/form-data", "文件"), + JSON(" application/json", "JSON"), + XML(" application/xml ", "XML"); + + private String value; + private String description; + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CONTENT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + public static CONTENT_TYPE valueOfContenType(String val) { + CONTENT_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + // 数据有效的静态常量 public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); // 数据未删除的静态常量