From 295d4c9ac9ab6a546a22f7b06ac4ffd013a63e32 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Feb 2019 18:06:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=B8=83=E5=B1=80=20?= =?UTF-8?q?=E8=A1=8C=E9=AB=98,=E5=88=97=E5=AE=BD=E8=AE=BE=E7=BD=AE=20Mongo?= =?UTF-8?q?DB=20id=20=E6=98=A0=E5=B0=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 2284856..b73a8e0 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 ="组织代码") private String organizeCode; From fef135791c7fe3ded904313972ba9348e918f050 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 13 Feb 2019 17:22:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=80=9A=E7=9F=A5=20=E7=BD=91=E5=85=B3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF=E7=B1=BB=E5=9E=8B=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20BaseResultBean=20=E6=B7=BB=E5=8A=A0=E9=98=9F?= =?UTF-8?q?=E5=88=97=E7=9B=91=E5=90=AC=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysTaskPlan.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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; } From db8a4fbe6f7cafecb88a3609a0bb2f9ec398f13f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Feb 2019 10:08:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/AnnoIgnoreLog.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoIgnoreLog.java 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 { +}