I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

Browse Source
yun-zuoyi
王杰 5 years ago committed by nancy.li
parent 3c1f8cf6b1 6232d14e61
commit e73fa0b6ab
10 changed files with 40 additions and 196 deletions
Show Stats Download Patch File Download Diff File

12
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java
Unescape Escape View File

@ -85,10 +85,6 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
private Long alarmRouteId;
@Transient
@ApiParam("状态机异常时默认不缓存")
private boolean cacheFlag = false;
@Transient
@ApiParam("当前状态点的触发组件集默认未执行")
private boolean actionAmgIdFalg = false;
@ -100,12 +96,4 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
@ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
private String nextTriggerEvent;
@Transient
@ApiParam("在一个组件集中默认继续执行下一个组件，当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点，则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent")
private boolean execNextModuleFlag = true;
@Transient
@ApiParam("默认异常未处理，业务异常抛出后，如果需要缓存，则设置cacheFlag为true，因为会被catch捕获，所以这里需要设置为true，避免异常重复被处理")
private boolean doErrorFlag = false;
}

10
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java
Unescape Escape View File

@ -1,6 +1,5 @@
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;
@ -17,7 +16,6 @@ import java.io.Serializable;
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@ -61,18 +59,10 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
@ApiParam(value = "安灯来源类型")
private String sourceType;
@Column(name = "CACHE_FLAG")
@ApiParam(value = "缓存标识")
private Integer cacheFlag;
@Column(name = "CACHE_KEY")
@ApiParam(value = "缓存KEY")
private String cacheKey;
@Column(name = "HANDLE_TYPE")
@ApiParam(value = "处理方式")
private Integer handleType;
@Column(name = "HANDLE_STATUS")
@ApiParam(value = "处理状态")
private Integer handleStatus;

3
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
Unescape Escape View File

@ -42,9 +42,6 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("触发事件")
private String triggerEvent;
@ApiModelProperty("缓存KEY")
private String cacheKey;
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;

71
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -1,46 +1,6 @@
package cn.estsh.i3plus.pojo.andon.sqlpack;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
import cn.estsh.i3plus.pojo.andon.bean.AndonActor;
import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast;
import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon;
import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonConfig;
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon;
import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg;
import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType;
import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase;
import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord;
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord;
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType;
import cn.estsh.i3plus.pojo.andon.bean.AndonPLC;
import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject;
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
import cn.estsh.i3plus.pojo.andon.bean.MesArea;
import cn.estsh.i3plus.pojo.andon.bean.MesEquipment;
import cn.estsh.i3plus.pojo.andon.bean.MesShift;
import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
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.enumutil.CommonEnumUtil;
@ -1086,6 +1046,12 @@ public class AndonHqlPack {
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);
@ -1094,6 +1060,12 @@ public class AndonHqlPack {
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);
@ -1101,4 +1073,21 @@ public class AndonHqlPack {
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;
}
}

52
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
Unescape Escape View File

@ -13,32 +13,6 @@ import org.apache.commons.lang3.StringUtils;
public class AndonEnumUtil {
/**
* 状态机异常处理方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
INNER(10, "内部处理"),
OUTER(20, "外部处理"),
REVIEW(30, "人工确认");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 状态机异常处理状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -64,32 +38,6 @@ public class AndonEnumUtil {
}
/**
* 状态机异常缓存标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
FALSE(10, "否"),
TRUE(20, "是"),
ORIGINAL(30, "原先");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 状态机执行方法
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

52
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
Unescape Escape View File

@ -14,32 +14,6 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_
public class PtlPcnEnumUtil {
/**
* 状态机异常处理方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
INNER(10, "内部处理"),
OUTER(20, "外部处理"),
REVIEW(30, "人工确认");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 状态机异常处理状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -65,32 +39,6 @@ public class PtlPcnEnumUtil {
}
/**
* 状态机异常缓存标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
FALSE(10, "否"),
TRUE(20, "是"),
ORIGINAL(30, "原先");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 控制器状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

13
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java
Unescape Escape View File

@ -77,10 +77,6 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
private Integer statusType;
@Transient
@ApiParam("默认不缓存")
private boolean cacheFlag = false;
@Transient
@ApiParam("触发组件集默认未执行")
private boolean actionAmgIdFalg = false;
@ -92,13 +88,4 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
@ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
private String nextTriggerEvent;
@Transient
@ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
private boolean execNextModuleFlag = true;
@Transient
@ApiParam("默认异常未处理")
private boolean doErrorFlag = false;
}

10
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java
Unescape Escape View File

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -19,7 +18,6 @@ import java.io.Serializable;
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@ -51,18 +49,10 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable
@ApiParam("区域代码")
private String areaNo;
@Column(name = "CACHE_FLAG")
@ApiParam(value = "缓存标识")
private Integer cacheFlag;
@Column(name = "CACHE_KEY")
@ApiParam(value = "缓存KEY")
private String cacheKey;
@Column(name = "HANDLE_TYPE")
@ApiParam(value = "处理方式")
private Integer handleType;
@Column(name = "HANDLE_STATUS")
@ApiParam(value = "处理状态")
private Integer handleStatus;

3
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
Unescape Escape View File

@ -48,9 +48,6 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("外部触发事件")
private String triggerEvent;
@ApiModelProperty("缓存KEY")
private String cacheKey;
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;

10
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
Unescape Escape View File

@ -341,4 +341,14 @@ public class PtlHqlPack {
DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean);
return packBean;
}
public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getTaskNo(), "taskNo", packBean);
DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAreaNo(), "areaNo", packBean);
DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
return packBean;
}
}

Write Preview
Loading…
Cancel
Save