diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index b8ce4d5..17279ed 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -46,4 +47,12 @@ public class AndonAlarmRoute extends BaseBean implements Serializable { @ApiParam("流程类型") private Integer routeType; + @Transient + @ApiParam("安灯类型名称") + private String alarmName; + + @Transient + @ApiParam("流程名称") + private String routeName; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java new file mode 100644 index 0000000..18c8643 --- /dev/null +++ b/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 routeModuleParamList; + + @ApiParam("区域流程组件参数集合") + private List alarmRouteModuleParamList; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java new file mode 100644 index 0000000..db1fd3c --- /dev/null +++ b/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 processDetailModelList; + + @ApiParam("安灯流程ID") + private Long alarmRouteId; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java new file mode 100644 index 0000000..929eb24 --- /dev/null +++ b/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> actionModuleGroupMap; + + @ApiParam("下个状态点MAP") + private Map nextStatusMap; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + + @ApiParam("界面编号") + private String interfaceNo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java new file mode 100644 index 0000000..c14a33b --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java new file mode 100644 index 0000000..9da9511 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java new file mode 100644 index 0000000..2ebac18 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java new file mode 100644 index 0000000..a84d6ea --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index ac2db61..3240a9a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1034,4 +1034,20 @@ public class AndonHqlPack { } return packBean; } + + 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; + } + + 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; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 2350d9d..313523c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -13,6 +13,48 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** + * 状态机执行方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ACTION_TYPE { + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); + + private String value; + private String code; + private String description; + + ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) { + for (ROUTE_STATUS_ACTION_TYPE actionType : values()) { + if (actionType.getValue().equals(value)) { + return actionType; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + + /** * 状态点界面编号 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -116,14 +158,14 @@ public class AndonEnumUtil { * 流程状态-触发类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_TRIGGER_TYPE { + public enum ROUTE_STATUS_TRIGGER_TYPE { INNER_TRIGGER(10, "内部触发"), OUTER_TRIGGER(20, "外部触发"); private int value; private String description; - ROUTE_TRIGGER_TYPE(int value, String description) { + ROUTE_STATUS_TRIGGER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -144,8 +186,7 @@ public class AndonEnumUtil { public enum ROUTE_STATUS_TYPE { START(10, "START", "开始状态"), EXECUTING(20, "EXECUTING", "执行中状态"), - TERMINATE(30, "TERMINATE", "中断状态"), - FINISH(40, "FINISH", "完成状态"); + FINISH(30, "FINISH", "完成状态"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 2c5fcb1..34baf30 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -137,7 +137,7 @@ public class PtlEnumUtil { * 状态机执行方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_EVENT { + public enum ROUTE_STATUS_ACTION_TYPE { TRIGGER("10", "trigger", "触发"), ENTRY("20", "entry", "进入状态"), EXIT("30", "exit", "离开状态"); @@ -146,16 +146,16 @@ public class PtlEnumUtil { private String code; private String description; - ROUTE_EVENT(String value, String code, String description) { + ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public static ROUTE_EVENT getByValue(String value) { - for (ROUTE_EVENT routeEvent : values()) { - if (routeEvent.getValue().equals(value)) { - return routeEvent; + public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) { + for (ROUTE_STATUS_ACTION_TYPE actionType : values()) { + if (actionType.getValue().equals(value)) { + return actionType; } } return null; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 43cd127..4ae9867 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -553,7 +553,7 @@ public class PtlPcnEnumUtil { * 状态机执行方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_EVENT { + public enum ROUTE_STATUS_ACTION_TYPE { TRIGGER("10", "trigger", "触发"), ENTRY("20", "entry", "进入状态"), EXIT("30", "exit", "离开状态"); @@ -562,7 +562,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - ROUTE_EVENT(String value, String code, String description) { + ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) { this.value = value; this.code = code; this.description = description;