Merge branch 'feature_v1.0' into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/FlightDataHlController.java

+package com.tuoheng.admin.controller;
+
+import com.tuoheng.admin.service.flightDataHl.IFlightDataHlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author ChengWang
+ * @Date 2023/8/8
+ */
+@RestController
+@RequestMapping("/flightDataHl")
+public class FlightDataHlController {
+
+    @Autowired
+    private IFlightDataHlService iFlightDataHlService;
+}

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

+package com.tuoheng.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 飞行数据对象 th_flight_data_hl
+ * 
+ * @author ruoyi
+ * @date 2023-08-08
+ */
+@Data
+@Accessors(chain = true)
+@TableName("th_flight_data_hl")
+public class FlightDataHl {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    /**
+     * 巡检任务ID
+     */
+     private String inspectionId;
+
+     /**
+     * 飞行记录编号
+     */
+    private Long recordId;
+
+    /**
+     * 飞行计划编号
+     *
+     */
+    private Long attachRD;
+
+    /**
+     * 无人机ID
+     *
+     */
+    private Long uavId;
+
+    /**
+     * 无人机ID
+     */
+    private String uavNo;
+
+    /**
+     * 北京时间 精确到毫秒
+     */
+    private Long time;
+
+    /**
+     * 海拔高度 米
+     */
+    private String alt;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 地速 米/秒
+     */
+    private String spd;
+
+    /**
+     * 离地高度 实际为距离起飞点的相对高度
+     *
+     */
+    private String ht;
+
+    /**
+     * 真航向 单位：度，取值范围:[0,360]
+     *
+     */
+    private String head;
+
+    /**
+     * 俯仰角 单位: 度，取值范围:[-90,90]
+     */
+    private String pit;
+
+    /**
+     * 横滚角 单位：度，取值范围:[-90,90] 向左为正，向右为负
+     *
+     */
+    private String roll;
+
+    /**
+     * 电池容量 百分比
+     */
+    private String bat;
+
+    /**
+     * 电池电压 伏特
+     */
+    private String vol;
+
+    /**
+     * 燃油剩余量百分比,或燃油数量,升
+     */
+    private String fuel;
+
+    /**
+     * 活动类型 1 land-降落/ 2 track-轨迹记录
+     */
+    private Long act;
+
+    /**
+     * 飞行模式,READY: 准备起飞,TAKEOFF: 正在起飞,HOLD: 正在盘旋,MISSION:正在按航线飞行,RETURN_TO_LAUNCH:
+     * 返航    LAND：降落,OFFBOARD:外部接管中,FOLLOW_ME:跟随动态位置,UNKNOWN: 未知模式 0~8
+     */
+    private Long mode;
+
+    /**
+     * 飞行模式（天枢传输的模式）
+     */
+    private String flightMode;
+
+    /**
+     * 马达是否启动
+     */
+    private String arm;
+
+    /**
+     * 是否起飞到空中
+     */
+    private String air;
+
+    /**
+     * 当前绝对速度
+     */
+    private String absp;
+
+    /**
+     * 环境温度 摄氏度
+     */
+    private String temp;
+
+    /**
+     * 当前故障码
+     */
+    private String tc;
+
+    /**
+     * 垂直速度
+     */
+    private String velocityZ;
+
+    /**
+     * 剩余飞行时间
+     */
+    private String remainingFlightTime;
+
+    /**
+     * 信号质量 4G_ 5G_
+     */
+    private String moduleSignal;
+
+    /**
+     * 卫星数量
+     */
+    private String satellite;
+
+    /**
+     * 查询用(提供外部接口)
+     */
+    private Long deptId;
+
+    /**
+     * polit是否打开
+     */
+    private String appConnected;
+
+    /**
+     * 遥控器是否连接
+     */
+    private String groundConnected;
+
+    /**
+     * 飞机控制权
+     */
+    private String controlDevice;
+
+    /**
+     * 遥控器档位
+     */
+    private String rcControlPosition;
+
+    /**
+     * gps信号等级
+     */
+    private String gps;
+
+    /**
+     * 下视激光测距
+     */
+    private String ultrasonicHeight;
+
+    /**
+     * 混合气压计海拔高度
+     */
+    private String altitudeFused;
+
+    /**
+     * gps混合84椭球高程
+     */
+    private String latLonAltitude;
+
+    /**
+     * home点经纬度
+     */
+    private String homeLocation;
+
+    /**
+     * 电池电量
+     */
+    private String duration;
+
+    /**
+     * 1号电池电量
+     */
+    private String battery1CapacityPercent;
+
+    /**
+     * 1号电池电压
+     */
+    private String battery1Voltage;
+
+    /**
+     * 1号电池温度
+     */
+    private String battery1Temperature;
+
+    /**
+     * 1号电池加热
+     */
+    private String battery1HeatState;
+
+    /**
+     * 2号电池电量
+     */
+    private String battery2CapacityPercent;
+
+    /**
+     * 2号电池电压
+     */
+    private String battery2Voltage;
+
+    /**
+     * 2号电池温度
+     */
+    private String battery2Temperature;
+
+    /**
+     * 2号电池加热
+     */
+    private String battery2HeatState;
+
+    /**
+     * 云台俯仰
+     */
+    private String gimbalPitch;
+
+    /**
+     * 云台偏航
+     */
+    private String gimbalYaw;
+
+    /**
+     * 云台横滚
+     */
+    private String gimbalRoll;
+
+    /**
+     * 焦距倍数
+     */
+    private String zoomRatio;
+
+    /**
+     * 变焦镜头焦距
+     */
+    private String focalLength;
+
+    /**
+     * 视频源（广角/变焦/红外）
+     */
+    private String videoStreamSource;
+
+    /**
+     * 添加人
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 有效标识
+     */
+    private Integer mark;
+
+
+
+
+}

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

+package com.tuoheng.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tuoheng.admin.entity.FlightDataHl;
+
+/**
+ * @Author ChengWang
+ * @Date 2023/8/8
+ */
+public interface FlightDataHlMapper extends BaseMapper<FlightDataHl> {
+
+}

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightDataHl/FlightDataHlServiceImpl.java

+package com.tuoheng.admin.service.flightDataHl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author ChengWang
+ * @Date 2023/8/8
+ */
+@Service
+@Slf4j
+public class FlightDataHlServiceImpl implements IFlightDataHlService {
+}

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightDataHl/IFlightDataHlService.java

+package com.tuoheng.admin.service.flightDataHl;
+
+/**
+ * @Author ChengWang
+ * @Date 2023/8/8
+ */
+public interface IFlightDataHlService {
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tuoheng.admin.mapper.FlightDataHlMapper">
+
+    <resultMap id="BaseResultMap" type="com.tuoheng.admin.entity.FlightDataHl">
+        <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="time"    column="time"    />
+        <result property="alt"    column="alt"    />
+        <result property="lng"    column="lng"    />
+        <result property="lat"    column="lat"    />
+        <result property="spd"    column="spd"    />
+        <result property="ht"    column="ht"    />
+        <result property="head"    column="head"    />
+        <result property="pit"    column="pit"    />
+        <result property="roll"    column="roll"    />
+        <result property="bat"    column="bat"    />
+        <result property="vol"    column="vol"    />
+        <result property="fuel"    column="fuel"    />
+        <result property="act"    column="act"    />
+        <result property="mode"    column="mode"    />
+        <result property="flightMode"    column="flightMode"    />
+        <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="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="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="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="createUser"    column="create_user"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="mark"    column="mark"    />
+    </resultMap>
+
+    <sql id="selectThFlightDataHlVo">
+        select 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 from th_flight_data_hl
+    </sql>
+
+</mapper>