I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
柯裕 6 years ago
parent 26b4f3e5b4 1bd875d264
commit 9477ba5c91
20 changed files with 93 additions and 19 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -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;

9
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java
Unescape Escape View File

@ -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();
}

6
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
Unescape Escape View File

@ -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";
}
}

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -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++) {

3
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
Unescape Escape View File

@ -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")

2
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
Unescape Escape View File

@ -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")

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
Unescape Escape View File

@ -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;
}

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
Unescape Escape View File

@ -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")

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
Unescape Escape View File

@ -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")

3
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
Unescape Escape View File

@ -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")

5
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
Unescape Escape View File

@ -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")

7
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
Unescape Escape View File

@ -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")

3
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
Unescape Escape View File

@ -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")

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
Unescape Escape View File

@ -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")

5
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -31,6 +31,11 @@
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-form</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId>
</dependency>

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
Unescape Escape View File

@ -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<SqlColumnModel> columnlist ;
}

8
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
Unescape Escape View File

@ -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")

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
Unescape Escape View File

@ -77,4 +77,8 @@ public class WmsCSOrderMaster extends BaseBean {
@Transient
@ApiParam(value = "盘点库位清单")
public String[] wmsCSLocates;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件")
private Integer isPart;
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
Unescape Escape View File

@ -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;
}

6
pom.xml
Unescape Escape View File

@ -115,6 +115,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-form</artifactId>
<version>${project.version}</version>
</dependency>
<!-- spring-json转换 -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>

Write Preview
Loading…
Cancel
Save