From 045c68ee2ebaeec4d0b81b6df025b0bf4eadfadd Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 28 Mar 2019 14:27:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 14 +++++++------- .../cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java | 6 +++--- .../estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java | 2 +- modules/i3plus-pojo-model/pom.xml | 5 +++++ .../cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java | 3 +++ pom.xml | 6 ++++++ 8 files changed, 44 insertions(+), 11 deletions(-) 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 2fdc2ab..9098f50 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 @@ -36,7 +36,7 @@ public abstract class BaseBean implements Serializable { @Id @GeneratedValue(generator = "IDGenerator") @GenericGenerator(name = "IDGenerator", strategy = "assigned") - @Column(name="id") + @Column(name="ID") @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) @@ -65,34 +65,34 @@ public abstract class BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) public String organizeCode; - @Column(name="is_valid") + @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") @AnnoOutputColumn(hidden = true) //启用停用 public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="is_deleted") + @Column(name="IS_DELETED") @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSE - @Column(name="create_user",updatable = false) + @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) public String createUser; - @Column(name="create_date",updatable = false) + @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") @AnnoOutputColumn(hidden = true) public String createDatetime; - @Column(name="modify_user") + @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) public String modifyUser; - @Column(name="modify_date") + @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") @AnnoOutputColumn(hidden = true) public String modifyDatetime; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java index cb05869..5da8fca 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java @@ -13,7 +13,9 @@ import org.springframework.cglib.beans.BeanMap; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.Iterator; import java.util.Map; +import java.util.Set; /** * @Description : 动态转换对象，用于配合dynamicEntity进行动态属性添加 @@ -83,6 +85,13 @@ public class DynamicBean { if(null != superclass) { generator.setSuperclass(superclass); } + + /*Set keySet = propertyMap.keySet(); + for (Iterator i = keySet.iterator(); i.hasNext(); ) { + String key = (String) i.next(); + generator.addProperty(key, (Class) propertyMap.get(key)); + }*/ + BeanGenerator.addProperties(generator, propertyMap); return generator.create(); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index f9437db..0231497 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -160,9 +160,9 @@ public class DynamicEntity extends BaseBean implements Serializable { } else if (f.getType() == Double.class) { fieldVal = 0.0d; } else if (f.getType() == String.class) { - fieldVal = ""; + fieldVal = "1"; }else if (f.getType() == Character.class) { - fieldVal = ""; + fieldVal = "1"; }else if (f.getType() == Boolean.class) { fieldVal = true; }else if (f.getType() == Byte.class) { @@ -170,7 +170,7 @@ public class DynamicEntity extends BaseBean implements Serializable { }else if (f.getType() == Date.class) { fieldVal = new Date(); }else { - fieldVal = ""; + fieldVal = "1"; } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 6cef54a..1d698a4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -959,6 +959,16 @@ public class BlockFormEnumUtil { return tmp; } + public static int codeOfClzFullName(Class clzFullName) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].clzFullName.equals(clzFullName)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static int codeOfClassPath(String classPath) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 4953b67..6648ee4 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -36,7 +36,7 @@ public class BfDataObject extends BaseBean { private String objectName; @Column(name="OBJECT_CLASS_NAME") - @ApiParam(value ="中文名称") + @ApiParam(value ="类名称") private String objectClassName; @Column(name="OBJECT_TABLE_NAME") diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index e975c42..d9f2e52 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -31,6 +31,11 @@ i3plus.pojo + i3plus-pojo-form + + + + i3plus.pojo i3plus-pojo-wms diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java index ac7da8e..a518608 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.form.bean.BfDataObject; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Objects; @@ -28,4 +30,5 @@ public class SqlCreateDllModel { private String refGeneration; List columnlist ; + } diff --git a/pom.xml b/pom.xml index fdc926a..e5f0bb0 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-form + ${project.version} + + com.fasterxml.jackson.core From 9a185abed18d1e3da077fb8dc026710a30568e7c Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 28 Mar 2019 16:19:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=B8=8D=E9=9C=80=E8=A6=81SID+=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=AE=9E=E4=BD=93=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=95=A3=E4=BB=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 05c572c..edbb890 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -77,4 +77,8 @@ public class WmsCSOrderMaster extends BaseBean { @Transient @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; + + @Column(name = "IS_PART") + @ApiParam(value = "是否散件") + private Integer isPart; } From 84c07f3db0721e2938c7890f678e3b49c0363250 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 28 Mar 2019 16:50:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 56da324..816f364 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -120,12 +120,4 @@ public class WmsDocMovementMaster extends BaseBean { @Transient @ApiParam(value = "打印时间") private String printDate; - - @Transient - @ApiParam(value = "发货人") - private String sendUser; - - @Transient - @ApiParam(value = "发货日期") - private String sendDate; } From 8fb36134a693330e4cddbbb107862946c6d4d082 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 28 Mar 2019 17:58:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?shiro=E4=BC=9A=E8=AF=9Did=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8update=E8=B5=8B=E5=80=BC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 beecd61..e70a097 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 @@ -57,6 +57,14 @@ public class SysTaskPlan extends BaseBean { @ApiParam(value ="定时任务运行次数" , example ="0") private Integer taskPlanExecNum; + public int getTaskPlanExecNumValue(){ + if(taskPlanExecNum == null){ + return 0; + }else{ + return taskPlanExecNum.intValue(); + } + } + // 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD @Column(name="TASK_METHOD_TYPE") @ApiParam(value ="任务执行类型" ,example = "-1") From 6efb49aca522a95269ee12a0a7f76b1ab6ed6bac Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 28 Mar 2019 18:04:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java | 5 +++++ .../cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java | 7 +++++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java | 4 ++++ 9 files changed, 37 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index d8192c2..7b20d71 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,6 +42,7 @@ public class BfButton extends BaseBean { // 关联表单功能表id @Column(name="METHOD_ID") @ApiParam(value ="表单功能id") + @JsonSerialize(using = ToStringSerializer.class) private Long methodId; @Column(name="METHOD_NAME_RDD") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 6004684..4803300 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,9 +36,11 @@ public class BfIntercept extends BaseBean { @Column(name="EXECUTE_MODE") @ApiParam(value ="执行方式") + @JsonSerialize(using = ToStringSerializer.class) private Integer executeMode; @Column(name="EXECUTE_CONTENT") @ApiParam(value ="执行内容") + @JsonSerialize(using = ToStringSerializer.class) private Integer executeContent; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index a2a3741..37bbade 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +32,7 @@ public class BfInterceptDetail extends BaseBean { @Column(name="INTERCEPT_ID") @ApiParam(value ="拦截器id") + @JsonSerialize(using = ToStringSerializer.class) private Long interceptId; @Column(name="INTERCEPT_NAME_RDD") @@ -46,6 +49,7 @@ public class BfInterceptDetail extends BaseBean { @Column(name="INTERCEPT_TARGET_ID") @ApiParam(value ="拦截目标id") + @JsonSerialize(using = ToStringSerializer.class) private Long interceptTargetId; @Column(name="INTERCEPT_TARGET_NAME_RDD") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 81e5d14..054e5cd 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ public class BfMenu extends BaseBean { @Column(name="PARENT_ID") @ApiParam(value ="父级菜单id") + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; @Column(name="PARENT_NAME_RDD") @@ -62,6 +65,7 @@ public class BfMenu extends BaseBean { @Column(name="METHOD_ID") @ApiParam(value ="功能id") + @JsonSerialize(using = ToStringSerializer.class) private Long methodId; @Column(name = "MENU_STATUS") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index a03d889..e88a130 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ public class BfMethod extends BaseBean { @Column(name="LAYOUT_ID") @ApiParam(value ="布局id") + @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; @Column(name="LAYOUT_NAME_RDD") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index b590a94..41bd85a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,10 +32,12 @@ public class BfMethodDetail extends BaseBean { @Column(name="METHOD_ID") @ApiParam(value ="功能id") + @JsonSerialize(using = ToStringSerializer.class) private Long methodId; @Column(name="layout_column_id") @ApiParam(value ="布局列id") + @JsonSerialize(using = ToStringSerializer.class) private Long layoutColumnId; @Column(name="METHOD_DETAIL_NAME") @@ -42,6 +46,7 @@ public class BfMethodDetail extends BaseBean { @Column(name="ELEMENT_ID") @ApiParam(value ="表单元素id") + @JsonSerialize(using = ToStringSerializer.class) private Long elementId; @Column(name="ELEMENT_NAME_RDD") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index f36a739..1dbf45d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,11 +32,13 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="METHOD_ID") @ApiParam(value ="功能id") + @JsonSerialize(using = ToStringSerializer.class) private Long methodId; // 关联功能明细表id @Column(name="PRI_METHOD_DETAIL_ID") @ApiParam(value ="主功能明细id") + @JsonSerialize(using = ToStringSerializer.class) private Long priMethodDetailId; @Column(name="PRI_METHOD_DETAIL_NAME_RDD") @@ -43,6 +47,7 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="PRI_ELEMENT_ID") @ApiParam(value ="主对象元素id") + @JsonSerialize(using = ToStringSerializer.class) private Long priElementId; @Column(name="PRI_ELEMENT_NAME_RDD") @@ -61,6 +66,7 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="SEC_METHOD_DETAIL_ID") @ApiParam(value ="关联功能明细id") + @JsonSerialize(using = ToStringSerializer.class) private Long secMethodDetailId; @Column(name="SEC_METHOD_DETAIL_NAME_RDD") @@ -69,6 +75,7 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="SEC_ELEMENT_ID") @ApiParam(value ="关联对象元素id") + @JsonSerialize(using = ToStringSerializer.class) private Long secElementId; @Column(name="sec_element_name_rdd") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 65edec8..dd5388c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +32,7 @@ public class BfRefButtonMethod extends BaseBean { @Column(name="BUTTON_ID") @ApiParam(value ="按钮id") + @JsonSerialize(using = ToStringSerializer.class) private Long buttonId; @Column(name="BUTTON_NAME_RDD") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index 4dbf270..d41e560 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +32,7 @@ public class BfRefMethodRole extends BaseBean { @Column(name="METHOD_ID") @ApiParam(value ="表单功能id") + @JsonSerialize(using = ToStringSerializer.class) private Long methodId; @Column(name="METHOD_NAME_RDD") @@ -38,6 +41,7 @@ public class BfRefMethodRole extends BaseBean { @Column(name="ROLE_ID") @ApiParam(value ="角色id") + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; @Column(name="ROLE_NAME_RDD")