Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/domain/ThInspection.java

@@ -92,4 +92,8 @@ public class ThInspection extends BaseEntity implements Serializable {
      */
     private String ysingal;
 
+    /**
+     * 飞行模式
+     */
+    private String mode;
 }

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/request/InspectionRequest.java

@@ -1,12 +1,10 @@
 package com.tuoheng.admin.entity.request;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.io.Serializable;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 /**
  * @User qiujinyang
  * @Description
@@ -53,4 +51,7 @@ public class InspectionRequest implements Serializable {
 
     @ApiModelProperty(value = "遥测信号")
     private String ysingal;
+
+    @ApiModelProperty(value = "飞行模式")
+    private String mode;
 }

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/index/DroneDataVo.java

@@ -55,4 +55,8 @@ public class DroneDataVo {
      */
     private String ysingal;
 
+    /**
+     * 飞行模式
+     */
+    private String mode;
 }

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ThInspectionServiceImpl.java

@@ -115,6 +115,7 @@ public class ThInspectionServiceImpl extends BaseServiceImpl<ThInspectionMapper,
         ThMission mission = thMissions.get(0);
         inspection.setSpeed(inspectionRequest.getHspeed());
         inspection.setYsingal(inspectionRequest.getYsingal());
+        inspection.setMode(inspectionRequest.getMode());
         inspection.setMissionId(mission.getId());
         inspection.setTenantId(mission.getTenantId());
         inspectionMapper.insert(inspection);