Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-28 b0da63410a7aaf64b11183c95b3da38013a6457b

 ard-work/src/main/java/com/ard/work/domain/dto/state/UavState.java

@@ -1,10 +1,7 @@
package com.ard.work.domain.dto.state;

import com.ard.work.util.CameraUtil;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;

import java.util.List;

@@ -12,6 +9,7 @@
@Builder
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode
public class UavState {

    private FlightControllerState flightControllerState;  // 飞控状态
@@ -22,16 +20,4 @@
    private String boxSn;                                 // 云盒编号
    private AvoidanceData avoidanceData;                  // 避障数据
    private List<HmsAlarmData> hmsAlarmData;              // HMS报警信息 (飞机告警信息)
    private Float FieldAngle;                             // 自动计算视场角

    /**
     * 计算并设置视场角
     */
    public void calculateFieldAngle() {
        if (cameraState != null) {
            this.FieldAngle = CameraUtil.getFieldAngleFromZoom(cameraState.getSource(), cameraState.getZoomfactor());
        } else {
            this.FieldAngle = null; // 如果 cameraState 为 null，则 FieldAngle 也为 null
        }
    }
}