根据机场id获取机场状态信息接口开发

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

@@ -5,6 +5,7 @@ import com.tuoheng.admin.entity.FlightData;
 
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author ChengWang
@@ -15,4 +16,5 @@ public interface FlightDataMapper extends BaseMapper<FlightData> {
     List<FlightData> selectListByInspectionId(String id);
 
 
+    List<FlightData> selectListByInspection(Map<String, Object> map);
 }

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

@@ -62,6 +62,11 @@ public class InspectionRequest implements Serializable {
      */
     private String ysingal;
 
+    /**
+     * 距离机场距离
+     */
+    private String distHome;
+
 
 
 }

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

@@ -47,6 +47,7 @@ public class QueryFlightDataTrackService {
         flightData.setUltrasonic(inspectionRequest.getAltitude());
         flightData.setSpeed(inspectionRequest.getHspeed());
         flightData.setYsingal(inspectionRequest.getYsingal());
+        flightData.setDistHome(inspectionRequest.getDistHome());
 
         //将最新一条数据放入缓存，并设置过期时间
         redisUtils.set(String.valueOf(inspection.getId()), flightData, 10);

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

@@ -1,18 +1,29 @@
 package com.tuoheng.admin.service.third.airport;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.tuoheng.admin.entity.FlightData;
 import com.tuoheng.admin.entity.Inspection;
 import com.tuoheng.admin.enums.MarkEnum;
 import com.tuoheng.admin.enums.TaskStatusEnum;
+import com.tuoheng.admin.mapper.FlightDataMapper;
 import com.tuoheng.admin.mapper.InspectionMapper;
 import com.tuoheng.admin.utils.CurrentUserUtil;
+import com.tuoheng.admin.vo.DroneDataVo;
 import com.tuoheng.common.core.exception.ServiceException;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author ChengWang
@@ -25,6 +36,9 @@ public class GetDroneDataByIdService {
     @Autowired
     private InspectionMapper inspectionMapper;
 
+    @Autowired
+    private FlightDataMapper flightDataMapper;
+
 
     public JsonResult getDroneDataById(Integer airportId) {
 
@@ -33,7 +47,8 @@ public class GetDroneDataByIdService {
         if(airportId ==null){
             throw new ServiceException("机场Id为空");
         }
-        String tenantId = CurrentUserUtil.getTenantId();
+        //String tenantId = CurrentUserUtil.getTenantId();
+        String tenantId = "0";
         if(StringUtils.isEmpty(tenantId)){
             throw new ServiceException("当前租户不存在");
         }
@@ -41,16 +56,33 @@ public class GetDroneDataByIdService {
         Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
                 .eq(Inspection::getTenantId, tenantId)
                 .eq(Inspection::getAirportId, airportId)
-                .eq(Inspection::getStatus, TaskStatusEnum.INFLIGHT.getCode())
-                .eq(Inspection::getMark, MarkEnum.VALID.getCode()));
+                .eq(Inspection::getStatus,10)
+                .eq(Inspection::getMark, 1));
         if (ObjectUtils.isNull(inspection)) {
             log.info("获取无人机数据信息，没有正在飞行的任务");
             throw new ServiceException("没有正在飞行的任务");
         }
-        //根据当前正在飞行的任务查询实时数据
-
-
+        //根据当前正在飞行的任务查询实时数据 flight_data表
+        Map<String,Object> map = new HashMap<>();
+        map.put("inspectionId",inspection.getId());
+        map.put("tenantId",tenantId);
+        List<FlightData> flightDataList = flightDataMapper.selectListByInspection(map);
+        if(CollectionUtils.isEmpty(flightDataList)){
+            log.info("获取无人机数据信息，数据为空");
+            JsonResult.success("数据为空");
+        }
+        List<DroneDataVo> droneDataVoList = new ArrayList<>();
+        for (FlightData flightData : flightDataList) {
+            DroneDataVo droneDataVo = new DroneDataVo();
+            droneDataVo.setInspectionId(flightData.getInspectionId());
+            droneDataVo.setUavPower(79 + "%");
+            droneDataVo.setRange("");
+            double dist = Integer.valueOf(flightData.getDistHome())/1000d;
+            droneDataVo.setTargetLocation(dist+ "km");
+            droneDataVo.setYsingal(flightData.getYsingal() + "%");
+            droneDataVoList.add(droneDataVo);
+        }
 
-        return null;
+        return JsonResult.success(droneDataVoList);
     }
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/DroneDataVo.java

@@ -0,0 +1,33 @@
+package com.tuoheng.admin.vo;
+
+import lombok.Data;
+
+@Data
+public class DroneDataVo {
+
+    /**
+     * 正在执飞的任务ID
+     */
+    private String inspectionId;
+
+    /**
+     * 无人机电量
+     */
+    private String UavPower;
+
+    /**
+     * 续航里程
+     */
+    private String range;
+
+    /**
+     * 目标位置
+     */
+    private String targetLocation;
+
+    /**
+     * 图传信号
+     */
+    private String ysingal;
+
+}

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

@@ -20,6 +20,9 @@
         <result column="velocity" jdbcType="VARCHAR" property="velocity" />
         <result column="timestamp" jdbcType="VARCHAR" property="timestamp" />
         <result column="is_srt" jdbcType="INTEGER" property="isSrt" />
+        <result column="dist_home" jdbcType="INTEGER" property="distHome" />
+        <result column="speed" jdbcType="INTEGER" property="speed" />
+        <result column="ysingal" jdbcType="INTEGER" property="ysingal" />
         <result column="create_user" jdbcType="VARCHAR" property="createUser" />
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
         <result column="update_user" jdbcType="VARCHAR" property="updateUser" />
@@ -29,7 +32,7 @@
 
     <sql id="Base_Column_List">
     id, tenant_id, inspection_id, box_sn, lng, lat, altitude, ultrasonic, pitch, roll, yaw, airspeed,
-    velocity, `timestamp`, is_srt, create_user, create_time, update_user, update_time, mark
+    velocity, `timestamp`, is_srt, dist_home, speed, ysingal, create_user, create_time, update_user, update_time, mark
     </sql>
 
     <select id="selectListByInspectionId" resultMap="BaseResultMap">
@@ -41,4 +44,14 @@
        order by timestamp asc
     </select>
 
+
+    <select id="selectListByInspection" parameterType="java.util.Map" resultMap="BaseResultMap">
+      select
+       <include refid="Base_Column_List"></include>
+       from th_flight_data
+       where inspection_id = #{inspectionId} and tenant_id = #{tenantId}
+       and mark = 1
+        order by create_time desc
+    </select>
+
 </mapper>