解决冲突

5 years ago · 786c442d55
parent 18e037da7f
commit 786c442d55
40 changed files with 993 additions and 19 deletions
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-andon</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java
@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_MODULE")
+@EqualsAndHashCode(callSuper = true)
+@Api("作业组件")
+public class AndonActionModule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8909733530761576575L;
+
+    @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;
+
+    @Column(name = "INTERFACE_NO")
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @Transient
+    @ApiParam("执行顺序")
+    private Integer seq;
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java
@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_MODULE_GROUP")
+@EqualsAndHashCode(callSuper = true)
+@Api("组件集")
+public class AndonActionModuleGroup extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8905502301880084578L;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("执行顺序")
+    private Integer seq;
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java
@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("组件参数")
+public class AndonActionModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8216680446587969610L;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private String paramType;
+
+    @Column(name = "DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java
@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/05/08 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_ROUTE")
+@EqualsAndHashCode(callSuper = true)
+@Api("作业流程")
+public class AndonActionRoute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 917593748015715793L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_NAME")
+    @ApiParam("流程名称")
+    private String routeName;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型")
+    private Integer routeType;
+
+    @Lob
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java
@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTOR")
+@EqualsAndHashCode(callSuper = true)
+@Api("ACTOR信息")
+public class AndonActor extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1472090790204808649L;
+
+    @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;
+
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java
@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTOR_RULE")
+@EqualsAndHashCode(callSuper = true)
+@Api("ACTOR消息获取规则")
+public class AndonActorRule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3244584643305867326L;
+
+    @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;
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java
@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ALARM_ROUTE")
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯作业流程配置")
+public class AndonAlarmRoute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7425423934619147746L;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型")
+    private Integer routeType;
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java
@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯作业流程组件参数")
+public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6659953988053255710L;
+
+    @Column(name = "ALARM_ROUTE_ID")
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ALARM_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯类型")
+public class AndonAlarmType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3286588436625932653L;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "ALARM_NAME")
+    @ApiParam("安灯类型名称")
+    private String alarmName;
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
@ -46,6 +46,18 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {

    private static final long serialVersionUID = 183865984747203897L;

+    @Transient
+    @ApiParam(value ="触发事件")
+    private String triggerEvent;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam(value = "流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_STATUS_CODE")
+    @ApiParam(value = "状态点代码")
+    private String routeStatusCode;
+
    @Column(name = "SEQ")
    @ApiParam(value = "序号", example = "1")
    private Double seq;
@ -287,9 +299,13 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
    /**
     * 工位统计 构造函数
     * @param workCenterCode
+     * @param workCenterNameRdd
     * @param workCellCode
+     * @param workCellNameRdd
     * @param equipmentCode
+     * @param equipmentNameRdd
     * @param shiftCode
+     * @param shiftNameRdd
     * @param alarmCode
     * @param andonCount
     */
@ -308,12 +324,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {

    /**
     * 原因统计 使用Java内存计算（获取原始数据）
+     * @param acCode
+     * @param acNameRdd
     * @param workCenterCode
     * @param workCenterNameRdd
     * @param workCellCode
     * @param workCellNameRdd
     * @param alarmCode
-     * @param ecCodec
+     * @param ecCode
     * @param ecNameRdd
     * @param emCode
     * @param emNameRdd
@ -340,6 +358,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {

    /**
     * 人员统计 使用Java内存计算（获取原始数据）
+     * @param organizeCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
     * @param resetUser
     * @param alarmCode
     * @param callTime
@ -360,6 +382,7 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {

    /**
     * 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
+     * @param workCenterNameRdd
     * @param alarmCode
     * @param ecCode
     * @param ecNameRdd
@ -405,4 +428,5 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
            e.printStackTrace();
        }
    }
+
 }
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
@ -41,6 +41,14 @@ public class AndonManageRecord extends BaseManageQueue implements Serializable {

    private static final long serialVersionUID = 4667499369694353351L;

+    @Column(name = "ROUTE_CODE")
+    @ApiParam(value = "流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_STATUS_CODE")
+    @ApiParam(value = "状态点代码")
+    private String routeStatusCode;
+
    @Column(name = "SEQ")
    @ApiParam(value = "序号", example = "1")
    private Double seq;
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java
@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_MESSAGE_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("消息类型")
+public class AndonMessageType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6140381522677959027L;
+
+    @Column(name = "MT_CODE")
+    @ApiParam("消息类型代码")
+    private String mtCode;
+
+    @Column(name = "MT_NAME")
+    @ApiParam("消息类型名称")
+    private String mtName;
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java
@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.andon.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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ROUTE_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程组件参数")
+public class AndonRouteModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -282175947799144290L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java
@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.andon.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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ROUTE_STATUS")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态")
+public class AndonRouteStatus extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2091426896667989586L;
+
+    @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 = "STATUS_TYPE")
+    @ApiParam("状态类型")
+    private Integer statusType;
+
+    @Transient
+    @ApiParam("默认不缓存")
+    private boolean cacheFlag = false;
+
+    @Transient
+    @ApiParam("触发组件集默认未执行")
+    private boolean actionAmgIdFalg = false;
+
+    @Transient
+    @ApiParam("触发组件集默认未执行")
+    private boolean checkTriggerTypeFalg = false;
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java
@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @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;
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java
@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@ApiModel("状态点model")
+public class AndonRouteStatusModel implements Serializable {
+
+    private static final long serialVersionUID = -6258870691272170423L;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("下一状态")
+    private String nextStatus;
+
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @ApiParam("触发事件")
+    private String triggerEvent;
+
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @ApiParam("状态类型")
+    private Integer statusType;
+
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("流程类型")
+    private Integer routeType;
+
+    public AndonRouteStatusModel() {
+    }
+
+    public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType,
+                                 String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId,
+                                 Integer statusType, String alarmCode, String workCenterCode, Integer routeType) {
+        this.routeCode = routeCode;
+        this.statusCode = statusCode;
+        this.statusName = statusName;
+        this.nextStatus = nextStatus;
+        this.triggerType = triggerType;
+        this.triggerEvent = triggerEvent;
+        this.triggerWhere = triggerWhere;
+        this.actionAmgId = actionAmgId;
+        this.inAmgId = inAmgId;
+        this.outAmgId = outAmgId;
+        this.statusType = statusType;
+        this.alarmCode = alarmCode;
+        this.workCenterCode = workCenterCode;
+        this.routeType = routeType;
+    }
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus;
+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 wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@ApiModel("通用数据传输对象")
+public class CommonMsgModel implements Serializable {
+
+    private static final long serialVersionUID = -1772176070851992335L;
+
+    @ApiModelProperty("工厂")
+    private String organizeCode;
+
+    @ApiModelProperty("用户信息")
+    private String userInfo;
+
+    @ApiModelProperty("消息类型")
+    private String msgType;
+
+    @ApiModelProperty("消息数据")
+    private Map<String, Object> msgData;
+
+    @ApiModelProperty("流程状态集合")
+    private List<AndonRouteStatus> routeStatusList;
+
+    @ApiModelProperty("当前流程状态")
+    private AndonRouteStatus curRouteStatus;
+
+    @ApiModelProperty("外部触发事件")
+    private String triggerEvent;
+
+
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActor;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : actor
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:13
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActorRepository extends BaseRepository<AndonActor, Long> {
+}
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : actor rule
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:13
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActorRuleRepository extends BaseRepository<AndonActorRule, Long> {
+}
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-aps</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-base</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@ -13,6 +13,100 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {

    /**
+     * 流程状态-触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        ROUTE_TRIGGER_TYPE(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 ROUTE_STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTE_STATUS_TYPE(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 ACTION_MODULE_AM_TYPE {
+
+        METHOD_MODULE(10, "方法组件"),
+        INTERFACE_MODULE(20, "界面组件");
+
+        private int value;
+        private String description;
+
+        ACTION_MODULE_AM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
     * 安灯主界面产线或者站点运行状态
     * 正常 = 10，故障 = 20
     */
@ -766,6 +860,15 @@ public class AndonEnumUtil {
            return description;
        }

+        public static ANDON_ACTION_TAG getByValue(int value) {
+            for (ANDON_ACTION_TAG actionTag : values()) {
+                if (actionTag.getValue() == value) {
+                    return actionTag;
+                }
+            }
+            return null;
+        }
+
        public static String valueOfDescription(int val) {
            String tmp = null;
            for (int i = 0; i < values().length; i++) {
@ -924,6 +1027,15 @@ public class AndonEnumUtil {
            return description;
        }

+        public static ALARM_SOURCE_TYPE getByValue(String value) {
+            for (ALARM_SOURCE_TYPE sourceType : values()) {
+                if (sourceType.getValue().equals(value)) {
+                    return sourceType;
+                }
+            }
+            return null;
+        }
+
        public static String valueOfDescription(String val) {
            String tmp = null;
            for (int i = 0; i < values().length; i++) {
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-form</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>

--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-hardswitch</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <profiles>
        <profile>
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-ics</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-jobflow</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <profiles>
        <profile>
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-lac</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-mes-pcn</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-mes</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-model</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-platform</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-ptl</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.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.Transient;
 import java.io.Serializable;

 /**
@ -75,5 +76,17 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
    @ApiParam("状态类型")
    private Integer statusType;

+    @Transient
+    @ApiParam("默认不缓存")
+    private boolean cacheFlag = false;
+
+    @Transient
+    @ApiParam("触发组件集默认未执行")
+    private boolean actionAmgIdFalg = false;
+
+    @Transient
+    @ApiParam("触发组件集默认未执行")
+    private boolean checkTriggerTypeFalg = false;
+

 }
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
@ -49,4 +49,7 @@ public class CommonMsgModel implements Serializable {
    @ApiModelProperty("当前流程状态")
    private PtlRouteStatus curRouteStatus;

+    @ApiModelProperty("外部触发事件")
+    private String triggerEvent;
+
 }
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-report</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>

--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-softswitch</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>

--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-sweb</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-wms</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-workflow</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <profiles>
        <profile>