From bc007c3d2b128170d60eca67cc2727f464adc853 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 14 Feb 2020 14:34:42 +0800 Subject: [PATCH] =?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 { + +}