diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index ec57bec..4643e50 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -12,8 +12,45 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesPcnEnumUtil { /** + * mes-pcn定时任务状态 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_TASK_STATUS{ + + OPEN(1,"OPEN"), + CLOSE(2,"CLOSE"); + + private int value; + private String description; + + MES_PCN_TASK_STATUS(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; + } + } + + /** * mes-pcn定时任务同步结果状态 - * 10. + * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_PCN_TASK_SYNC_STATUS{ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 0ccb531..054bb21 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务名称") private String taskName; + @Column(name="TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + @Column(name="TASK_DESCRIPTION") @ApiParam("任务描述") private String taskDescription; @@ -69,7 +73,15 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; + @Column(name="TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + public int getTaskTypeVal() { return this.taskType == null ? 0 : this.taskType; } + + public int getTaskStatusVal() { + return this.taskStatus == null ? 0 : this.taskStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 27daf23..5f2e53d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务名称") private String taskName; + @Column(name="TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + @Column(name="TASK_DESCRIPTION") @ApiParam("任务描述") private String taskDescription; @@ -69,7 +73,15 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; + @Column(name="TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + public int getTaskTypeVal() { return this.taskType == null ? 0 : this.taskType; } + + public int getTaskStatusVal() { + return this.taskStatus == null ? 0 : this.taskStatus; + } }