Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionVo.java

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

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inspectionType"    column="inspection_type"    />
         <result property="airportId"    column="airport_id"    />
         <result property="airportName"    column="airport_name"    />
+        <result property="droneId"    column="drone_id"    />
         <result property="inspectionLine"    column="inspection_line"    />
         <result property="inspectionLineName"    column="inspection_line_name"    />
         <result property="equipmentId"    column="equipment_id"    />
@@ -64,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="Base_Column_list">
         id, tenant_id, dept_id, code, name, type, road_id, road_name, section_id, section_name, inspection_type,
-        airport_id, airport_name, inspection_line, inspection_line_name, equipment_id, equipment_name, equipment_mount_id,
+        airport_id, drone_id, airport_name, inspection_line, inspection_line_name, equipment_id, equipment_name, equipment_mount_id,
         equipment_mount_name, cloud_box_id, cloud_box_name, box_sn, flight_hand, flight_hand_name, inspection_time,
         execution_start_time, execution_end_time, is_live, is_taken, is_tilt, video_url, ai_video_url, report_url, srt_url,
         status, analyse_status, progressbar, note, weather, fly_height, srt_name, heartbeat_time, execution_status,
@@ -74,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectInspectionVo">
         select id, tenant_id, dept_id, code, name, type, road_id, road_name, section_id, section_name, inspection_type,
-        airport_id, airport_name, inspection_line, inspection_line_name, equipment_id, equipment_name, equipment_mount_id,
+        airport_id, drone_id, airport_name, inspection_line, inspection_line_name, equipment_id, equipment_name, equipment_mount_id,
         equipment_mount_name, cloud_box_id, cloud_box_name, box_sn, flight_hand, flight_hand_name, inspection_time,
         execution_start_time, execution_end_time, is_live, is_taken, is_tilt, video_url, ai_video_url, report_url, srt_url,
         status, analyse_status, progressbar, note, weather, fly_height, srt_name, heartbeat_time, execution_status,
@@ -155,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sectionName != null">section_name = #{sectionName},</if>
             <if test="inspectionType != null">inspection_type = #{inspectionType},</if>
             <if test="airportId != null">airport_id = #{airportId},</if>
+            <if test="droneId != null">drone_id = #{droneId},</if>
             <if test="airportName != null">airport_name = #{airportName},</if>
             <if test="inspectionLine != null">inspection_line = #{inspectionLine},</if>
             <if test="inspectionLineName != null">inspection_line_name = #{inspectionLineName},</if>
@@ -287,6 +289,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="airportId != null">
                 airport_id = #{airportId},
             </if>
+            <if test="droneId != null">
+                drone_id = #{droneId},
+            </if>
             <if test="airportName != null">
                 airport_name = #{airportName},
             </if>