移动点选修改

orbit-base-biz/base-biz-api/src/main/java/com/base/api/model/PointRpcDTO.java

@@ -34,4 +34,20 @@ public class PointRpcDTO {
     private String hotspot;//是否是热点 0是热点 1普通
 
     private String iscover;//当目标类型是点群时 需要这个字段判断该点是否被覆盖 0覆盖 1没有覆盖
+
+    /**
+     * 动目标平均航速，单位节，1节=1海里/小时=1.852km/h
+     */
+    @ApiModelProperty("动目标平均航速")
+    private String movingEvgSpeed;
+
+    /**
+     * 航向
+     */
+    private String heading;
+
+    /**
+     * 移动时长
+     */
+    private String time;
 }

orbit-base-biz/base-biz-api/src/main/java/com/base/api/model/TargetDemandRpcDTO.java

@@ -3,6 +3,7 @@ package com.base.api.model;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -95,4 +96,5 @@ public class TargetDemandRpcDTO {
 
     @ApiModelProperty("需求名称")
     private String reqName;
+
 }

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/PointDTO.java

@@ -15,4 +15,20 @@ public class PointDTO {
     @ApiModelProperty("经度")
     private Double lng;
 
+    /**
+     * 动目标平均航速，单位节，1节=1海里/小时=1.852km/h
+     */
+    @ApiModelProperty("动目标平均航速")
+    private String movingEvgSpeed;
+
+    /**
+     * 航向
+     */
+    private String heading;
+
+    /**
+     * 移动时长
+     */
+    private String time;
+
 }

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/dto/request/QueryTargetPointBatchDTO.java

@@ -2,6 +2,7 @@ package com.base.biz.model.dto.request;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -82,5 +83,21 @@ public class QueryTargetPointBatchDTO {
      */
     private Integer source;
 
+    /**
+     * 动目标平均航速，单位节，1节=1海里/小时=1.852km/h
+     */
+    @ApiModelProperty("动目标平均航速")
+    private String movingEvgSpeed;
+
+    /**
+     * 航向
+     */
+    private String heading;
+
+    /**
+     * 移动时长
+     */
+    private String time;
+
 
 }

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/entity/SceneTargetPoint.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -92,4 +93,21 @@ public class SceneTargetPoint implements Serializable {
     private Integer source;
 
 
+    /**
+     * 动目标平均航速，单位节，1节=1海里/小时=1.852km/h
+     */
+    @ApiModelProperty("动目标平均航速")
+    private String movingEvgSpeed;
+
+    /**
+     * 航向
+     */
+    private String heading;
+
+    /**
+     * 移动时长
+     */
+    private String time;
+
+
 }

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/service/TargetDemandService.java

@@ -322,6 +322,9 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
                     pointRpcDTO.setLongitude(sceneTargetPoint.getLongitude().toString());
                     pointRpcDTO.setLatitude(sceneTargetPoint.getLatitude().toString());
                     pointRpcDTO.setSerial(sceneTargetPoint.getSequence().toString());
+                    pointRpcDTO.setMovingEvgSpeed(sceneTargetPoint.getMovingEvgSpeed());
+                    pointRpcDTO.setHeading(sceneTargetPoint.getHeading());
+                    pointRpcDTO.setTime(sceneTargetPoint.getTime());
                     pointDTOList.add(pointRpcDTO);
                 }
             }
@@ -576,6 +579,9 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
             SceneTargetPoint.setLongitude(BigDecimal.valueOf(pointDTO.getLng()));
             SceneTargetPoint.setTargetId(targetId);
             SceneTargetPoint.setSequence(pointDTO.getSequence());
+            SceneTargetPoint.setMovingEvgSpeed(pointDTO.getMovingEvgSpeed());
+            SceneTargetPoint.setHeading(pointDTO.getHeading());
+            SceneTargetPoint.setTime(pointDTO.getTime());
             SceneTargetPointList.add(SceneTargetPoint);
         }
         return SceneTargetPointList;