Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java

@@ -83,6 +83,11 @@ public class Inspection extends BaseEntity {
      */
     private Integer airportId;
 
+    /**
+     * 巡检无人机id
+     */
+    private Integer droneId;
+
     /**
      * 巡检机场名称
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/accident/AccidentFlightRequest.java

@@ -29,6 +29,11 @@ public class AccidentFlightRequest {
      */
     private Integer airportId;
 
+    /**
+     * 巡检机场id
+     */
+    private Integer droneId;
+
     /**
      * 巡检机场名称
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspection/AddInspectionRequest.java

@@ -28,6 +28,11 @@ public class AddInspectionRequest {
      */
     private Integer airportId;
 
+    /**
+     * 巡检机场
+     */
+    private Integer droneId;
+
     /**
      * 巡检机场名称
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java

@@ -141,6 +141,7 @@ public class PointFlightService {
         inspection.setCreateTime(DateUtils.now());
         inspection.setAccidentTask(1);
         inspection.setIsLive(1);
+        inspection.setDroneId(request.getDroneId());
         int result = inspectionMapper.insert(inspection);
         if(result<=0){
             log.info("创建应急任务失败");

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/Inspection.java

@@ -79,6 +79,11 @@ public class Inspection extends BaseEntity {
      */
     private Integer airportId;
 
+    /**
+     * 巡检无人机id
+     */
+    private Integer droneId;
+
     /**
      * 巡检机场名称
      */