优化架次

liusuyi

2025-12-24 aab16956d5dbd3c29f5c7d398d39c2935ff154c9

优化架次

 ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTaskPart.java

@@ -3,6 +3,8 @@
import com.ard.common.core.domain.BaseEntity;
import lombok.*;

import java.util.Date;

@EqualsAndHashCode(callSuper = true)
@Data
@Builder
@@ -13,4 +15,7 @@
    private String boxSn;
    private Integer count;
    private byte[] dataPart;
    private Date startTime;
    private Date endTime;

}

 ard-work/src/main/java/com/ard/work/mapper/ArdFlightTaskPartMapper.java

@@ -13,14 +13,10 @@
public interface ArdFlightTaskPartMapper {

    /**
     * 根据 taskId 查询分片
     */
    List<ArdFlightTaskPart> selectByTaskId(int taskId);
    /**
     * 根据 boxSn 和航线开始结束时间查询分片
     * 根据开始结束时间查询分片
     * @return 对应时间段的分片列表
     */
    List<ArdFlightTaskPart> selectByTaskStartTime(ArdFlightTaskPart ardFlightTaskPart);
    List<ArdFlightTaskPart> selectByTimeRange(ArdFlightTaskPart ardFlightTaskPart);

    int insert(ArdFlightTaskPart entity);
}

 ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java

@@ -14,11 +14,13 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;

/**
 * 轨迹分片处理业务
 */
@@ -28,7 +30,8 @@
public class ArdFlightTaskPartServiceImpl implements IArdFlightTaskPartService {

    private final ArdFlightTaskPartMapper ardflightTaskPartMapper;

    // 上一次飞行状态缓存
    private final ConcurrentHashMap<String, Integer> lastFlightStatusMap = new ConcurrentHashMap<>();
    /**
     * 缓存：boxSn -> 当前分片数据
     */
@@ -60,12 +63,20 @@
                return; // 超过 3 秒没有新遥测 → 认为已离线或冻结，不记录
            }

            // 3️⃣ 飞行状态必须是飞行中
            if(uavState.getFlightControllerState().getFlightStatus()!=2)
            {
                return; // 飞行状态不是飞行中，不记录
            }
            int currentStatus = uavState.getFlightControllerState().getFlightStatus();
            Integer lastStatus = lastFlightStatusMap.get(boxSn);

            // 仅在“飞行中 → 非飞行中”状态变化时 flush
            if (lastStatus != null && lastStatus == 2 && currentStatus != 2) {
                flushRemaining(boxSn);
            }
            lastFlightStatusMap.put(boxSn, currentStatus);

            // 只有飞行中才添加缓存
            if (currentStatus == 2) {
                UavFlightStateDTO dto = new UavFlightStateDTO(uavState, telemetryData, dataTs);
                addTelemetryData(dto);
            }
            UavFlightStateDTO dto = new UavFlightStateDTO(
                    uavState,
                    telemetryData,
@@ -102,16 +113,17 @@

        try {
            byte[] blobData = SerializeUtil.serialize(dataList);

            // 取第一个和最后一个状态时间
            long startTs = dataList.get(0).getTimestamp();
            long endTs = dataList.get(dataList.size() - 1).getTimestamp();
            ArdFlightTaskPart part = ArdFlightTaskPart.builder()
                    .boxSn(boxSn)
                    .count(dataList.size())
                    .dataPart(blobData)
                    .startTime(new Date(startTs))
                    .endTime(new Date(endTs))
                    .build();
            // 使用 list 中第一条数据的时间作为 createTime
            long firstTimeMillis = dataList.get(0).getTimestamp();
            Date createTime = new Date(firstTimeMillis);
            part.setCreateTime(createTime);
            part.setCreateTime(new Date());
            ardflightTaskPartMapper.insert(part);

            log.info("设备 {} 分片保存 {} 条飞行数据到数据库成功", boxSn, dataList.size());
@@ -143,7 +155,7 @@
    public List<UavFlightStateDTO> getCompleteFlightData(ArdFlightTaskPart ardFlightTaskPart) {
        List<UavFlightStateDTO> allData = new ArrayList<>();
        String boxSn = ardFlightTaskPart.getBoxSn();
        List<ArdFlightTaskPart> parts = ardflightTaskPartMapper.selectByTaskStartTime(ardFlightTaskPart);
        List<ArdFlightTaskPart> parts = ardflightTaskPartMapper.selectByTimeRange(ardFlightTaskPart);
        for (ArdFlightTaskPart part : parts) {
            try {
                List<UavFlightStateDTO> partData = SerializeUtil.deserialize(part.getDataPart());

 ard-work/src/main/resources/mapper/ArdFlightTaskPartMapper.xml

@@ -8,24 +8,27 @@
    <!-- 插入一条分片数据 -->
    <insert id="insert" parameterType="ArdFlightTaskPart" useGeneratedKeys="true" keyProperty="id">
        INSERT INTO ard_flight_task_part
            (box_sn, count, data_part, create_time)
        VALUES
            (#{boxSn}, #{count}, #{dataPart}, #{createTime})
            (box_sn, count, data_part, start_time, end_time, create_time)
        VALUES (#{boxSn}, #{count}, #{dataPart}, #{startTime}, #{endTime}, #{createTime})
    </insert>
    <select id="selectByTaskStartTime" resultType="ArdFlightTaskPart">
    <select id="selectByTimeRange" resultType="ArdFlightTaskPart">
        SELECT *
        FROM ard_flight_task_part u
        <where>
            u.box_sn = #{boxSn}
            <!-- 动态参数中的开始时间 -->
            <if test="params.beginTime != null">
                AND u.create_time &gt;= #{params.beginTime}
                AND u.end_time &gt;= #{params.beginTime}  <!-- blob 内最后状态 >= 架次起飞 -->
            </if>
            <!-- 动态参数中的结束时间 -->
            <if test="params.endTime != null">
                AND u.create_time &lt;= #{params.endTime}
                AND u.start_time &lt;= #{params.endTime}  <!-- blob 内第一状态 <= 架次降落 -->
            </if>
        </where>
        ORDER BY u.create_time ASC
        ORDER BY u.start_time ASC
    </select>




</mapper>