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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java

@@ -11,6 +11,98 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class PtlEnumUtil {
 
     /**
+     * 流程状态-触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 触发事件
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUNT_STATUS_TRIGGER_EVENT {
+        SUCCESS("SUCCESS", "是"),
+        FAILURE("FAILURE", "否");
+
+        private String value;
+        private String description;
+
+        ROUNT_STATUS_TRIGGER_EVENT(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static ROUNT_STATUS_TRIGGER_EVENT getByValue(String value) {
+            for (ROUNT_STATUS_TRIGGER_EVENT triggerEvent : values()) {
+                if (triggerEvent.getValue().equals(value)) {
+                    return triggerEvent;
+                }
+            }
+            return null;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件状态类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STATUS_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 作业流程类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -46,21 +138,30 @@ public class PtlEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ROUTE_EVENT {
-        TRIGGER(10, "trigger", "触发"),
-        ENTRY(20, "entry", "进入状态"),
-        EXIT(30, "exit", "离开状态");
+        TRIGGER("10", "trigger", "触发"),
+        ENTRY("20", "entry", "进入状态"),
+        EXIT("30", "exit", "离开状态");
 
-        private int value;
+        private String value;
         private String code;
         private String description;
 
-        ROUTE_EVENT(int value, String code, String description) {
+        ROUTE_EVENT(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
         }
 
-        public int getValue() {
+        public static ROUTE_EVENT getByValue(String value) {
+            for (ROUTE_EVENT routeEvent : values()) {
+                if (routeEvent.getValue().equals(value)) {
+                    return routeEvent;
+                }
+            }
+            return null;
+        }
+
+        public String getValue() {
             return value;
         }
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java

@@ -554,21 +554,21 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ROUTE_EVENT {
-        TRIGGER(10, "trigger", "触发"),
-        ENTRY(20, "entry", "进入状态"),
-        EXIT(30, "exit", "离开状态");
+        TRIGGER("10", "trigger", "触发"),
+        ENTRY("20", "entry", "进入状态"),
+        EXIT("30", "exit", "离开状态");
 
-        private int value;
+        private String value;
         private String code;
         private String description;
 
-        ROUTE_EVENT(int value, String code, String description) {
+        ROUTE_EVENT(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
         }
 
-        public int getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -933,8 +933,9 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATUS_TYPE {
         START(10, "START", "开始状态"),
-        FINISH(20, "FINISH", "完成状态"),
-        TERMINATE(30, "TERMINATE", "中断状态");
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
 
         private int value;
         private String code;

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

@@ -0,0 +1,57 @@
+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;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ROUTE_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_流程组件调用参数")
+public class PtlRouteModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3036415977457877114L;
+
+    @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-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRouteModuleParam;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam;
+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 ActionModuleGroupModel implements Serializable {
+
+    private static final long serialVersionUID = 3569055511035396175L;
+
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @ApiParam("执行顺序")
+    private Integer seq;
+
+    @ApiParam("流程组件参数集合")
+    private List<PtlRouteModuleParam> routeModuleParamList;
+
+    @ApiParam("区域流程组件参数集合")
+    private List<PtlAreaRouteModuleParam> areaRouteModuleParamList;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.ptl.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 BussinessProcessModel implements Serializable {
+
+    private static final long serialVersionUID = 148029163662900001L;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("GOJS位置")
+    private String position;
+
+    @ApiParam("流程明细Model集合")
+    private List<ProcessDetailModel> processDetailModelList;
+
+    @ApiParam("区域代码")
+    private String areaNo;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.ptl.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 ProcessDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 3569055511035396175L;
+
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @ApiParam("组件集MAP")
+    private Map<String, List<ActionModuleGroupModel>> actionModuleGroupMap;
+
+    @ApiParam("下个状态点MAP")
+    private Map<String, String> nextStatusMap;
+
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleParam;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlActionModuleParamRepository extends BaseRepository<PtlActionModuleParam, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlRouteModuleParamRepository extends BaseRepository<PtlRouteModuleParam, Long> {
+
+}