From 73af305576ec34044395f9f8fe2a133ec1d33b22 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 01:43:01 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=BF=81=E7=A7=BB20200213=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java | 71 ---------------- .../i3plus/pojo/ptl/pcn/bean/PtlActionModule.java | 57 +++++++++++++ .../pojo/ptl/pcn/bean/PtlActionModuleGroup.java | 44 ++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlActionRoute.java | 43 ++++++++++ .../estsh/i3plus/pojo/ptl/pcn/bean/PtlActor.java | 46 ++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlActorRule.java | 45 ++++++++++ .../cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlArea.java | 41 +++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlAreaRoute.java | 44 ++++++++++ .../pojo/ptl/pcn/bean/PtlAreaSectionTask.java | 87 +++++++++++++++++++ .../ptl/pcn/bean/PtlAreaSectionTaskDetail.java | 92 ++++++++++++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlAreaTask.java | 91 ++++++++++++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlAreaTaskSeq.java | 43 ++++++++++ .../cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlBom.java | 78 +++++++++++++++++ .../estsh/i3plus/pojo/ptl/pcn/bean/PtlControl.java | 65 +++++++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlMainTask.java | 97 ++++++++++++++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlMessageType.java | 42 ++++++++++ .../pojo/ptl/pcn/bean/PtlMessageTypeFormat.java | 45 ++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java | 78 +++++++++++++++++ .../estsh/i3plus/pojo/ptl/pcn/bean/PtlSection.java | 48 +++++++++++ .../cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlTag.java | 93 +++++++++++++++++++++ .../pojo/ptl/pcn/model/ActionModuleModel.java | 27 ++++++ .../pojo/ptl/pcn/model/ActorMessageModel.java | 48 +++++++++++ .../i3plus/pojo/ptl/pcn/model/CommonMsgModel.java | 43 ++++++++++ .../cn/estsh/i3plus/pojo/ptl/pcn/package-info.java | 14 ---- .../ptl/pcn/repository/PpTestUserRepository.java | 14 ---- .../repository/PtlActionModuleGroupRepository.java | 17 ++++ .../pcn/repository/PtlActionModuleRepository.java | 18 ++++ .../ptl/pcn/repository/PtlActorRepository.java | 15 ++++ .../ptl/pcn/repository/PtlActorRuleRepository.java | 16 ++++ .../ptl/pcn/repository/PtlAreaRouteRepository.java | 15 ++++ .../PtlAreaSectionTaskDetailRepository.java | 20 +++++ .../ptl/pcn/repository/PtlControlRepository.java | 18 ++++ .../repository/PtlMessageTypeFormatRepository.java | 15 ++++ .../pcn/repository/PtlMessageTypeRepository.java | 16 ++++ .../pcn/repository/PtlRouteStatusRepository.java | 17 ++++ .../pojo/ptl/pcn/repository/PtlTagRepository.java | 16 ++++ 36 files changed, 1480 insertions(+), 99 deletions(-) delete mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModule.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModuleGroup.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionRoute.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActor.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActorRule.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlArea.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaRoute.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTask.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTaskDetail.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTask.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTaskSeq.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlBom.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlControl.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMainTask.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageType.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageTypeFormat.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlSection.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlTag.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActionModuleModel.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActorMessageModel.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java delete mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java delete mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleGroupRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRuleRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaRouteRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaSectionTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlControlRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeFormatRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlRouteStatusRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlTagRepository.java 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 deleted file mode 100644 index bd13740..0000000 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java +++ /dev/null @@ -1,71 +0,0 @@ -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/bean/PtlActionModule.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModule.java new file mode 100644 index 0000000..6cd0340 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModule.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 org.springframework.data.annotation.Transient; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_MODULE") +@EqualsAndHashCode(callSuper = true) +@Api("作业组件") +public class PtlActionModule extends BaseBean implements Serializable { + private static final long serialVersionUID = 4734809867665293289L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "AM_NAME") + @ApiParam("组件名称") + private String amName; + + @Column(name = "AM_DESC") + @ApiParam("组件描述") + private String amDesc; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "AM_TYPE") + @ApiParam("组件类型") + private Integer amType; + + @Transient + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModuleGroup.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModuleGroup.java new file mode 100644 index 0000000..0f2ab0b --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionModuleGroup.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_MODULE_GROUP") +@EqualsAndHashCode(callSuper = true) +@Api("组件集") +public class PtlActionModuleGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 5581772484177493182L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionRoute.java new file mode 100644 index 0000000..0b0ae9f --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActionRoute.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("作业流程") +public class PtlActionRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = 6246614708550175795L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActor.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActor.java new file mode 100644 index 0000000..8278b9c --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActor.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTOR") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR信息") +public class PtlActor extends BaseBean implements Serializable { + private static final long serialVersionUID = 5647053475810310357L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "ACTOR_NAME") + @ApiParam("actor名称") + private String actorName; + + @Column(name = "ACTOR_Class") + @ApiParam("actor名称") + private String actorClass; + + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActorRule.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActorRule.java new file mode 100644 index 0000000..8fb5152 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlActorRule.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTOR_RULE") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR消息获取规则") +public class PtlActorRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -1515292442151992142L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "SPECIFIC_RULE") + @ApiParam("特定条件") + private String specificRule; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlArea.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlArea.java new file mode 100644 index 0000000..236c16e --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlArea.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA") +@EqualsAndHashCode(callSuper = true) +@Api("区域") +public class PtlArea extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443841199197995L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaRoute.java new file mode 100644 index 0000000..bec93fe --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaRoute.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("区域作业流程") +public class PtlAreaRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -9139851888717990905L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTask.java new file mode 100644 index 0000000..6c86fae --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTask.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_SECTION_TASK") +@EqualsAndHashCode(callSuper = true) +@Api("区段亮灯任务") +public class PtlAreaSectionTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 1453616567666404664L; + + @Column(name = "SECTION_TASK_NO") + @ApiParam("区段任务编号") + private String sectionTaskNo; + + @Column(name = "AREA_TASK_NO") + @ApiParam("区域任务编号") + private String areaTaskNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "AREA_NO") + @ApiParam("区域编号") + private String areaNo; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品组代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品组名称") + private String prodCfgName; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VIN_CODE") + @ApiParam("VIN号") + private String vinCode; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; + + @Column(name = "PART_LOCATION") + @ApiParam("产品位置") + private String partLocation; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "STATUS") + @ApiParam("区段任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTaskDetail.java new file mode 100644 index 0000000..b413964 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaSectionTaskDetail.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_SECTION_TASK_DETAIL") +@EqualsAndHashCode(callSuper = true) +@Api("区段亮灯任务明细") +public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -7563481752643393714L; + + @Column(name = "SECTION_TASK_NO") + @ApiParam("区段任务编号") + private String sectionTaskNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "AREA_NO") + @ApiParam("区域编号") + private String areaNo; + + @Column(name = "CONTROL_NO") + @ApiParam("控制器编号") + private String controlNo; + + @Column(name = "TAG_NO") + @ApiParam("标签编号") + private Integer tagNo; + + @Column(name = "TAG_TYPE") + @ApiParam("标签类型") + private Integer tagType; + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "QTY") + @ApiParam("拣货数量") + private Integer qty; + + @Column(name = "LIGHT_MODE") + @ApiParam("亮灯方式") + private Integer lightMode; + + @Column(name = "LIGHT_COLOR") + @ApiParam("亮灯颜色") + private Integer lightColor; + + @Column(name = "IS_BUZZING") + @ApiParam("是否蜂鸣") + private Integer isBuzzing; + + @Column(name = "MUSIC_TYPE") + @ApiParam("音乐类型") + private Integer musicType; + + @Column(name = "DISPLAY_CONTENT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "BIN_NO") + @ApiParam("bin位代码") + private String binNo; + + @Column(name = "STATUS") + @ApiParam("任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTask.java new file mode 100644 index 0000000..f6b1a41 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTask.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_TASK") +@EqualsAndHashCode(callSuper = true) +@Api("区域亮灯任务") +public class PtlAreaTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 1188465976922660834L; + + @Column(name = "AREA_TASK_NO") + @ApiParam("区域任务编号") + private Long areaTaskNo; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "SEQ") + @ApiParam("主任务顺序号") + private Integer seq; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品组代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品组名称") + private String prodCfgName; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户识别号") + private String custFlagNo; + + @Column(name = "VIN_CODE") + @ApiParam("VIN号") + private String vinCode; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; + + @Column(name = "PART_LOCAION") + @ApiParam("产品位置") + private String partLocation; + + @Column(name = "SN") + @ApiParam("产品代码") + private String sn; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private String taskType; + + @Column(name = "STATUS") + @ApiParam("任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTaskSeq.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTaskSeq.java new file mode 100644 index 0000000..8df2ea4 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlAreaTaskSeq.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_TASK_SEQ") +@EqualsAndHashCode(callSuper = true) +@Api("区域任务进度") +public class PtlAreaTaskSeq extends BaseBean implements Serializable { + private static final long serialVersionUID = 7138688457410728493L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "SEQ") + @ApiParam("主任务顺序号") + private Integer seq; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlBom.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlBom.java new file mode 100644 index 0000000..b3764ee --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlBom.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; +import java.util.Date; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_BOM") +@EqualsAndHashCode(callSuper = true) +public class PtlBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -4459081803170156825L; + + @Column(name = "PART_NO") + @ApiParam("父物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("父物料描述") + private String partName; + + @Column(name = "UNIT") + @ApiParam("计量单位") + private String unit; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料描述") + private String itemPartName; + + @Column(name = "ITEM_UNIT") + @ApiParam("子计量单位") + private String itemUnit; + + @Column(name = "ITEM_QTY") + @ApiParam("子用量") + private Integer itemQty; + + @Column(name = "BOM_NUM") + @ApiParam("BOM编号") + private String bomNum; + + @Column(name = "BOM_VERSION") + @ApiParam("BOM版本号") + private String bomVersion; + + @Column(name = "EFF_START_TIME") + @ApiParam("有效起始日期") + private Date effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam("有效截止日期") + private Date effEndTime; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlControl.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlControl.java new file mode 100644 index 0000000..c6981aa --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlControl.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_CONTROL") +@EqualsAndHashCode(callSuper = true) +@Api("控制器") +public class PtlControl extends BaseBean implements Serializable { + private static final long serialVersionUID = -5371842196308816310L; + + @Column(name = "CONTROL_NO") + @ApiParam("控制器编号") + private String controlNo; + + @Column(name = "CONTROL_NAME") + @ApiParam("控制器名称") + private String controlName; + + @Column(name = "CONTROL_TYPE") + @ApiParam("控制器类型") + private Integer controlType; + + @Column(name = "IP") + @ApiParam("ip地址") + private String ip; + + @Column(name = "PORT") + @ApiParam("端口地址") + private String port; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "STATUS") + @ApiParam("控制器状态") + private Integer status; + + @Column(name = "FREQUENCY") + @ApiParam("监听频率") + private Integer frequency; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMainTask.java new file mode 100644 index 0000000..1a76ede --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMainTask.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MAIN_TASK") +@EqualsAndHashCode(callSuper = true) +@Api("主任务") +public class PtlMainTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 7144785793974319891L; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "SEQ") + @ApiParam("主任务顺序号") + private Integer seq; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品组代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品组名称") + private String prodCfgName; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VIN_CODE") + @ApiParam("VIN号") + private String vinCode; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; + + @Column(name = "PART_LOCATION") + @ApiParam("产品位置") + private String partLocation; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private String taskType; + + @Column(name = "STATUS") + @ApiParam("任务状态") + private Integer status; + + @Column(name = "TASK_SRC") + @ApiParam("任务来源") + private String taskSrc; + + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageType.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageType.java new file mode 100644 index 0000000..23c0c5b --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MESSAGE_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("消息类型") +public class PtlMessageType extends BaseBean implements Serializable { + private static final long serialVersionUID = -8899362292879155612L; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "MT_NAME") + @ApiParam("消息类型名称") + private String mtName; + + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageTypeFormat.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageTypeFormat.java new file mode 100644 index 0000000..c6ca055 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlMessageTypeFormat.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MESSAGE_TYPE_FORMAT") +@EqualsAndHashCode(callSuper = true) +@Api("消息类型格式") +public class PtlMessageTypeFormat extends BaseBean implements Serializable { + private static final long serialVersionUID = 3398977445081168030L; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "FIELD_CODE") + @ApiParam("属性代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("属性名称") + private String fieldName; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java new file mode 100644 index 0000000..ba83441 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class PtlRouteStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = -2862693366302428501L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "SEQ") + @ApiParam("流程状态顺序") + private Integer seq; + + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlSection.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlSection.java new file mode 100644 index 0000000..fe82c83 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlSection.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_SECTION") +@EqualsAndHashCode(callSuper = true) +@Api("区段") +public class PtlSection extends BaseBean implements Serializable { + private static final long serialVersionUID = -7451758045686558883L; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "SECTION_NAME") + @ApiParam("区段名称") + private String sectionName; + + @Column(name = "SECTION_SEQ") + @ApiParam("区段顺序号") + private Integer sectionSeq; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlTag.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlTag.java new file mode 100644 index 0000000..8e23c85 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlTag.java @@ -0,0 +1,93 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_TAG") +@EqualsAndHashCode(callSuper = true) +@Api("标签信息") +public class PtlTag extends BaseBean implements Serializable { + private static final long serialVersionUID = -949910394508157581L; + + @Column(name = "TAG_NO") + @ApiParam("标签代码") + private Integer tagNo; + + @Column(name = "CONTROL_NO") + @ApiParam("控制器代码") + private String controlNo; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段代码") + private String sectionNo; + + @Column(name = "PART_NO") + @ApiParam("物料编号") + private String partNo; + + @Column(name = "BIN_NO") + @ApiParam("BIN位代码") + private String binNo; + + @Column(name = "TAG_TYPE") + @ApiParam("标签类型") + private Integer tagType; + + @Column(name = "LIGHT_STATUS") + @ApiParam("亮灯状态") + private Integer lightStatus; + + @Column(name = "TAG_STATUS") + @ApiParam("标签状态") + private Integer tagStatus; + + @Column(name = "LIGHT_MODE") + @ApiParam("亮灯状态") + private Integer lightMode; + + @Column(name = "LIGHT_COLOR") + @ApiParam("亮灯颜色") + private Integer lightColor; + + @Column(name = "IS_BUZZING") + @ApiParam("是否蜂鸣") + private Integer isBuzzing; + + @Column(name = "MUSIC_TYPE") + @ApiParam("音乐类型") + private Integer musicType; + + @Column(name = "DISPLAY_CONTEXT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "ERROR_COUNT") + @ApiParam("卡键次数") + private Integer errorCount; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActionModuleModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActionModuleModel.java new file mode 100644 index 0000000..6b9408b --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActionModuleModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/2/12 18:18 + * @desc + */ +@Data +@ApiModel("作业组件model") +public class ActionModuleModel { + + @ApiModelProperty("组件代码") + private String amCode; + + @ApiModelProperty("调用类") + private String callClass; + + @ApiModelProperty("是否完成") + private Boolean isComplete; + + @ApiModelProperty("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActorMessageModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActorMessageModel.java new file mode 100644 index 0000000..e442426 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/ActorMessageModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @author Wynne.Lu + * @date 2020/2/13 19:31 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +@ApiModel("actor消息类型及属性") +public class ActorMessageModel { + + @ApiModelProperty("消息类型代码") + private String mtCode; + + @ApiModelProperty("消息类型名称") + private String mtName; + + @ApiModelProperty("属性代码") + private String fieldCode; + + @ApiModelProperty("属性名称") + private String fieldName; + + @ApiModelProperty("actor代码") + private String actorCode; + + @ApiModelProperty("特定条件") + private String specificRule; + + @ApiModelProperty("actor类") + private String actorClass; + + @ApiModelProperty("工厂") + private String organizeCode; + + + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java new file mode 100644 index 0000000..a134cc1 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlRouteStatus; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("通用数据传输对象") +public class CommonMsgModel implements Serializable { + private static final long serialVersionUID = 6359899762200319607L; + + @ApiModelProperty("工厂") + private String organizeCode; + + @ApiModelProperty("用户信息") + private String userInfo; + + @ApiModelProperty("客户端信息") + private String clientInfo; + + @ApiModelProperty("消息类型") + private String msgType; + + @ApiModelProperty("流程状态集合") + private List routeStatusList; + + @ApiModelProperty("当前流程状态") + private PtlRouteStatus curRouteStatus; + + @ApiModelProperty("消息数据") + private Map msgData; +} 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 deleted file mode 100644 index 1e562ec..0000000 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @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 deleted file mode 100644 index ddcca36..0000000 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleGroupRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleGroupRepository.java new file mode 100644 index 0000000..1eb0ecb --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleGroupRepository.java @@ -0,0 +1,17 @@ +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.PtlActionModuleGroup; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleGroupRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleRepository.java new file mode 100644 index 0000000..b50bd27 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActionModuleRepository.java @@ -0,0 +1,18 @@ +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.PtlActionModule; + +import java.util.Collection; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRepository.java new file mode 100644 index 0000000..d65eb83 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRepository.java @@ -0,0 +1,15 @@ +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.PtlActor; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActorRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRuleRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRuleRepository.java new file mode 100644 index 0000000..3b758e7 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlActorRuleRepository.java @@ -0,0 +1,16 @@ +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.PtlActorRule; +import org.springframework.stereotype.Repository; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActorRuleRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaRouteRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaRouteRepository.java new file mode 100644 index 0000000..5e38e00 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaRouteRepository.java @@ -0,0 +1,15 @@ +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.PtlAreaRoute; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaRouteRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaSectionTaskDetailRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaSectionTaskDetailRepository.java new file mode 100644 index 0000000..66838ee --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaSectionTaskDetailRepository.java @@ -0,0 +1,20 @@ +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.PtlAreaSectionTaskDetail; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaSectionTaskDetailRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlControlRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlControlRepository.java new file mode 100644 index 0000000..2086e2f --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlControlRepository.java @@ -0,0 +1,18 @@ +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.PtlControl; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlControlRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeFormatRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeFormatRepository.java new file mode 100644 index 0000000..a74193a --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeFormatRepository.java @@ -0,0 +1,15 @@ +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.PtlMessageTypeFormat; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMessageTypeFormatRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeRepository.java new file mode 100644 index 0000000..7868050 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlMessageTypeRepository.java @@ -0,0 +1,16 @@ +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.PtlMessageType; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMessageTypeRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlRouteStatusRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlRouteStatusRepository.java new file mode 100644 index 0000000..6b082af --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlRouteStatusRepository.java @@ -0,0 +1,17 @@ +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.PtlRouteStatus; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlRouteStatusRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlTagRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlTagRepository.java new file mode 100644 index 0000000..8158b21 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlTagRepository.java @@ -0,0 +1,16 @@ +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.PtlTag; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlTagRepository extends BaseRepository { +} From 3bed5974f63398f0c323e549ec7b099fe3d77458 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 01:45:14 +0800 Subject: [PATCH 2/9] ptl pojo init --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 10 ++ .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 181 +++++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java new file mode 100644 index 0000000..465551f --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public class PtlEnumUtil { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java new file mode 100644 index 0000000..674fede --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -0,0 +1,181 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.util.StringUtils; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public class PtlPcnEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RouteEvent { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入状态"), + EXIT(30, "exit", "离开状态"); + + private int value; + private String code; + private String description; + + RouteEvent(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RouteState { + START(10, "START", "开启流程"), + TERMINATE(20, "TERMINATE", "终止流程"), + FINISH(30, "FINISH", "结束流程"); + + private int value; + private String code; + private String description; + + RouteState(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TagType { + BIN_TAG(10, "库位标签"), + FINALIZER_TAG(20, "完成器标签"), + SCREEN_TAG(30, "标签显示器"), + TAG_SCAN_API(40, "标签扫描接口"); + + private int value; + private String description; + + TagType(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TriggerType { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TriggerType(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RouteType { + GEN_TASK(10, "生成任务"), + OFF_TAG(20, "灭灯"); + + private int value; + private String description; + + RouteType(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MonitorProcessMessageType { + CONNECT_CONTROL(10, "CONNECT_CONTROL", "连接控制器"), + DISCONNECT_CONTROL(20, "DISCONNECT_CONTROL", "断开控制器"), + LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "亮灯命令"); + + private int value; + private String code; + private String description; + + MonitorProcessMessageType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static MonitorProcessMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + +} From 8a9c8273d8ad463d17f98f3c35d4ebb43c56e2c6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 14 Feb 2020 10:44:22 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90=20=E5=8F=91=E8=BF=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=2020300=EF=BC=8C=2020390=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=BE=80=20ref=5Fitem=20=E5=AD=97=E6=AE=B5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E3=80=91=E3=80=90bug7506?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 24eb89b..dba988a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -119,6 +119,10 @@ public class QadBop implements Serializable { @ApiParam("工厂代码") public String inSite; + @ApiParam("父层级packcode代码") + @Column(name="BOPDW_PARENT") + public String bopdwParent; + public QadBop(){ } From bc007c3d2b128170d60eca67cc2727f464adc853 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 14:34:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?pojo=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/ptl/pcn/bean/PtlElement.java | 40 ++++++++++++++++ .../pojo/ptl/pcn/bean/PtlElementAttribute.java | 42 +++++++++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlInterface.java | 38 +++++++++++++++ .../pojo/ptl/pcn/bean/PtlInterfaceElement.java | 42 +++++++++++++++++ .../ptl/pcn/bean/PtlInterfaceElementAttribute.java | 42 +++++++++++++++++ .../estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java | 17 +++++++ .../i3plus/pojo/ptl/pcn/model/CommonMsgModel.java | 12 +++-- .../i3plus/pojo/ptl/pcn/model/WsResultBean.java | 55 ++++++++++++++++++++++ .../ptl/pcn/repository/PtlElementRepository.java | 14 ++++++ .../repository/PtlInterfaceElementRepository.java | 14 ++++++ .../ptl/pcn/repository/PtlInterfaceRepository.java | 14 ++++++ 11 files changed, 326 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElement.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElementAttribute.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterface.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElementAttribute.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/WsResultBean.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlElementRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceElementRepository.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceRepository.java diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElement.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElement.java new file mode 100644 index 0000000..585bf28 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElement.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:18 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ELEMENT") +@EqualsAndHashCode(callSuper = true) +@Api("元素") +public class PtlElement extends BaseBean implements Serializable { + private static final long serialVersionUID = 5562337056340313246L; + + @Column(name = "ELEMENT_NO") + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "ELEMENT_NAME") + @ApiParam("元素名称") + private String elementName; + + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElementAttribute.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElementAttribute.java new file mode 100644 index 0000000..39f7d2e --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlElementAttribute.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:19 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("元素属性") +public class PtlElementAttribute extends BaseBean implements Serializable { + private static final long serialVersionUID = 4591354414381724731L; + + @Column(name = "ELEMENT_NO") + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "ATTRIBUTE_NO") + @ApiParam("属性代码") + private String attributeNo; + + @Column(name = "ATTRIBUTE_NAME") + @ApiParam("属性名称") + private String attributeName; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterface.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterface.java new file mode 100644 index 0000000..a32c7ee --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterface.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:15 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_INTERFACE") +@EqualsAndHashCode(callSuper = true) +@Api("界面") +public class PtlInterface extends BaseBean implements Serializable { + private static final long serialVersionUID = 5905965593463421411L; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面代码") + private String interfaceNo; + + @Column(name = "INTERFACE_NAME") + @ApiParam("界面名称") + private String interfaceName; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java new file mode 100644 index 0000000..61d9af6 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:21 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("界面元素") +public class PtlInterfaceElement extends BaseBean implements Serializable { + private static final long serialVersionUID = -8436630151033411240L; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面代码") + private String interfaceNo; + + @Column(name = "ELEMENT_NO") + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "FEEDBACK_ELEMENT") + @ApiParam("界面代码") + private String feedbackElement; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElementAttribute.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElementAttribute.java new file mode 100644 index 0000000..8b728ca --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElementAttribute.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:22 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_INTERFACE_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("界面元素属性") +public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { + private static final long serialVersionUID = 6603839514256277172L; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面代码") + private String interfaceNo; + + @Column(name = "ATTRIBUTE_NO") + @ApiParam("属性代码") + private String attributeNo; + + @Column(name = "ATTRIBUTE_VALUE") + @ApiParam("属性值") + private String attributeValue; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java new file mode 100644 index 0000000..e664646 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/AttrModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class AttrModel implements Serializable { + + @ApiParam("属性名称") + private String attrName; + + @ApiParam("属性名称别名") + private String attrNameAlias; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java index a134cc1..e244d3c 100644 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/CommonMsgModel.java @@ -26,11 +26,17 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("用户信息") private String userInfo; + @ApiModelProperty("消息类型") + private String msgType; + + @ApiModelProperty("消息数据") + private Map msgData; + @ApiModelProperty("客户端信息") private String clientInfo; - @ApiModelProperty("消息类型") - private String msgType; + @ApiModelProperty("websocket消息") + private WsResultBean wsResultBean; @ApiModelProperty("流程状态集合") private List routeStatusList; @@ -38,6 +44,4 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("当前流程状态") private PtlRouteStatus curRouteStatus; - @ApiModelProperty("消息数据") - private Map msgData; } diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/WsResultBean.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/WsResultBean.java new file mode 100644 index 0000000..4f6a724 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/WsResultBean.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class WsResultBean implements Serializable { + + /** + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 + * moduleContent组件内容,taskComplete整个扫描完成 + */ + @ApiParam("业务类型") + private String busiType; + + /** + * 对于相同业务类型的数据，区分不同数据类型。 + * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， + * image-图片 + */ + @ApiParam("数据类型") + private String dataType; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("List结果集") + private List resultList; + + @ApiParam("结果对象") + private Object resultObj; + + @ApiParam("Map结果集") + public Map resultMap; + + @ApiParam("List结果集的属性") + private List dataAttrList; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("多个数据集") + private List> wsResultBeans; +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlElementRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlElementRepository.java new file mode 100644 index 0000000..dd9031c --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlElementRepository.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.PtlElement; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ +public interface PtlElementRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceElementRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceElementRepository.java new file mode 100644 index 0000000..ccb4caa --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceElementRepository.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.PtlInterfaceElement; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ +public interface PtlInterfaceElementRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceRepository.java new file mode 100644 index 0000000..5478236 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlInterfaceRepository.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.PtlInterface; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ +public interface PtlInterfaceRepository extends BaseRepository { + +} From bbfcdfdd648e31001812326acbdfff3b5e551964 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 14:53:32 +0800 Subject: [PATCH 5/9] =?UTF-8?q?ptl=20pojo=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 71 ++++++++++++++++++++-- .../pojo/mes/pcn/bean/MesNumberSerialno.java | 6 ++ .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 6 +- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 10 +-- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 +-- 5 files changed, 84 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 674fede..8a3b947 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -117,14 +117,16 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RouteType { - GEN_TASK(10, "生成任务"), - OFF_TAG(20, "灭灯"); + GEN_TASK(10, "GEN_TASK", "生成任务"), + OFF_TAG(20, "OFF_TAG", "灭灯"); private int value; + private String code; private String description; - RouteType(int value, String description) { + RouteType(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -132,6 +134,10 @@ public class PtlPcnEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -141,7 +147,9 @@ public class PtlPcnEnumUtil { public enum MonitorProcessMessageType { CONNECT_CONTROL(10, "CONNECT_CONTROL", "连接控制器"), DISCONNECT_CONTROL(20, "DISCONNECT_CONTROL", "断开控制器"), - LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "亮灯命令"); + LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "亮灯命令"), + LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "灭灯命令"), + INTERFACE_FEEDBACK(100, "INTERFACE_FEEDBACK", "发送给界面actor通过websocket返回"); private int value; private String code; @@ -178,4 +186,59 @@ public class PtlPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WsBusiType { + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"); + + private int value; + private String code; + private String description; + + WsBusiType(int value, String code, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WsDataType { + TEXT(10, "TEXT", "正常信息"), + EXP_TEXT(20, "EXP_TEXT", "异常信息"), + TABLE(30, "TABLE", "表格"); + + private int value; + private String code; + private String description; + + WsDataType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java index 3938dbe..3be0723 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -40,4 +41,9 @@ public class MesNumberSerialno extends BaseBean implements Serializable { @Column(name = "CURRENT_NUMBER") @ApiParam("当前编号") private String currentNumber; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index 3ef3027..8047c46 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -60,6 +57,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("流程") private String routeCOde; + @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index fe11f2f..956a931 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -27,7 +27,7 @@ import java.io.Serializable; @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - } +} ) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { @@ -152,10 +152,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; /********************** 冗余字段 *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 6e3bfb8..7633f77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -152,10 +152,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; /********************** 冗余字段 *********************************/ @Transient From 8477526bf5d474e6b286dd82a695e6a614ffb536 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 14 Feb 2020 17:56:39 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=20=E6=97=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=94=9F=E6=88=90=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=9C=A8=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=A1=A5=E6=89=93=EF=BC=8C=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=91=E3=80=90bug7514=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 260d96b..f13a265 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1604,7 +1604,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); From 9fe977e8c06d5ae940475f62ffbe9f5c71c24d6d Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 14 Feb 2020 18:33:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=90=20=E6=97=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=94=9F=E6=88=90=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=9C=A8=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=A1=A5=E6=89=93=EF=BC=8C=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=91=E3=80=90bug7514=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index f13a265..260d96b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1604,7 +1604,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); From f358c13b04c6efaf5975f66deae9e073d4d101f3 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 23:12:48 +0800 Subject: [PATCH 8/9] =?UTF-8?q?ptl=E8=BF=81=E7=A7=BB4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 4 ++-- .../pojo/ptl/pcn/model/SpecificRuleModel.java | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8a3b947..b66e8d1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -145,8 +145,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MonitorProcessMessageType { - CONNECT_CONTROL(10, "CONNECT_CONTROL", "连接控制器"), - DISCONNECT_CONTROL(20, "DISCONNECT_CONTROL", "断开控制器"), + CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "灭灯命令"), INTERFACE_FEEDBACK(100, "INTERFACE_FEEDBACK", "发送给界面actor通过websocket返回"); diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java new file mode 100644 index 0000000..297eacb --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/model/SpecificRuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.model; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/2/14 15:30 + * @desc + */ +@Data +@ApiModel("特定条件model") +public class SpecificRuleModel implements Serializable { + private static final long serialVersionUID = -4724747574943605500L; + + private List kList=new ArrayList<>(); + + private Map kvMap=new HashMap<>(); +} From 5afcf20a9ea4423b6610af2eb492a7934c0abead Mon Sep 17 00:00:00 2001 From: luweihao Date: Sat, 15 Feb 2020 15:21:25 +0800 Subject: [PATCH 9/9] =?UTF-8?q?ptlpcn=20=E6=B7=BB=E5=8A=A0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=A1=E5=8F=B7=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 43 +++++++++++++++++++++- .../pojo/ptl/pcn/bean/PtlInterfaceElement.java | 2 +- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index b66e8d1..65b443f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -149,7 +149,7 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "灭灯命令"), - INTERFACE_FEEDBACK(100, "INTERFACE_FEEDBACK", "发送给界面actor通过websocket返回"); + INTERFACE_SIGNAL_CMD(50, "INTERFACE_SIGNAL_CMD", "发送给界面actor通过websocket返回"); private int value; private String code; @@ -187,6 +187,47 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum InterfaceSignalMessageType { + CONNECT_CONTROL_CMD(10, "111111", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "222222", "断开控制器"), + LIGHT_ON_CMD(30, "333333", "亮灯命令"); + + private int value; + private String code; + private String description; + + InterfaceSignalMessageType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static InterfaceSignalMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WsBusiType { MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"); diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java index 61d9af6..843fc9c 100644 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlInterfaceElement.java @@ -22,7 +22,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "PTL_ELEMENT_ATTRIBUTE") +@Table(name = "PTL_INTERFACE_ELEMENT") @EqualsAndHashCode(callSuper = true) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable {