优化打点

liusuyi

2024-11-18 433cf58fbca44f897a70d1a455eb17c6a6d3bc3c

 ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java

@@ -14,9 +14,9 @@
import com.ard.tianyu.model.dto.control.AbsAngleControlDTO;
import com.ard.tianyu.model.dto.control.AngleControlDTO;
import com.ard.tianyu.model.dto.control.SpeedControlDTO;
import com.ard.tianyu.model.dto.converter.UavSignalInfoConverter;
import com.ard.tianyu.model.dto.converter.UavStateConverter;
import com.ard.tianyu.model.dto.converter.UavTelemetryDataConverter;
import com.ard.tianyu.model.dto.converter.realdata.UavSignalInfoConverter;
import com.ard.tianyu.model.dto.converter.realdata.UavStateConverter;
import com.ard.tianyu.model.dto.converter.realdata.UavTelemetryDataConverter;
import com.ard.tianyu.model.dto.converter.wayline.PlanLineDataConverter;
import com.ard.tianyu.model.dto.manual.*;
import com.ard.tianyu.model.dto.settings.ReturnHeightSettingDTO;
@@ -58,10 +58,7 @@
import javax.annotation.Resource;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

/**
 * TyServiceImpl
@@ -79,8 +76,6 @@
    @Resource
    private TyConfiguration tyConfiguration;

    // 存储每个无人机的最后遥测处理时间
    private Map<String, Long> lastTelemetryTimes = new ConcurrentHashMap<>();

    /**
     * 获取天宇token信息
@@ -601,42 +596,23 @@
            case (byte) 0xA8:
                // 处理无人机状态消息
                UavStateCmd uavStateCmd = (UavStateCmd) tyCommand;
                UavState uavState = UavStateConverter.convertProtoToEntity(uavStateCmd.getUavState());
                UavStateCache.putUavState(uavState);
                logPrint("无人机状态", uavState.getBoxSn());
                WebSocketUtil.sendMessageAll(uavState);
                UavStateCache.putUavState(uavStateCmd.getUavState());
                logPrint("无人机状态", uavStateCmd.getUavState().getBoxSn());
                WebSocketUtil.sendMessageAll(uavStateCmd.getUavState());
                break;
            case (byte) 0xA9:
                // 处理无人机遥测消息
                UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
                if (uavTelemetryDataCmd.getBoxSn() == null) {
                    return;
                }
                String boxSn = ByteUtils.bytesToString(uavTelemetryDataCmd.getBoxSn()); // 假设有获取无人机ID的方法
                long currentTime = System.currentTimeMillis();

                // 获取无人机的最后处理时间，如果没有则设置为0
                long lastTelemetryTime = lastTelemetryTimes.getOrDefault(boxSn, 0L);

                // 检查与上次处理时间的间隔
                if (currentTime - lastTelemetryTime >= 1000) { // 1秒
                    TelemetryData telemetryData = UavTelemetryDataConverter.convertProtoToEntity(uavTelemetryDataCmd.getTelemetryData());
                    UavTelemetryDataCache.putUavTelemetryData(telemetryData);
                    logPrint("无人机遥测", telemetryData.getBoxSn());

                    // 更新最后处理时间
                    lastTelemetryTimes.put(boxSn, currentTime);
                } else {
                    log.debug("无人机 " + boxSn + " 遥测数据接收过于频繁，已跳过处理");
                }
                UavTelemetryDataCache.putUavTelemetryData(uavTelemetryDataCmd.getTelemetryData());
                logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
                WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());
                break;

            case (byte) 0x0C:
                // 处理无人机信道质量数据
                SignalInfoCmd signalInfoCmd = (SignalInfoCmd) tyCommand;
                SignalInfo signalInfo = UavSignalInfoConverter.convertProtoToEntity(signalInfoCmd.getSignalInfo());
                UavSignalInfoCache.putUavSignalInfoCache(signalInfo);
                logPrint("无人机信道质量", signalInfo.getBoxSn());
                UavSignalInfoCache.putUavSignalInfoCache(signalInfoCmd.getSignalInfo());
                logPrint("无人机信道质量", signalInfoCmd.getSignalInfo().getBoxSn());
                break;
            case (byte) 0xD1:
                // 处理无人机