Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_telecomumale into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/mapper/FlightDataHlMapper.java

@@ -12,6 +12,6 @@ import java.util.List;
  */
 public interface FlightDataHlMapper extends BaseMapper<FlightDataHl> {
 
-    List<FlightData> selectListByInspectionId(String id);
+    List<FlightDataHl> selectListByInspectionId(String id);
 
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightdata/query/QueryFindFlightDataService.java

@@ -1,12 +1,11 @@
 package com.tuoheng.admin.service.flightdata.query;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.tuoheng.admin.entity.FlightData;
+import com.tuoheng.admin.entity.FlightDataHl;
 import com.tuoheng.admin.entity.Inspection;
 import com.tuoheng.admin.enums.MarkEnum;
 import com.tuoheng.admin.enums.code.inspection.QueryInspectionInfoByIdCodeEnum;
 import com.tuoheng.admin.mapper.FlightDataHlMapper;
-import com.tuoheng.admin.mapper.FlightDataMapper;
 import com.tuoheng.admin.mapper.InspectionMapper;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.StringUtils;
@@ -43,7 +42,7 @@ public class QueryFindFlightDataService {
             id = inspection.getEmergencyDataInspectionId();
         }
         //根据任务id查询对应的云盒遥测数据
-        List<FlightData> listData = flightDataHlMapper.selectListByInspectionId(id);
-        return JsonResult.success(listData);
+        List<FlightDataHl> flightDataHls = flightDataHlMapper.selectListByInspectionId(id);
+        return JsonResult.success(flightDataHls);
     }
 }

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

@@ -8,10 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="tenantId"    column="tenant_id"    />
         <result property="inspectionId"    column="inspection_id"    />
-        <result property="recordId"    column="recordId"    />
-        <result property="attachRD"    column="attachRD"    />
-        <result property="uavId"    column="uavId"    />
-        <result property="uavNo"    column="uavNo"    />
+        <result property="recordId"    column="record_id"    />
+        <result property="attachRD"    column="attach_r_d"    />
+        <result property="uavId"    column="uav_id"    />
+        <result property="uavNo"    column="uav_no"    />
         <result property="time"    column="time"    />
         <result property="alt"    column="alt"    />
         <result property="lng"    column="lng"    />
@@ -26,41 +26,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fuel"    column="fuel"    />
         <result property="act"    column="act"    />
         <result property="mode"    column="mode"    />
-        <result property="flightMode"    column="flightMode"    />
+        <result property="flightMode"    column="flight_mode"    />
         <result property="arm"    column="arm"    />
         <result property="air"    column="air"    />
         <result property="absp"    column="absp"    />
         <result property="temp"    column="temp"    />
         <result property="tc"    column="tc"    />
-        <result property="velocityZ"    column="velocityZ"    />
-        <result property="remainingFlightTime"    column="remainingFlightTime"    />
-        <result property="moduleSignal"    column="moduleSignal"    />
+        <result property="velocityZ"    column="velocity_z"    />
+        <result property="remainingFlightTime"    column="remaining_flight_time"    />
+        <result property="moduleSignal"    column="module_signal"    />
         <result property="satellite"    column="satellite"    />
-        <result property="deptId"    column="deptId"    />
-        <result property="appConnected"    column="appConnected"    />
-        <result property="groundConnected"    column="groundConnected"    />
-        <result property="controlDevice"    column="controlDevice"    />
-        <result property="rcControlPosition"    column="rcControlPosition"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="appConnected"    column="app_connected"    />
+        <result property="groundConnected"    column="ground_connected"    />
+        <result property="controlDevice"    column="control_device"    />
+        <result property="rcControlPosition"    column="rc_control_position"    />
         <result property="gps"    column="gps"    />
-        <result property="ultrasonicHeight"    column="ultrasonicHeight"    />
-        <result property="altitudeFused"    column="altitudeFused"    />
-        <result property="latLonAltitude"    column="latLonAltitude"    />
-        <result property="homeLocation"    column="homeLocation"    />
+        <result property="ultrasonicHeight"    column="ultrasonic_height"    />
+        <result property="altitudeFused"    column="altitude_fused"    />
+        <result property="latLonAltitude"    column="lat_lon_altitude"    />
+        <result property="homeLocation"    column="home_location"    />
         <result property="duration"    column="duration"    />
-        <result property="battery1CapacityPercent"    column="battery1CapacityPercent"    />
-        <result property="battery1Voltage"    column="battery1Voltage"    />
-        <result property="battery1Temperature"    column="battery1Temperature"    />
-        <result property="battery1HeatState"    column="battery1HeatState"    />
-        <result property="battery2CapacityPercent"    column="battery2CapacityPercent"    />
-        <result property="battery2Voltage"    column="battery2Voltage"    />
-        <result property="battery2Temperature"    column="battery2Temperature"    />
-        <result property="battery2HeatState"    column="battery2HeatState"    />
-        <result property="gimbalPitch"    column="gimbalPitch"    />
-        <result property="gimbalYaw"    column="gimbalYaw"    />
-        <result property="gimbalRoll"    column="gimbalRoll"    />
-        <result property="zoomRatio"    column="zoomRatio"    />
-        <result property="focalLength"    column="focalLength"    />
-        <result property="videoStreamSource"    column="videoStreamSource"    />
+        <result property="battery1CapacityPercent"    column="battery1_capacity_percent"    />
+        <result property="battery1Voltage"    column="battery1_voltage"    />
+        <result property="battery1Temperature"    column="battery1_temperature"    />
+        <result property="battery1HeatState"    column="battery1_heat_state"    />
+        <result property="battery2CapacityPercent"    column="battery2_capacity_percent"    />
+        <result property="battery2Voltage"    column="battery2_voltage"    />
+        <result property="battery2Temperature"    column="battery2_temperature"    />
+        <result property="battery2HeatState"    column="battery2_heat_state"    />
+        <result property="gimbalPitch"    column="gimbal_pitch"    />
+        <result property="gimbalYaw"    column="gimbal_yaw"    />
+        <result property="gimbalRoll"    column="gimbal_roll"    />
+        <result property="zoomRatio"    column="zoom_ratio"    />
+        <result property="focalLength"    column="focal_length"    />
+        <result property="videoStreamSource"    column="video_stream_source"    />
         <result property="createUser"    column="create_user"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateUser"    column="update_user"    />
@@ -69,12 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, tenant_id, inspection_id, recordId, attachRD, uavId, uavNo, time, alt, lng, lat, spd, ht,
-head, pit, roll, bat, vol, fuel, act, mode, flightMode, arm, air, absp, temp, tc, velocityZ, remainingFlightTime,
-moduleSignal, satellite, deptId, appConnected, groundConnected, controlDevice, rcControlPosition, gps, ultrasonicHeight,
-altitudeFused, latLonAltitude, homeLocation, duration, battery1CapacityPercent, battery1Voltage, battery1Temperature,
-battery1HeatState, battery2CapacityPercent, battery2Voltage, battery2Temperature, battery2HeatState, gimbalPitch, gimbalYaw,
-gimbalRoll, zoomRatio, focalLength, videoStreamSource, create_user, create_time, update_user, update_time, mark
+        id, tenant_id, inspection_id, record_id, attach_r_d, uav_id, uav_no, time, alt, lng, lat, spd, ht,
+head, pit, roll, bat, vol, fuel, act, mode, flight_mode, arm, air, absp, temp, tc, velocity_z, remaining_flight_time,
+module_signal, satellite, deptId, app_connected, ground_connected, control_device, rc_control_position, gps, ultrasonic_height,
+altitude_fused, lat_lon_altitude, home_location, duration, battery1_capacity_percent, battery1_voltage, battery1_temperature,
+battery1_heat_state, battery2_capacity_percent, battery2_voltage, battery2_temperature, battery2_heat_state, gimbal_pitch, gimbal_yaw,
+gimbal_roll, zoom_ratio, focal_length, video_stream_source, create_user, create_time, update_user, update_time, mark
     </sql>
 
     <sql id="selectThFlightDataHlVo">