diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 873e21d..33d75d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -27,6 +27,9 @@ public class CommonEnumUtil { MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), SWEB(7, 8800, 19, "i3sweb", "供应商服务"), + PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + FORM(20, 8900, 16, "block-form", "智能表单"), REPORT(21, 8910, 17, "block-report", "智能报表"), WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), @@ -35,7 +38,7 @@ public class CommonEnumUtil { HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8410, 15, "APS", "高级计划与排程"), + APS(28, 8400, 15, "APS", "高级计划与排程"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), diff --git a/modules/i3plus-pojo-ptl-pcn/pom.xml b/modules/i3plus-pojo-ptl-pcn/pom.xml new file mode 100644 index 0000000..ed7ad85 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/pom.xml @@ -0,0 +1,26 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl-pcn + jar + + + + i3plus.pojo + i3plus-pojo-base + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java new file mode 100644 index 0000000..bd13740 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_PCN_TEST_USER") +@Api(value="PTL PCN 测试用户",description = "测试用户") +public class PpTestUser extends BaseBean { + + private static final long serialVersionUID = -8985367251249816850L; + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型(枚举,待定)" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java new file mode 100644 index 0000000..1e562ec --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl.pcn; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.pcn.bean + * 创建Bean Pp 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java new file mode 100644 index 0000000..ddcca36 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.pcn.bean.PpTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PpTestUserRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml new file mode 100644 index 0000000..92de049 --- /dev/null +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -0,0 +1,22 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl + jar + + + + i3plus.pojo + i3plus-pojo-base + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java new file mode 100644 index 0000000..5f056b7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_TEST_USER") +@Api(value="PTL 测试用户",description = "测试用户") +public class PtlTestUser extends BaseBean { + + private static final long serialVersionUID = -130240511327784335L; + + + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型(枚举,待定)" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java new file mode 100644 index 0000000..70b4956 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.bean + * 创建Bean 以Ptl 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java new file mode 100644 index 0000000..91896ed --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PtlTestUserRepository extends BaseRepository { +} diff --git a/pom.xml b/pom.xml index 0ed7d21..29baa7f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,8 @@ modules/i3plus-pojo-sweb modules/i3plus-pojo-andon modules/i3plus-pojo-lac + modules/i3plus-pojo-ptl + modules/i3plus-pojo-ptl-pcn