同步

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java

@@ -0,0 +1,56 @@
+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;
+
+    @Transient
+    @ApiParam("执行顺序")
+    private Integer seq;
+}

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;
+}

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;
+
+}

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;
+}

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;
+
+
+}

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;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_呼叫原因
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "ANDON_呼叫原因")
-public class AndonAlarmCause extends BaseBean {
+public class AndonAlarmCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5837347497945981811L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯子类型
@@ -28,7 +29,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯子类型")
-public class AndonAlarmDetailType extends BaseBean {
+public class AndonAlarmDetailType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1540491136291384925L;
 
     @Column(name = "ALARM_DETAIL_CODE")
     @ApiParam(value = "安灯子类型编码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_呼叫通知配置
@@ -28,7 +29,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_呼叫通知配置")
-public class AndonAlarmResponseCfg extends BaseBean {
+public class AndonAlarmResponseCfg extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 4302725908675374347L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java

@@ -0,0 +1,58 @@
+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_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;
+
+    @Transient
+    @ApiParam("安灯类型名称")
+    private String alarmName;
+
+    @Transient
+    @ApiParam("流程名称")
+    private String routeName;
+
+}

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;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java

@@ -0,0 +1,66 @@
+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_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;
+
+    @Column(name = "CODE")
+    @ApiParam("菜单编号")
+    private String code;
+
+    @Column(name = "COLOR")
+    @ApiParam("BI颜色")
+    private String color;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("安灯类型代码")
+    private String value;
+
+    @Transient
+    @ApiParam("安灯类型名称")
+    private String description;
+
+    @Transient
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.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_AREA_ALARM_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("区域安灯类型")
+public class AndonAreaAlarmType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6551224785612729594L;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :安灯广播
@@ -27,7 +28,10 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_BROADCAST")
 @Api("安灯广播")
-public class AndonBroadCast extends BaseBean {
+public class AndonBroadCast extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5383684820100076411L;
+
     @Column(name="DEVICE_NUM")
     @ApiParam("广播设备编号")
     private String targetIds;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -30,7 +31,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_BROADCAST_CFG")
 @Api("生产区域")
-public class AndonBroadCastCfg extends BaseBean {
+public class AndonBroadCastCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5434544329665544113L;
+
     @Column(name="ALARM_CODE")
     @ApiParam("安灯类型代码")
     private String alarmCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元呼叫原因配置
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元呼叫原因配置")
-public class AndonCellAlarmCause extends BaseBean {
+public class AndonCellAlarmCause extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 3623997837738333774L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;
@@ -47,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean {
     @ApiParam(value = "事件描述")
     private String acCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "安灯类型名称")
     private String alarmCodeName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "呼叫原因描述")
     private String acName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元事件原因配置
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元事件原因配置")
-public class AndonCellEventCause extends BaseBean {
+public class AndonCellEventCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1641944472466007171L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元处理方法配置
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元处理方法配置")
-public class AndonCellEventMethod extends BaseBean {
+public class AndonCellEventMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 8681966862823447650L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元事件现象
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元事件现象")
-public class AndonCellEventPhenomenon extends BaseBean {
+public class AndonCellEventPhenomenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4413846938406056923L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工位分组配置
@@ -29,7 +30,10 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工位分组配置")
-public class AndonCellGroupCfg extends BaseBean {
+public class AndonCellGroupCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4801397986303698999L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 系统参数配置
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_CONFIG")
 @Api(value="系统配置")
-public class AndonConfig extends BaseBean {
+public class AndonConfig extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3284234821448139251L;
 
     @Column(name="NAME")
     @ApiParam(value ="名称")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java

@@ -14,7 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.List;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_自处理配置
@@ -30,7 +30,9 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_自处理配置")
-public class AndonDisposalCfg extends BaseBean {
+public class AndonDisposalCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 161656982939855466L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description: 自处理维护配置
@@ -29,7 +30,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("Andon自处理维护配置")
-public class AndonDisposalMaintenCfg extends BaseBean {
+public class AndonDisposalMaintenCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 474667557264134793L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_事件原因
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "ANDON_事件原因")
-public class AndonEventCause extends BaseBean {
+public class AndonEventCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3051829000971794178L;
 
     @Column(name = "EC_CODE")
     @ApiParam(value = "事件原因代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_事件处理方法
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "ANDON_事件处理方法")
-public class AndonEventMethod extends BaseBean {
+public class AndonEventMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2079366249221906256L;
 
     @Column(name = "EM_CODE")
     @ApiParam(value = "事件方法代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_事件现象
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_事件现象")
-public class AndonEventPhenoMenon extends BaseBean {
+public class AndonEventPhenoMenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3844606172813258352L;
 
     @Column(name = "EPM_CODE")
     @ApiParam(value = "事件现象代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯停线配置数据
@@ -34,7 +35,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonHaltCfg extends BaseBean {
+public class AndonHaltCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6209233767460121461L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_停机类型
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_停机类型")
-public class AndonHaltType extends BaseBean {
+public class AndonHaltType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7816748747119429173L;
 
     @Column(name = "HALT_CODE")
     @ApiParam(value = "停机类型编码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,7 +27,10 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON知识库")
-public class AndonKnowledgeBase extends BaseManageQueue {
+public class AndonKnowledgeBase extends BaseManageQueue implements Serializable {
+
+    private static final long serialVersionUID = -1636250887271456543L;
+
     @Column(name = "FLOW_STATUS")
     @ApiParam(value = "审批状态")
     private Integer flowStatus;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,7 +42,22 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonManageQueue extends BaseManageQueue {
+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;
@@ -283,9 +299,13 @@ public class AndonManageQueue extends BaseManageQueue {
     /**
      * 工位统计 构造函数
      * @param workCenterCode
+     * @param workCenterNameRdd
      * @param workCellCode
+     * @param workCellNameRdd
      * @param equipmentCode
+     * @param equipmentNameRdd
      * @param shiftCode
+     * @param shiftNameRdd
      * @param alarmCode
      * @param andonCount
      */
@@ -304,12 +324,14 @@ public class AndonManageQueue extends BaseManageQueue {
 
     /**
      * 原因统计 使用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
@@ -336,6 +358,10 @@ public class AndonManageQueue extends BaseManageQueue {
 
     /**
      * 人员统计 使用Java内存计算（获取原始数据）
+     * @param organizeCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
      * @param resetUser
      * @param alarmCode
      * @param callTime
@@ -356,6 +382,7 @@ public class AndonManageQueue extends BaseManageQueue {
 
     /**
      * 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
+     * @param workCenterNameRdd
      * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
@@ -401,4 +428,5 @@ public class AndonManageQueue extends BaseManageQueue {
             e.printStackTrace();
         }
     }
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯记录
@@ -36,7 +37,17 @@ import javax.persistence.*;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯记录")
-public class AndonManageRecord extends BaseManageQueue {
+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")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java

@@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
+import java.io.Serializable;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description: 安灯通知记录表
@@ -29,7 +27,10 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("通知记录")
-public class AndonMessageRecord extends BaseBean {
+public class AndonMessageRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5002185160195696080L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心")
     private String workCenterCode;
@@ -77,4 +78,9 @@ public class AndonMessageRecord extends BaseBean {
     @Column(name = "MEMO")
     @ApiParam(value = "备注")
     private String memo;
+
+    @Lob
+    @Column(name = "MESSAGE")
+    @ApiParam(value = "广播内容")
+    private String message;
 }

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;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_PLC控制
@@ -30,7 +31,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯PLC控制")
-public class AndonPLC extends BaseBean {
+public class AndonPLC extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -611094238158756163L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_PLC监控记录
@@ -34,7 +35,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯PLC监控记录")
-public class AndonPLCRecord extends BaseBean {
+public class AndonPLCRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1593292976397416635L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯任务附属表
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_MANAGE_ATTACH")
 @Api(value="安灯附属表")
-public class AndonQueueAttach extends BaseBean {
+public class AndonQueueAttach extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6314624948969141111L;
 
     @Column(name="PROD_INFO")
     @ApiParam(value ="产品信息" , example ="-1")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -28,7 +29,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("通知方式")
-public class AndonResponse extends BaseBean {
+public class AndonResponse extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3558849492798328348L;
 
     @Column(name = "RESPONSE_CODE")
     @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯通知对象
@@ -28,7 +29,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯通知对象")
-public class AndonResponseObject extends BaseBean {
+public class AndonResponseObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7623038823371770473L;
 
     @Column(name = "RP_OBJECT_CODE")
     @ApiParam(value = "通知对象对象编码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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;
+
+/**
+ * @Description : ANDON_上升流程配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升流程配置")
+public class AndonRiteRoute extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 5542314911937418047L;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
+    @Column(name = "ANDON_STATUS")
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @AnnoOutputColumn(hidden = true)
+    @Column(name = "WORK_CENTER_NAME_RDD")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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;
+
+/**
+ * @Description : ANDON_上升配置明细
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE_DETAIL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升配置明细")
+public class AndonRiteRouteDetail extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 8382210828244626428L;
+
+    @Column(name = "RITE_ROUTE_ID")
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @Column(name = "RP_WHERE")
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}

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 = "ANDON_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;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java

@@ -0,0 +1,99 @@
+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;
+
+    @Column(name = "INTERFACE_NO")
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @Transient
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+    @Transient
+    @ApiParam("当前状态点的触发组件集默认未执行")
+    private boolean actionAmgIdFalg = false;
+
+    @Transient
+    @ApiParam("进入触发方法时默认不需要校验外部触发")
+    private boolean checkTriggerTypeFalg = false;
+
+    @Transient
+    @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
+    private String nextTriggerEvent;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java

@@ -0,0 +1,70 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态异常记录")
+public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4046192879130584866L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "ANDON_ORDER_NO")
+    @ApiParam(value = "安灯队列编号")
+    public String andonOrderNo;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam(value = "异常描述")
+    public String errorDesc;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    public String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元")
+    public String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    public String alarmCode;
+
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "安灯来源类型")
+    private String sourceType;
+
+    @Column(name = "CACHE_KEY")
+    @ApiParam(value = "缓存KEY")
+    private String cacheKey;
+
+    @Column(name = "HANDLE_STATUS")
+    @ApiParam(value = "处理状态")
+    private Integer handleStatus;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java

@@ -16,6 +16,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -32,7 +33,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_AREA")
 @Api("生产区域")
-public class MesArea extends BaseBean {
+public class MesArea extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6011431901401687892L;
+
     @Column(name="AREA_CODE")
     @ApiParam("区域代码")
     private String areaCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java

@@ -17,6 +17,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :生产设备
@@ -32,7 +33,10 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_EQUIPMENT")
 @Api("生产设备")
-public class MesEquipment extends BaseBean {
+public class MesEquipment extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4827453020382814751L;
+
     @Column(name="EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务动作
@@ -27,7 +28,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_SHIFT")
 @Api("班次信息")
-public class MesShift extends BaseBean {
+public class MesShift extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -459263592129978101L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -31,7 +32,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CELL")
 @Api("工作单元")
-public class MesWorkCell extends BaseBean {
+public class MesWorkCell extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5981041286446162921L;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -31,7 +32,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CENTER")
 @Api("工作中心")
-public class MesWorkCenter extends BaseBean {
+public class MesWorkCenter extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1988041859547182829L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

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;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 流程明细Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程明细Model")
+public class AndonActionModuleGroupModel implements Serializable {
+
+    private static final long serialVersionUID = 2483914575357867288L;
+
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @ApiParam("执行顺序")
+    private Integer seq;
+
+    @ApiParam("流程组件参数集合")
+    private List<AndonRouteModuleParam> routeModuleParamList;
+
+    @ApiParam("安灯流程组件参数集合")
+    private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -13,7 +13,9 @@ import java.io.Serializable;
  * @Modify:
  **/
 @Data
-public class AndonBoardModel {
+public class AndonBoardModel implements Serializable {
+
+    private static final long serialVersionUID = 4995310176494124290L;
 
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 作业流程Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("作业流程Model")
+public class AndonBussinessProcessModel implements Serializable {
+
+    private static final long serialVersionUID = 801986911134685985L;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("GOJS位置")
+    private String position;
+
+    @ApiParam("流程明细Model集合")
+    private List<AndonProcessDetailModel> processDetailModelList;
+
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -16,7 +17,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class AndonMenuInterfaceModel{
+public class AndonMenuInterfaceModel implements Serializable {
+
+    private static final long serialVersionUID = 6854130571481363067L;
 
     @ApiParam("工作中心代码")
     private String  workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 流程明细Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程明细Model")
+public class AndonProcessDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 5240991498276455147L;
+
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @ApiParam("组件集MAP")
+    private Map<String, List<AndonActionModuleGroupModel>> actionModuleGroupMap;
+
+    @ApiParam("下个状态点MAP")
+    private Map<String, String> nextStatusMap;
+
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 上升配置明细model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-11-12-10:21
+ * @Modify:
+ **/
+@Data
+public class AndonRiteRouteDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 1993963582174708808L;
+
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java

@@ -0,0 +1,92 @@
+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;
+
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+    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 interfaceNo, String alarmCode, String workCenterCode, Integer routeType, Long alarmRouteId) {
+        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.interfaceNo = interfaceNo;
+        this.alarmCode = alarmCode;
+        this.workCenterCode = workCenterCode;
+        this.routeType = routeType;
+        this.alarmRouteId = alarmRouteId;
+    }
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Description : 人员model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class AndonUserModel extends BaseBean {
+
+    @ApiParam(value ="部门名称")
+    private String departmentNameRdd;
+
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="员工编号")
+    private String userEmpNo;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -19,7 +20,9 @@ import javax.persistence.MappedSuperclass;
  **/
 @Data
 @MappedSuperclass
-public class BaseManageQueue extends BaseBean {
+public class BaseManageQueue extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5223610541891941843L;
 
     @Column(name = "ANDON_ORDER_NO")
     @ApiParam(value = "安灯队列编号")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java

@@ -12,13 +12,16 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * 工位分组配置model
  */
 @Data
-public class CellGroupStatusModel{
+public class CellGroupStatusModel implements Serializable {
+
+    private static final long serialVersionUID = -6614881484056090725L;
 
     @ApiParam("工作中心代码")
     private String  workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -0,0 +1,51 @@
+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;
+
+    @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
+    private boolean errorInnerAction = false;
+
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Entity;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -23,7 +24,9 @@ import javax.persistence.Entity;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("组织模型")
-public class ProdOrgModel extends BaseBean {
+public class ProdOrgModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2210888838877951435L;
 
     @ApiParam("区域名称")
     private String areaName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java

@@ -4,9 +4,12 @@ import cn.estsh.i3plus.pojo.andon.bean.MesArea;
 import io.swagger.annotations.ApiParam;
 
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
-public class SysOrganizeModel{
+public class SysOrganizeModel implements Serializable {
+
+    private static final long serialVersionUID = -8218859255737680832L;
 
     @Transient
     @ApiParam(value ="父节点")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleGroupRepository extends BaseRepository<AndonActionModuleGroup, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleParamRepository extends BaseRepository<AndonActionModuleParam, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleRepository extends BaseRepository<AndonActionModule, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionRouteRepository extends BaseRepository<AndonActionRoute, Long> {
+}

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> {
+}

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> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmRouteModuleParamRepository extends BaseRepository<AndonAlarmRouteModuleParam, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmRouteRepository extends BaseRepository<AndonAlarmRoute, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAreaAlarmTypeRepository extends BaseRepository<AndonAreaAlarmType, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-11-12-14:24
+ * @Modify:
+ **/
+@Repository
+public interface IAndonMessageTypeRepository extends BaseRepository<AndonMessageType, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteModuleParamRepository extends BaseRepository<AndonRouteModuleParam, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatusErrorRecord;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteStatusErrorRecordRepository extends BaseRepository<AndonRouteStatusErrorRecord, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteStatusRepository extends BaseRepository<AndonRouteStatus, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -3,14 +3,9 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import org.springframework.util.StringUtils;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description : 安灯对象查询封装
@@ -62,7 +57,8 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
-        if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getIsSucceed(), "isSucceed", packBean);
+        if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }
         return packBean;
@@ -209,7 +205,7 @@ public class AndonHqlPack {
     public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
 
         // 判断工厂代码是否为空
-        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+        if (!StringUtils.isEmpty(bean.getOrganizeCode())) {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
@@ -373,7 +369,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean);
 
-        if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){
+        if(!StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }
 
@@ -418,7 +414,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
 
-        if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
+        if(!StringUtils.isEmpty(andonManageQueue.getCallTimeStart()) || !StringUtils.isEmpty(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
         }
         getStringBuilderPack(andonManageQueue, result);
@@ -557,10 +553,13 @@ public class AndonHqlPack {
      */
     public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
-        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }
         packBean.setOrderByStr(mesEquipment.orderBy());
@@ -575,13 +574,13 @@ public class AndonHqlPack {
      */
     public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
-        if (StringUtils.isNotEmpty(shift.getShiftCode())){
+        if (!StringUtils.isEmpty(shift.getShiftCode())){
             DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getShiftName())){
+        if (!StringUtils.isEmpty(shift.getShiftName())){
             DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
+        if (!StringUtils.isEmpty(shift.getWorkCenterCode())){
             DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
@@ -793,7 +792,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result);
+        if (mesArea != null) {
+            DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -810,7 +811,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result);
+        if (mesWorkCenter != null) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -827,7 +830,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result);
+        if (mesWorkCell != null) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -844,7 +849,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result);
+        if (mesEquipment != null) {
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -862,7 +869,9 @@ public class AndonHqlPack {
             DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result);
         }
 
-        DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result);
+        if (mesShift != null) {
+            DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
 
         return result;
@@ -876,4 +885,219 @@ public class AndonHqlPack {
         DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true);
         return result;
     }
+
+    /**
+     * actor信息
+     * @param actor
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActor(AndonActor actor, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actor, organizeCode);
+        if (!StringUtils.isEmpty(actor.getActorCode())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorCode(), "actorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actor.getActorName())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorName(), "actorName", packBean);
+        }
+        if (!StringUtils.isEmpty(actor.getActorClass())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorClass(), "actorClass", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 消息类型
+     * @param messageType
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonMessageType(AndonMessageType messageType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(messageType, organizeCode);
+        if (!StringUtils.isEmpty(messageType.getMtCode())) {
+            DdlPreparedPack.getStringLikerPack(messageType.getMtCode(), "mtCode", packBean);
+        }
+        if (!StringUtils.isEmpty(messageType.getMtName())) {
+            DdlPreparedPack.getStringLikerPack(messageType.getMtName(), "mtName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * actor消息类型配置
+     * @param actorRule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActorRule(AndonActorRule actorRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actorRule, organizeCode);
+        if (!StringUtils.isEmpty(actorRule.getActorCode())) {
+            DdlPreparedPack.getStringLikerPack(actorRule.getActorCode(), "actorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actorRule.getMtCode())) {
+            DdlPreparedPack.getStringLikerPack(actorRule.getMtCode(), "mtCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 安灯类型
+     * @param alarmType
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonAlarmType(AndonAlarmType alarmType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(alarmType, organizeCode);
+        if (!StringUtils.isEmpty(alarmType.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(alarmType.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(alarmType.getAlarmName())) {
+            DdlPreparedPack.getStringLikerPack(alarmType.getAlarmName(), "alarmName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 组件
+     * @param actionModule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActionModule(AndonActionModule actionModule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionModule, organizeCode);
+        if (!StringUtils.isEmpty(actionModule.getAmCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getAmCode(), "amCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getAmName())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getAmName(), "amName", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getCallClass())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getCallClass(), "callClass", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getAmType())) {
+            DdlPreparedPack.getNumEqualPack(actionModule.getAmType(), "amType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 组件参数
+     * @param actionModuleParam
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActionModuleParam(AndonActionModuleParam actionModuleParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionModuleParam, organizeCode);
+        if (!StringUtils.isEmpty(actionModuleParam.getAmCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getAmCode(), "amCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamCode(), "paramCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamName())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamName(), "paramName", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamType())) {
+            DdlPreparedPack.getNumEqualPack(actionModuleParam.getParamType(), "paramType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 上升流程配置
+     * @param riteRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode);
+        if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) {
+            DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 上升配置明细
+     * @param riteRouteDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode);
+        if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) {
+            DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 作业流程
+     * @param actionRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
+        DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 安灯作业流程配置
+     * @param alarmRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(alarmRoute.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 流程状态异常记录
+     * @param routeStatusErrorRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRouteStatusErrorRecord(AndonRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode);
+        DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean);
+        DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getAndonOrderNo(), "andonOrderNo", packBean);
+        DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getSourceType(), "sourceType", packBean);
+        DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode);
+        DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean);
+        DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
 @Api("副资源设置时间")
 public class AssistResourceSetTime extends BaseAPS {
+    private static final long serialVersionUID = 901172392855536686L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -34,6 +34,7 @@ import java.util.List;
 @ExcludeImportExport
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class BaseOrder extends BaseAPS {
+    private static final long serialVersionUID = -2571085172798608026L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java

@@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass;
 @Api("规则参数基类")
 @ExcludeImportExport
 public class BaseRule extends BaseAPS {
+    private static final long serialVersionUID = -1818853814377611968L;
     @Column(name="CODE")
     @ApiParam(value ="规则编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java

@@ -22,6 +22,7 @@ import javax.persistence.Table;
 @Table(name = "APS_CANCEL_PLAN_RULE")
 @Api("取消计划规则")
 public class CancelPlanRule extends BaseRule {
+    private static final long serialVersionUID = 2674055522875545446L;
     @Column(name="WORK_FILTERS")
     @ApiParam(value ="工作筛选")
     private String workFilters;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_DATA_LINK")
 @Api("数据集成数据连接信息")
 public class DataLink extends BaseAPS {
+    private static final long serialVersionUID = 8324774871058505466L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("班次")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class DayShift extends BaseAPS {
+    private static final long serialVersionUID = 7964370027924366093L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_DYNAMIC_SET_TIME")
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
+    private static final long serialVersionUID = -1696499471488104793L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("数据导出明细")
 public class ExportDetail extends BaseAPS {
 
+    private static final long serialVersionUID = -8898414164032180539L;
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_EXPORT_PROJECT")
 @Api("数据导出明细集合")
 public class ExportProject extends BaseAPS {
+    private static final long serialVersionUID = -7281303629295174330L;
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java

@@ -23,6 +23,7 @@ import javax.persistence.Table;
 @Table(name = "APS_EXPRESSION_RECORD")
 @Api("表达式记录")
 public class ExpressionRecord extends BaseAPS {
+    private static final long serialVersionUID = 4038954046132896632L;
     @Column(name="BEAN_NAME")
     @ApiParam(value ="表名")
     private String beanName;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
 
@@ -35,6 +36,7 @@ import java.sql.JDBCType;
 @Api("字段信息")
 @ExcludeImportExport
 public class FieldInfo extends BaseAPS {
+    private static final long serialVersionUID = -6195036426929675850L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -121,11 +123,15 @@ public class FieldInfo extends BaseAPS {
     private Boolean notEmpty;
 
     @JsonIgnore
+    @Transient
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore
+    @Transient
     private transient Class<?> typeClass;
     @JsonIgnore
+    @Transient
     private transient Method getMethod;
     @JsonIgnore
+    @Transient
     private transient Method setMethod;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java

@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_FIELD_SET_RULE")
 @Api("属性赋值规则")
 public class FieldSetRule extends BaseRule {
+    private static final long serialVersionUID = 6880145972942618559L;
     @Column(name="BEAN")
     @ApiParam(value ="实体名")
     private ApsEnumUtil.FIELD_SET_BEAN bean;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :刷新计划规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-07-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_FLUSH_PLAN_RULE")
+@Api("刷新计划规则")
+public class FlushPlanRule extends BaseRule {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java

@@ -31,6 +31,7 @@ import javax.validation.constraints.Min;
 @Api("炉容量")
 public class FurnaceCapacity extends BaseAPS {
 
+    private static final long serialVersionUID = -5657804042629460659L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api("炉资源计划")
 public class FurnacePlan extends BaseAPS {
 
+    private static final long serialVersionUID = 6816465736285211114L;
     @Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="已占用的能力")
     private Double capacity;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("组炉设置")
 public class FurnaceSetting extends BaseAPS {
 
+    private static final long serialVersionUID = -4566911526487268870L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java

@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_HEURISTIC_RULE")
 @Api("排程运算规则")
 public class HeuristicRule extends BaseRule {
+    private static final long serialVersionUID = -4856714428377308150L;
     @Column(name="WORK_FILTER")
     @ApiParam(value ="工作筛选")
     private String workFilter;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("数据导入明细")
 public class ImportDetail extends BaseAPS {
 
+    private static final long serialVersionUID = 1264030397500660450L;
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java

@@ -28,6 +28,7 @@ import java.util.List;
 @Table(name = "APS_IMPORT_PROJECT")
 @Api("数据导入明细集合")
 public class ImportProject extends BaseAPS {
+    private static final long serialVersionUID = -1899074765155621438L;
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java

@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @Table(name = "APS_INVENTORY")
 @Api("库存")
 public class Inventory extends BaseOrder {
+    private static final long serialVersionUID = 2378846162007550439L;
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;