diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java new file mode 100644 index 0000000..fc3a4ee --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : 忽略生成日志 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-02-14 10:35 + * @Modify: + **/ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface AnnoIgnoreLog { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 68df07e..36b6510 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -50,6 +51,15 @@ public abstract class BaseBean implements Serializable { } } + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") public String organizeCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 76e310a..4a3d8de 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -83,11 +83,31 @@ public class SysTaskPlan extends BaseBean { @ApiParam(value ="任务计划描述" , access ="任务计划描述") private String taskPlanDescription; + // 枚举 CommonEnumUtil.TRUE_OR_FALSE @Column(name="TASK_PLAN_STATUS") - @ApiParam(value ="任务状态(1.正常,2.禁用)" , example ="1") + @ApiParam(value ="任务状态" , example ="1") private Integer taskPlanStatus; @Column(name="LAST_RUN_DATE_TIME") @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; + + // 枚举 CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_NOTICE") + @ApiParam(value = "是否通知", example = "1") + private Integer isNotice; + + // 枚举 CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_INTERNAL_USER") + @ApiParam(value = "是否内部用户", example = "1") + private Integer isInternalUser; + + // 枚举 ImppEnumUtil.MESSAGE_TYPE + @Column(name = "NOTICE_METHOD") + @ApiParam(value = "通知方式", example = "1") + private Integer noticeMethod; + + @Column(name = "NOTICE_CHANNEL", columnDefinition = "TEXT") + @ApiParam(value = "通知渠道") + private String noticeChannel; }