Merge branch 'dev' into test

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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_ACTOR_ACTION")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_区域观察者事件配置")
+public class PtlAreaActorAction extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596837642283797995L;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String areaNo;
+
+    @Column(name = "ACTOR_CODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("观察者编码")
+    private String actorCode;
+
+    @Column(name = "MT_CODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("消息类型代码")
+    private String mtCode;
+
+    @Column(name = "OTHER_WHERE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("特定条件")
+    private String otherWhere;
+
+    @Column(name = "AMG_ID")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("组件集编号")
+    private Long amgId;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_区域流程组件调用参数")
+public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596829442283797995L;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String areaNo;
+
+    @Column(name = "ROUTE_CODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "AMG_ID")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("参数值")
+    private String paramValue;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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_IF")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_接口清单")
+public class PtlIf extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596882732758197995L;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String ifCode;
+
+    @Column(name = "IF_NAME")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("接口名称")
+    private String ifName;
+
+    @Column(name = "IF_CONNECT_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
+    @ApiParam("交互方式")
+    private String ifConnectType;
+
+    @Column(name = "IF_CLASS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
+    @ApiParam("接口实现类")
+    private String ifClass;
+
+    @Column(name = "IF_CALL_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
+    @ApiParam("接口调用方向")
+    private String ifCallType;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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_RFID")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_RFID")
+public class PtlRfid extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596837642758197995L;
+
+    @Column(name = "RFID_CONTROL_NO")
+    @ApiParam("RFID读写器代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String rfidControlNo;
+
+    @Column(name = "IP")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("IP")
+    private String ip;
+
+    @Column(name = "PORT")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("端口号")
+    private String port;
+
+    @Column(name = "AREA_NO")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
+    @ApiParam("区域代码")
+    private String areaNo;
+
+    @Column(name = "RFID_VALUE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("rfid内容")
+    private String rfidValue;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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 javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_WINDOW")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_界面")
+public class PtlWindow extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596443842758197995L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String windowNo;
+
+    @Column(name = "WINDOW_NAME")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("界面名称")
+    private String windowName;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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_WINDOW_ELEMENT")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_界面元素")
+public class PtlWindowElement extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596427582758197995L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String windowNo;
+
+    @Column(name = "ELEMENT_NO")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("元素代码")
+    private String elementNo;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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_WINDOW_ELEMENT_ATTRIBUTE")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_界面元素属性")
+public class PtlWindowElementAttribute extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1596427582758285995L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String windowNo;
+
+    @Column(name = "ELEMENT_NO")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("元素代码")
+    private String elementNo;
+
+    @Column(name = "ATTRIBUTE_NO")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("属性代码")
+    private String attributeNo;
+
+    @Column(name = "ATTRIBUTE_VALUE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam("属性值")
+    private String attributeValue;
+
+}