夜得朦胧 1 éve
szülő
commit
7a17dfbb53

+ 5 - 0
api-common/pom.xml

@@ -81,6 +81,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.31</version>
+        </dependency>
 
         <!-- 参数校验 -->
         <dependency>

+ 3 - 0
api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -64,6 +64,9 @@ public class DictConstants {
     // 场景评价规则脚本类型
     public static final String SCENE_EVALUATION_RULE_PY_FILE = "evaluationPy";
 
+
+    public static final String MAP_DRIVER_FILE = "mapFile";
+
     // 算法镜像上传类型
     public static final String ALGORITHM_UPLOAD_MODE_FILE = "1";    // 文件上传
     public static final String ALGORITHM_UPLOAD_MODE_GIT = "2";     // git 仓库

+ 13 - 0
api-common/src/main/java/api/common/pojo/param/map/SimulationMapPathParam.java

@@ -0,0 +1,13 @@
+package api.common.pojo.param.map;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class SimulationMapPathParam {
+    private String mapId;
+
+}

+ 5 - 6
api-common/src/main/java/api/common/pojo/po/map/SimulationMapPO.java

@@ -1,9 +1,7 @@
 package api.common.pojo.po.map;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -11,10 +9,11 @@ import java.sql.Timestamp;
 /**
  * 多模式仿真
  */
-@Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Getter
+@Setter
+@Accessors(chain = true)
 public class SimulationMapPO implements Serializable {
     private String id;
     private String mapCode;

+ 6 - 6
api-common/src/main/java/api/common/pojo/po/map/SimulationMapPathPO.java

@@ -1,9 +1,7 @@
 package api.common.pojo.po.map;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -11,10 +9,11 @@ import java.sql.Timestamp;
 /**
  * 多模式仿真
  */
-@Data
-@Builder
+@Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@Accessors(chain = true)
 public class SimulationMapPathPO implements Serializable {
     private String id;
     private String mapId;
@@ -30,4 +29,5 @@ public class SimulationMapPathPO implements Serializable {
 
     private Timestamp createTime;
     private Timestamp updateTime;
+
 }

+ 42 - 0
api-common/src/main/java/api/common/pojo/vo/map/SimulationMapPathVO.java

@@ -0,0 +1,42 @@
+package api.common.pojo.vo.map;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * 多模式仿真
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class SimulationMapPathVO implements Serializable {
+    private String id;
+    private String mapId;
+    private Integer pathSort;
+    private String pathDetail;
+
+    private String pathStartPoint;
+
+    private String pathEndPoint;
+    private Integer startPointNum;
+    private Integer endPointNum;
+    private Integer deleted;
+
+    private Timestamp createTime;
+    private Timestamp updateTime;
+
+    private List<JSONObject> startPoints;
+
+    private List<JSONObject> endPoints;
+
+}

+ 7 - 0
api-common/src/main/java/api/common/pojo/vo/map/SimulationMapVO.java

@@ -1,5 +1,6 @@
 package api.common.pojo.vo.map;
 
+import api.common.pojo.po.map.SimulationMapPathPO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * 多模式仿真
@@ -31,5 +33,10 @@ public class SimulationMapVO implements Serializable {
     private Timestamp createTime;
     private Timestamp updateTime;
 
+    private String mapId;
+
+    private Integer mapJsonPathNum;
+
+    private List<SimulationMapPathVO> path;
 
 }