tijiao

api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -12,6 +12,8 @@ public class DictConstants {
     public static final String PROJECT_RUN_TYPE_EXECUTE = "1";  // 等待执行
     public static final String PROJECT_RUN_TYPE_EXPAND = "2";  // 等待扩充
     public static final String PROJECT_WAIT_QUEUE_KEY = "project-wait-queue";  // 等待执行
+
+    public static final String MULTI_PROJECT_WAIT_QUEUE_KEY = "multi-project-wait-queue";  // 多模式仿真等待执行
     public static final String PROJECT_WAIT_TYPE_EXECUTE = "1";  // 等待执行
     public static final String PROJECT_WAIT_TYPE_EXPAND = "2";  // 等待扩充
     public static final String PROJECT_WAIT_TYPE_ALL = "3";  // 等待扩充

api-common/src/main/java/api/common/pojo/param/project/MultiSimulationProjectKafkaParam.java

@@ -14,5 +14,7 @@ import java.util.List;
 @Accessors(chain = true)
 public class MultiSimulationProjectKafkaParam {
     private String projectId;
+
+    private Integer defaultTime;
     private List<MultiSimulationSceneKafkaParam> kafkaParamList;
 }

api-common/src/main/java/api/common/pojo/param/project/MultiSimulationSceneCarParam.java

@@ -1,5 +1,6 @@
 package api.common.pojo.param.project;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,13 +23,17 @@ public class MultiSimulationSceneCarParam {
 
     private String pathId;
 
-    private String pathStart;
+    private JSONObject pathStart;
 
-    private String pathEnd;
+    private String pathStartStr;
 
-    private String pathStartPoint;
+    private JSONObject pathEnd;
 
-    private String pathEndPoint;
+    private String pathEndStr;
+
+//    private String pathStartPoint;
+//
+//    private String pathEndPoint;
 
     private Integer carSort;
 

api-common/src/main/java/api/common/pojo/po/project/MultiSimulationProjectTaskRecordPO.java

@@ -0,0 +1,32 @@
+package api.common.pojo.po.project;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 多模式仿真
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MultiSimulationProjectTaskRecordPO implements Serializable {
+    private String id;
+    private String projectId;
+
+    private String sceneId;
+
+    private String taskBody;
+
+    private Integer status;
+
+    private Integer deleted;
+    private Integer sort;
+
+    private Timestamp createTime;
+    private Timestamp updateTime;
+}

api-common/src/main/java/api/common/pojo/vo/project/MultiSimulationSceneCarVO.java

@@ -1,5 +1,6 @@
 package api.common.pojo.vo.project;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -29,9 +30,9 @@ public class MultiSimulationSceneCarVO implements Serializable {
 
     private String pathEnd;
 
-    private String pathStartPoint;
+//    private String pathStartPoint;
 
-    private String pathEndPoint;
+//    private String pathEndPoint;
 
     private Integer carSort;
 
@@ -51,4 +52,8 @@ public class MultiSimulationSceneCarVO implements Serializable {
 
     private String sceneCarId;
 
+    private JSONObject pathStartJson;
+
+    private JSONObject pathEndJson;
+
 }