优化结构

liusuyi

2025-03-20 8773c724919714845d4426a54d7b5aab8a9c0cae

优化结构

 ard-work/src/main/java/com/ard/tianyu/aspect/UavControlAspect.java

@@ -7,7 +7,7 @@
import com.ard.tianyu.domain.cache.UavTelemetryDataCache;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.service.control.UavControlService;
import com.ard.tianyu.websocket.domain.UavControlType;
import com.ard.tianyu.domain.message.UavControlType;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;

 ard-work/src/main/java/com/ard/tianyu/aspect/annotation/CheckControlRight.java

@@ -1,6 +1,6 @@
package com.ard.tianyu.aspect.annotation;

import com.ard.tianyu.websocket.domain.UavControlType;
import com.ard.tianyu.domain.message.UavControlType;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

 ard-work/src/main/java/com/ard/tianyu/component/forest/TokenInterceptor.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/forest/TokenInterceptor.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.forest;
package com.ard.tianyu.component.forest;

import com.ard.tianyu.config.TyConfiguration;
import com.ard.tianyu.domain.receiver.AccessTokenReceiver;

 ard-work/src/main/java/com/ard/tianyu/component/forest/TyClient.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/forest/TyClient.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.forest;
package com.ard.tianyu.component.forest;

import com.ard.tianyu.domain.dto.BoxHistoryDTO;
import com.ard.tianyu.domain.dto.BoxPhotosDTO;

 ard-work/src/main/java/com/ard/tianyu/component/forest/TyConst.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/forest/TyConst.java
@@ -1,8 +1,7 @@
package com.ard.tianyu.forest;
package com.ard.tianyu.component.forest;

public class TyConst {
    public static final String POST_TOKEN = "/eapi/auth/getToken";

    public static final String GET_BOX_LIST = "/eapi/box/list";
    public static final String POST_BOX_HISTORY = "/eapi/box/history";
    public static final String POST_BOX_UPDATE = "/eapi/box/update";

 ard-work/src/main/java/com/ard/tianyu/component/netty/TyBoxSession.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/TyBoxSession.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.netty;
package com.ard.tianyu.component.netty;

import io.netty.channel.ChannelFuture;
import lombok.AllArgsConstructor;

 ard-work/src/main/java/com/ard/tianyu/component/netty/TyNettyTcpClient.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/TyNettyTcpClient.java
@@ -1,10 +1,10 @@
package com.ard.tianyu.netty;
package com.ard.tianyu.component.netty;

import com.ard.tianyu.config.TyConfiguration;
import com.ard.tianyu.domain.cache.TyTcpServerCache;
import com.ard.tianyu.netty.handler.ClientHandler;
import com.ard.tianyu.netty.handler.MessageProtocolDecoder;
import com.ard.tianyu.netty.handler.MessageProtocolEncoder;
import com.ard.tianyu.component.netty.handler.ClientHandler;
import com.ard.tianyu.component.netty.handler.MessageProtocolDecoder;
import com.ard.tianyu.component.netty.handler.MessageProtocolEncoder;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/BaseCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/BaseCmd.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.netty.command;
package com.ard.tianyu.component.netty.command;

import io.netty.buffer.ByteBuf;
import lombok.Data;

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/CameraModeCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/CameraModeCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.CameraModeDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/CameraModeReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/CameraModeReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/CapturePicCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/CapturePicCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.CapturePicDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/CapturePicReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/CapturePicReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/PhotoReturnToggleCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/PhotoReturnToggleCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.PhotoReturnToggleDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/PicUploadCompletedReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/PicUploadCompletedReplyCmd.java
@@ -1,10 +1,9 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;

import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/RecordStartCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/RecordStartCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.RecordDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/RecordStartReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/RecordStartReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/RecordStopCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/RecordStopCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.RecordDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/RecordStopReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/RecordStopReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/SwitchCameraCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/SwitchCameraCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.SwitchCameraDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/SwitchSourceCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/SwitchSourceCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.SwitchSourceDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/ZoomCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/ZoomCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.ZoomDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/camera/ZoomToLevelCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/camera/ZoomToLevelCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.camera;
package com.ard.tianyu.component.netty.command.camera;

import com.ard.tianyu.domain.dto.camera.ZoomToLevelDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/control/AbsAngleControlCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/control/AbsAngleControlCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.control;
package com.ard.tianyu.component.netty.command.control;

import com.ard.tianyu.domain.dto.control.AbsAngleControlDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/control/AngleControlCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/control/AngleControlCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.control;
package com.ard.tianyu.component.netty.command.control;

import com.ard.tianyu.domain.dto.control.AngleControlDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/control/SpeedControlCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/control/SpeedControlCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.control;
package com.ard.tianyu.component.netty.command.control;

import com.ard.tianyu.domain.dto.control.SpeedControlDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/EmergencyBrakeCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/EmergencyBrakeCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.EmeragencyBrakeDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/EmergencyBrakeReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/EmergencyBrakeReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/FlyControlCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/FlyControlCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.FlyControlDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/FlyPointControlCancelCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/FlyPointControlCancelCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.FlyPointControlCancelDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/FlyPointControlCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/FlyPointControlCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.FlyPointControlDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/LandCancelCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/LandCancelCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.LandCancelDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/LandCancelReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/LandCancelReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/LandCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/LandCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.LandDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/LandForcedCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/LandForcedCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.LandForcedDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/LandForcedReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/LandForcedReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/LandReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/LandReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/PointControlReachedReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/PointControlReachedReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/ReturnHomeCancelCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/ReturnHomeCancelCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.ReturnHomeCancelDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/ReturnHomeCancelReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/ReturnHomeCancelReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/ReturnHomeCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/ReturnHomeCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.ReturnHomeDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/ReturnHomeReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/ReturnHomeReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/SwitchUavControlCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/SwitchUavControlCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.SwitchUavControlDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/TakeOffCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/TakeOffCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.domain.dto.manual.TakeOffDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/manual/TakeOffReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/manual/TakeOffReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.manual;
package com.ard.tianyu.component.netty.command.manual;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/notice/BoxPowerStatusReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/notice/BoxPowerStatusReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.notice;
package com.ard.tianyu.component.netty.command.notice;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/notice/FlyWayEndReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/notice/FlyWayEndReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.notice;
package com.ard.tianyu.component.netty.command.notice;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/notice/UavReadyReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/notice/UavReadyReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.notice;
package com.ard.tianyu.component.netty.command.notice;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/real/SignalInfoCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/real/SignalInfoCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.real;
package com.ard.tianyu.component.netty.command.real;

import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/real/UavStateCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/real/UavStateCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.real;
package com.ard.tianyu.component.netty.command.real;

import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/real/UavTelemetryDataCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/real/UavTelemetryDataCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.real;
package com.ard.tianyu.component.netty.command.real;

import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/register/HeartbeatCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/register/HeartbeatCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.register;
package com.ard.tianyu.component.netty.command.register;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/register/HeartbeatReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/register/HeartbeatReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.register;
package com.ard.tianyu.component.netty.command.register;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;
import lombok.NoArgsConstructor;

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/register/RegisterCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/register/RegisterCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.register;// RegisterMessage.java
package com.ard.tianyu.component.netty.command.register;// RegisterMessage.java

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/register/RegisterReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/register/RegisterReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.register;// RegisterMessage.java
package com.ard.tianyu.component.netty.command.register;// RegisterMessage.java

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/register/UavInitInfoCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/register/UavInitInfoCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.register;
package com.ard.tianyu.component.netty.command.register;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/register/UavInitReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/register/UavInitReplyCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.register;
package com.ard.tianyu.component.netty.command.register;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/settings/ReturnHeightSettingCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/settings/ReturnHeightSettingCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.settings;
package com.ard.tianyu.component.netty.command.settings;

import com.ard.tianyu.domain.dto.settings.ReturnHeightSettingDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/settings/ReturnHeightSettingReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/settings/ReturnHeightSettingReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.settings;
package com.ard.tianyu.component.netty.command.settings;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/settings/ReturnPointSettingCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/settings/ReturnPointSettingCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.settings;
package com.ard.tianyu.component.netty.command.settings;

import com.ard.tianyu.domain.dto.settings.ReturnPointSettingDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/settings/ReturnPointSettingReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/settings/ReturnPointSettingReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.settings;
package com.ard.tianyu.component.netty.command.settings;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/settings/VideoStreamSettingCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/settings/VideoStreamSettingCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.settings;
package com.ard.tianyu.component.netty.command.settings;

import com.ard.tianyu.domain.dto.settings.VideoStreamSettingDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/settings/VideoStreamSettingReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/settings/VideoStreamSettingReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.settings;
package com.ard.tianyu.component.netty.command.settings;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/LoopSettingCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/LoopSettingCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.LoopSettingDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/RealSpeakCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/RealSpeakCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.RealSpeakDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/RecordSpeakCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/RecordSpeakCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.RecordSpeakDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/SpeakModeSwitchCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/SpeakModeSwitchCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.SpeakModeSwitchDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/StopSpeakCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/StopSpeakCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.StopSpeakDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/TextSpeakCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/TextSpeakCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.TextSpeakDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/speaker/VolumeSettingCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/speaker/VolumeSettingCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.speaker;
package com.ard.tianyu.component.netty.command.speaker;

import com.ard.tianyu.domain.dto.speaker.VolumeSettingDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineBeginCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineBeginCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.domain.dto.wayline.WayLineBeginDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineBeginReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineBeginReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineEndCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineEndCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.domain.dto.wayline.WayLineEndDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineEndReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineEndReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLinePauseCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLinePauseCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.domain.dto.wayline.WayLinePauseDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLinePauseReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLinePauseReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineResumeCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineResumeCmd.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.domain.dto.wayline.WayLineResumeDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineResumeReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineResumeReplyCmd.java
@@ -1,8 +1,7 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Builder;
import lombok.Data;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineUploadCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineUploadCmd.java
@@ -1,10 +1,10 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.domain.dto.converter.wayline.PlanLineDataConverter;
import com.ard.tianyu.domain.dto.wayline.PlanLineData;
import com.ard.tianyu.domain.dto.wayline.WayLineUploadDTO;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import io.netty.buffer.ByteBuf;

/**

 ard-work/src/main/java/com/ard/tianyu/component/netty/command/wayline/WayLineUploadReplyCmd.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/command/wayline/WayLineUploadReplyCmd.java
@@ -1,6 +1,6 @@
package com.ard.tianyu.netty.command.wayline;
package com.ard.tianyu.component.netty.command.wayline;

import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import lombok.Data;


 ard-work/src/main/java/com/ard/tianyu/component/netty/handler/ClientHandler.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/handler/ClientHandler.java
@@ -1,8 +1,8 @@
package com.ard.tianyu.netty.handler;
package com.ard.tianyu.component.netty.handler;

import com.ard.tianyu.domain.cache.TyTcpServerCache;
import com.ard.tianyu.netty.TyNettyTcpClient;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.TyNettyTcpClient;
import com.ard.tianyu.component.netty.command.BaseCmd;
import com.ard.tianyu.service.ITyService;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;

 ard-work/src/main/java/com/ard/tianyu/component/netty/handler/ErrorCodeEnum.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/handler/ErrorCodeEnum.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.netty.handler;
package com.ard.tianyu.component.netty.handler;


import com.ard.common.utils.StringUtils;

 ard-work/src/main/java/com/ard/tianyu/component/netty/handler/MessageProtocolDecoder.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java
@@ -1,32 +1,32 @@
package com.ard.tianyu.netty.handler;// MessageProtocolDecoder.java
package com.ard.tianyu.component.netty.handler;// MessageProtocolDecoder.java

import com.ard.common.utils.ByteUtils;
import com.ard.tianyu.component.netty.command.manual.*;
import com.ard.tianyu.component.netty.command.wayline.*;
import com.ard.tianyu.domain.dto.converter.realdata.UavSignalInfoConverter;
import com.ard.tianyu.domain.dto.converter.realdata.UavStateConverter;
import com.ard.tianyu.domain.dto.converter.realdata.UavTelemetryDataConverter;
import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.netty.command.camera.CameraModeReplyCmd;
import com.ard.tianyu.netty.command.camera.CapturePicReplyCmd;
import com.ard.tianyu.netty.command.camera.RecordStartReplyCmd;
import com.ard.tianyu.netty.command.camera.RecordStopReplyCmd;
import com.ard.tianyu.netty.command.manual.*;
import com.ard.tianyu.netty.command.notice.BoxPowerStatusReplyCmd;
import com.ard.tianyu.netty.command.notice.FlyWayEndReplyCmd;
import com.ard.tianyu.netty.command.camera.PicUploadCompletedReplyCmd;
import com.ard.tianyu.netty.command.notice.UavReadyReplyCmd;
import com.ard.tianyu.netty.command.real.SignalInfoCmd;
import com.ard.tianyu.netty.command.real.UavStateCmd;
import com.ard.tianyu.netty.command.real.UavTelemetryDataCmd;
import com.ard.tianyu.netty.command.register.HeartbeatReplyCmd;
import com.ard.tianyu.netty.command.register.RegisterReplyCmd;
import com.ard.tianyu.netty.command.settings.ReturnHeightSettingReplyCmd;
import com.ard.tianyu.netty.command.settings.ReturnPointSettingReplyCmd;
import com.ard.tianyu.netty.command.settings.VideoStreamSettingReplyCmd;
import com.ard.tianyu.netty.command.wayline.*;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.camera.CameraModeReplyCmd;
import com.ard.tianyu.component.netty.command.camera.CapturePicReplyCmd;
import com.ard.tianyu.component.netty.command.camera.RecordStartReplyCmd;
import com.ard.tianyu.component.netty.command.camera.RecordStopReplyCmd;
import com.ard.tianyu.component.netty.command.notice.BoxPowerStatusReplyCmd;
import com.ard.tianyu.component.netty.command.notice.FlyWayEndReplyCmd;
import com.ard.tianyu.component.netty.command.camera.PicUploadCompletedReplyCmd;
import com.ard.tianyu.component.netty.command.notice.UavReadyReplyCmd;
import com.ard.tianyu.component.netty.command.real.SignalInfoCmd;
import com.ard.tianyu.component.netty.command.real.UavStateCmd;
import com.ard.tianyu.component.netty.command.real.UavTelemetryDataCmd;
import com.ard.tianyu.component.netty.command.register.HeartbeatReplyCmd;
import com.ard.tianyu.component.netty.command.register.RegisterReplyCmd;
import com.ard.tianyu.component.netty.command.settings.ReturnHeightSettingReplyCmd;
import com.ard.tianyu.component.netty.command.settings.ReturnPointSettingReplyCmd;
import com.ard.tianyu.component.netty.command.settings.VideoStreamSettingReplyCmd;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;

 ard-work/src/main/java/com/ard/tianyu/component/netty/handler/MessageProtocolEncoder.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolEncoder.java
@@ -1,7 +1,7 @@
package com.ard.tianyu.netty.handler;// MessageProtocolEncoder.java
package com.ard.tianyu.component.netty.handler;// MessageProtocolEncoder.java

import com.ard.common.utils.ByteUtils;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;

 ard-work/src/main/java/com/ard/tianyu/component/netty/protobuf/TelemetryDataBuf.proto

 ard-work/src/main/java/com/ard/tianyu/component/netty/protobuf/TelemetryDataPB.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/netty/protobuf/TelemetryDataPB.java
Diff too large

 ard-work/src/main/java/com/ard/tianyu/component/websocket/WebSocketSessionManager.java

New file
@@ -0,0 +1,31 @@
package com.ard.tianyu.component.websocket;

import com.ard.tianyu.component.websocket.utils.WebSocketUtil;
import org.springframework.web.socket.WebSocketSession;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

public class WebSocketSessionManager {
    private static final ConcurrentMap<Long, WebSocketSession> ONLINE_USER_SESSIONS = new ConcurrentHashMap<>();

    public static void addSession(Long userId, WebSocketSession session) {
        ONLINE_USER_SESSIONS.put(userId, session);
    }

    public static void removeSession(Long userId) {
        ONLINE_USER_SESSIONS.remove(userId);
    }

    public static WebSocketSession getSession(Long userId) {
        return ONLINE_USER_SESSIONS.get(userId);
    }

    public static void broadcast(String message) {
        ONLINE_USER_SESSIONS.forEach((userId, session) -> WebSocketUtil.sendMessage(session, message));
    }

    //返回当前在线用户数
    public static int getOnlineUserCount() {
        return ONLINE_USER_SESSIONS.size();
    }
}

 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/BaseSubscriptionManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/BaseSubscriptionManager.java
@@ -1,8 +1,8 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.alibaba.fastjson2.JSON;
import com.ard.tianyu.websocket.domain.BaseMessage;
import com.ard.tianyu.websocket.utils.WebSocketUtil;
import com.ard.tianyu.domain.message.BaseMessage;
import com.ard.tianyu.component.websocket.utils.WebSocketUtil;
import lombok.extern.slf4j.Slf4j;

import java.util.HashSet;

 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/TyMessageHandler.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyMessageHandler.java
@@ -1,17 +1,17 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.TypeReference;
import com.ard.tianyu.component.websocket.WebSocketSessionManager;
import com.ard.tianyu.domain.message.*;
import com.ard.tianyu.service.control.UavControlService;
import com.ard.tianyu.websocket.domain.*;
import com.ard.tianyu.websocket.utils.WebSocketUtil;
import com.ard.tianyu.component.websocket.utils.WebSocketUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.handler.TextWebSocketHandler;

import javax.annotation.Resource;


@@ -39,7 +39,7 @@
        Long userId = Long.parseLong(userIdStr);
        String payload = message.getPayload();
        log.info("【cmd】Received message: {}", payload);
        log.info("【cmd】size: {}", WebSocketUtil.ONLINE_USER_SESSIONS.size());
        log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());

        BaseMessage<?> baseMessage = JSON.parseObject(payload, BaseMessage.class);
        switch (baseMessage.getType()) {
@@ -243,8 +243,8 @@
        log.info("【cmd】Connected: {}", session.getId());
        String userIdStr = (String) session.getAttributes().get("userId");
        Long userId = Long.parseLong(userIdStr);
        WebSocketUtil.ONLINE_USER_SESSIONS.put(userId, session);
        log.info("【cmd】size: {}", WebSocketUtil.ONLINE_USER_SESSIONS.size());
        WebSocketSessionManager.addSession(userId, session);
        log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
    }

    @Override
@@ -252,8 +252,8 @@
        log.info("【cmd】Disconnected: {}", session.getId());
        String userIdStr = (String) session.getAttributes().get("userId");
        Long userId = Long.parseLong(userIdStr);
        WebSocketUtil.ONLINE_USER_SESSIONS.remove(userId);
        log.info("【cmd】size: {}", WebSocketUtil.ONLINE_USER_SESSIONS.size());
        WebSocketSessionManager.removeSession(userId);
        log.info("【cmd】size: {}", WebSocketSessionManager.getOnlineUserCount());
        // 停止用户的所有流
        uavStreamManager.stopAllPullStreamByUser(userId);
        if (userId != null) {

 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavAllManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavAllManager.java
@@ -1,14 +1,12 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.ard.tianyu.domain.cache.UavSignalInfoCache;
import com.ard.tianyu.domain.cache.UavStateCache;
import com.ard.tianyu.domain.cache.UavTelemetryDataCache;
import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.domain.dto.state.CameraState;
import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.service.control.UavControlService;
import com.ard.tianyu.util.CameraUtil;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
@@ -25,7 +23,9 @@
    protected Map<String,Object> getData(String boxSn) {
        Map<String,Object> map=new HashMap<>();
        UavState uavState = UavStateCache.getUavState(boxSn);
        uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
        if (uavState != null) {
            uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
        }
        map.put("state", uavState);
        TelemetryData uavTelemetryData = UavTelemetryDataCache.getUavTelemetryData(boxSn);
        map.put("telemetry", uavTelemetryData);

 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavControlManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavControlManager.java
@@ -1,10 +1,10 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.alibaba.fastjson2.JSON;
import com.ard.tianyu.service.control.UavControlService;
import com.ard.tianyu.websocket.domain.BaseMessage;
import com.ard.tianyu.websocket.domain.UavControlMessage;
import com.ard.tianyu.websocket.utils.WebSocketUtil;
import com.ard.tianyu.domain.message.BaseMessage;
import com.ard.tianyu.domain.message.UavControlMessage;
import com.ard.tianyu.component.websocket.utils.WebSocketUtil;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavSignalManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavSignalManager.java
@@ -1,9 +1,7 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.ard.tianyu.domain.cache.UavSignalInfoCache;
import com.ard.tianyu.domain.cache.UavStateCache;
import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.domain.dto.state.UavState;
import org.springframework.stereotype.Component;



 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavStateManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavStateManager.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.ard.tianyu.domain.cache.UavStateCache;
import com.ard.tianyu.domain.dto.state.UavState;
@@ -11,7 +11,9 @@
    @Override
    protected UavState getData(String boxSn) {
        UavState uavState = UavStateCache.getUavState(boxSn);
        uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
        if (uavState != null) {
            uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
        }
        return uavState;
    }


 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavStreamManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavStreamManager.java
@@ -1,11 +1,10 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.alibaba.fastjson2.JSON;
import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.domain.receiver.BoxStreamUrlReceiver;
import com.ard.tianyu.service.ITyService;
import com.ard.tianyu.websocket.domain.BaseMessage;
import com.ard.tianyu.websocket.utils.WebSocketUtil;
import com.ard.tianyu.domain.message.BaseMessage;
import com.ard.tianyu.component.websocket.utils.WebSocketUtil;
import com.ard.vtdu.domain.ArdVtdu;
import com.ard.vtdu.service.IMediaService;
import lombok.extern.slf4j.Slf4j;

 ard-work/src/main/java/com/ard/tianyu/component/websocket/handler/UavTelemetryManager.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavTelemetryManager.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.handler;
package com.ard.tianyu.component.websocket.handler;

import com.ard.tianyu.domain.cache.UavTelemetryDataCache;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;

 ard-work/src/main/java/com/ard/tianyu/component/websocket/interceptor/TyHandshakeInterceptor.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/interceptor/TyHandshakeInterceptor.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.interceptor;
package com.ard.tianyu.component.websocket.interceptor;

import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;

 ard-work/src/main/java/com/ard/tianyu/component/websocket/utils/WebSocketUtil.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/utils/WebSocketUtil.java
@@ -1,7 +1,8 @@
package com.ard.tianyu.websocket.utils;
package com.ard.tianyu.component.websocket.utils;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ard.tianyu.component.websocket.WebSocketSessionManager;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
@@ -25,8 +26,6 @@
@Slf4j
public final class WebSocketUtil {

    // 存储 websocket session
    public static final ConcurrentMap<Long, WebSocketSession> ONLINE_USER_SESSIONS = new ConcurrentHashMap<>();
    /**
     * @param session 用户 session
     * @param message 发送内容
@@ -50,7 +49,7 @@
    }

    public static void sendMessage(Long userId, String message) {
        WebSocketSession session = ONLINE_USER_SESSIONS.get(userId);
        WebSocketSession session = WebSocketSessionManager.getSession(userId);
        sendMessage(session, message);
    }

@@ -98,7 +97,7 @@
     * @param message
     */
    public static void sendMessageAll(String message) {
        ONLINE_USER_SESSIONS.forEach((sessionId, session) -> sendMessage(session, message));
        WebSocketSessionManager.broadcast(message);
    }

    /**
@@ -108,7 +107,7 @@
     */
    public static void sendMessageAll(Map message) {
        JSONObject jsonObject = new JSONObject(message);
        ONLINE_USER_SESSIONS.forEach((sessionId, session) -> sendMessage(session, jsonObject.toString()));
        WebSocketSessionManager.broadcast(jsonObject.toString());
    }

    /**
@@ -118,7 +117,7 @@
     */
    public static void sendMessageAll(Object message) {
        String jsonMessage = JSONObject.toJSONString(message);  // 确保对象转换为 JSON 字符串
        ONLINE_USER_SESSIONS.forEach((sessionId, session) -> sendMessage(session, jsonMessage));
        WebSocketSessionManager.broadcast(jsonMessage);
    }

    /**
@@ -127,7 +126,7 @@
     * @param message
     */
    public static void sendMessageAll(List message) {
        ONLINE_USER_SESSIONS.forEach((sessionId, session) -> sendMessage(session, JSON.toJSONString(message)));
        WebSocketSessionManager.broadcast(JSON.toJSONString(message));
    }

}

 ard-work/src/main/java/com/ard/tianyu/config/TyConfiguration.java

@@ -1,6 +1,6 @@
package com.ard.tianyu.config;

import com.ard.tianyu.forest.TyClient;
import com.ard.tianyu.component.forest.TyClient;
import com.ard.tianyu.domain.dto.TokenDTO;
import com.ard.tianyu.domain.receiver.AccessTokenReceiver;
import com.ard.tianyu.domain.receiver.TyHttpCommonReceiver;

 ard-work/src/main/java/com/ard/tianyu/config/WebSocketConfig.java

@@ -1,7 +1,7 @@
package com.ard.tianyu.config;

import com.ard.tianyu.websocket.handler.TyMessageHandler;
import com.ard.tianyu.websocket.interceptor.TyHandshakeInterceptor;
import com.ard.tianyu.component.websocket.handler.TyMessageHandler;
import com.ard.tianyu.component.websocket.interceptor.TyHandshakeInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;

 ard-work/src/main/java/com/ard/tianyu/controller/uav/UavBoxController.java

@@ -4,7 +4,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import com.ard.tianyu.domain.UavBox;
import com.ard.tianyu.domain.entity.UavBox;
import com.ard.tianyu.service.IUavBoxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/realdata/UavSignalInfoConverter.java

@@ -1,7 +1,7 @@
package com.ard.tianyu.domain.dto.converter.realdata;

import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import org.springframework.beans.BeanUtils;

/**

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/realdata/UavStateConverter.java

@@ -1,7 +1,7 @@
package com.ard.tianyu.domain.dto.converter.realdata;

import com.ard.tianyu.domain.dto.state.*;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import org.springframework.beans.BeanUtils;
import java.util.List;
import java.util.stream.Collectors;

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/realdata/UavTelemetryDataConverter.java

@@ -1,7 +1,7 @@
package com.ard.tianyu.domain.dto.converter.realdata;

import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import org.springframework.beans.BeanUtils;

/**

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/wayline/HangarPointConverter.java

@@ -2,7 +2,7 @@

import com.ard.common.utils.bean.BeanUtils;
import com.ard.tianyu.domain.dto.wayline.HangarPoint;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;

public class HangarPointConverter {
    public static TelemetryDataPB.HangarPoint convertEntityToProto(HangarPoint hangarPoint) {

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/wayline/NormalModelConverter.java

@@ -2,7 +2,7 @@

import com.ard.common.utils.bean.BeanUtils;
import com.ard.tianyu.domain.dto.wayline.NormalModel;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;

public class NormalModelConverter {
    public static TelemetryDataPB.NormalModel convertEntityToProto(NormalModel normalModel) {

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/wayline/PlanLineDataConverter.java

@@ -6,7 +6,7 @@
import com.ard.tianyu.domain.dto.wayline.NormalModel;
import com.ard.tianyu.domain.dto.wayline.PlanLineData;
import com.ard.tianyu.domain.dto.wayline.SurroundModel;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;

import java.util.List;
import java.util.stream.Collectors;

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/wayline/PointActionConverter.java

@@ -2,7 +2,7 @@

import com.ard.common.utils.bean.BeanUtils;
import com.ard.tianyu.domain.dto.wayline.PointAction;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;

public class PointActionConverter {
    public static TelemetryDataPB.PointAction convertEntityToProto(PointAction pointAction) {

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/wayline/PointDataConverter.java

@@ -3,7 +3,7 @@
import com.ard.common.utils.bean.BeanUtils;
import com.ard.tianyu.domain.dto.state.PointData;
import com.ard.tianyu.domain.dto.wayline.PointAction;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;

import java.util.List;
import java.util.stream.Collectors;

 ard-work/src/main/java/com/ard/tianyu/domain/dto/converter/wayline/SurroundModelConverter.java

@@ -3,7 +3,7 @@
import com.ard.common.utils.bean.BeanUtils;
import com.ard.tianyu.domain.dto.state.PointData;
import com.ard.tianyu.domain.dto.wayline.SurroundModel;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;

import java.util.List;
import java.util.stream.Collectors;

 ard-work/src/main/java/com/ard/tianyu/domain/entity/UavBox.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/domain/UavBox.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.domain;
package com.ard.tianyu.domain.entity;

import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;

 ard-work/src/main/java/com/ard/tianyu/domain/message/BaseMessage.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/BaseMessage.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import lombok.AllArgsConstructor;
import lombok.Data;

 ard-work/src/main/java/com/ard/tianyu/domain/message/UavControlMessage.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/UavControlMessage.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import lombok.AllArgsConstructor;
import lombok.Data;

 ard-work/src/main/java/com/ard/tianyu/domain/message/UavControlType.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/UavControlType.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import lombok.Getter;


 ard-work/src/main/java/com/ard/tianyu/domain/message/UavSignalMessage.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/UavSignalMessage.java
@@ -1,7 +1,6 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

 ard-work/src/main/java/com/ard/tianyu/domain/message/UavStateMessage.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/UavStateMessage.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import com.ard.tianyu.domain.dto.state.UavState;
import lombok.AllArgsConstructor;

 ard-work/src/main/java/com/ard/tianyu/domain/message/UavStreamMessage.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/UavStreamMessage.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import lombok.AllArgsConstructor;
import lombok.Builder;

 ard-work/src/main/java/com/ard/tianyu/domain/message/UavTelemetryMessage.java

File was renamed from ard-work/src/main/java/com/ard/tianyu/websocket/domain/UavTelemetryMessage.java
@@ -1,4 +1,4 @@
package com.ard.tianyu.websocket.domain;
package com.ard.tianyu.domain.message;

import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import lombok.AllArgsConstructor;

 ard-work/src/main/java/com/ard/tianyu/domain/receiver/BoxPhotosReceiver.java

@@ -33,6 +33,6 @@
    private String imgUrl;

    @JsonProperty("timeStamp")
    private Long timeStamp;
    private String timeStamp;

}

 ard-work/src/main/java/com/ard/tianyu/mapper/UavBoxMapper.java

@@ -1,6 +1,6 @@
package com.ard.tianyu.mapper;

import com.ard.tianyu.domain.UavBox;
import com.ard.tianyu.domain.entity.UavBox;

import java.util.List;


 ard-work/src/main/java/com/ard/tianyu/service/ITyService.java

@@ -17,7 +17,7 @@
import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.domain.receiver.*;
import com.ard.tianyu.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.BaseCmd;
import com.dtflys.forest.annotation.Var;

import java.util.List;

 ard-work/src/main/java/com/ard/tianyu/service/IUavBoxService.java

@@ -2,7 +2,7 @@



import com.ard.tianyu.domain.UavBox;
import com.ard.tianyu.domain.entity.UavBox;

import java.util.List;


 ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java

@@ -2,8 +2,8 @@

import com.ard.common.exception.ControlException;
import com.ard.common.utils.SecurityUtils;
import com.ard.tianyu.websocket.domain.UavControlType;
import com.ard.tianyu.websocket.handler.UavControlManager;
import com.ard.tianyu.domain.message.UavControlType;
import com.ard.tianyu.component.websocket.handler.UavControlManager;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

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

@@ -3,13 +3,20 @@
import com.ard.common.utils.ByteUtils;
import com.ard.tianyu.aspect.annotation.CheckTakeoffAltitude;
import com.ard.tianyu.aspect.annotation.CheckControlRight;
import com.ard.tianyu.component.netty.command.BaseCmd;
import com.ard.tianyu.component.netty.command.camera.*;
import com.ard.tianyu.component.netty.command.manual.*;
import com.ard.tianyu.component.netty.command.register.*;
import com.ard.tianyu.component.netty.command.settings.*;
import com.ard.tianyu.component.netty.command.speaker.*;
import com.ard.tianyu.component.netty.command.wayline.*;
import com.ard.tianyu.config.TyConfiguration;
import com.ard.tianyu.domain.dto.camera.*;
import com.ard.tianyu.domain.dto.manual.*;
import com.ard.tianyu.domain.dto.speaker.*;
import com.ard.tianyu.domain.dto.wayline.*;
import com.ard.tianyu.domain.receiver.*;
import com.ard.tianyu.forest.TyClient;
import com.ard.tianyu.component.forest.TyClient;
import com.ard.tianyu.domain.cache.TyTcpServerCache;
import com.ard.tianyu.domain.cache.UavSignalInfoCache;
import com.ard.tianyu.domain.cache.UavStateCache;
@@ -27,27 +34,20 @@
import com.ard.tianyu.domain.dto.signal.SignalInfo;
import com.ard.tianyu.domain.dto.state.UavState;
import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
import com.ard.tianyu.netty.command.*;
import com.ard.tianyu.netty.TyNettyTcpClient;
import com.ard.tianyu.netty.command.camera.*;
import com.ard.tianyu.netty.command.control.AbsAngleControlCmd;
import com.ard.tianyu.netty.command.control.AngleControlCmd;
import com.ard.tianyu.netty.command.control.SpeedControlCmd;
import com.ard.tianyu.netty.command.manual.*;
import com.ard.tianyu.netty.command.notice.BoxPowerStatusReplyCmd;
import com.ard.tianyu.netty.command.notice.FlyWayEndReplyCmd;
import com.ard.tianyu.netty.command.notice.UavReadyReplyCmd;
import com.ard.tianyu.netty.command.real.SignalInfoCmd;
import com.ard.tianyu.netty.command.real.UavStateCmd;
import com.ard.tianyu.netty.command.real.UavTelemetryDataCmd;
import com.ard.tianyu.netty.command.register.*;
import com.ard.tianyu.netty.command.settings.*;
import com.ard.tianyu.netty.command.speaker.*;
import com.ard.tianyu.netty.command.wayline.*;
import com.ard.tianyu.netty.handler.ErrorCodeEnum;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.component.netty.TyNettyTcpClient;
import com.ard.tianyu.component.netty.command.control.AbsAngleControlCmd;
import com.ard.tianyu.component.netty.command.control.AngleControlCmd;
import com.ard.tianyu.component.netty.command.control.SpeedControlCmd;
import com.ard.tianyu.component.netty.command.notice.BoxPowerStatusReplyCmd;
import com.ard.tianyu.component.netty.command.notice.FlyWayEndReplyCmd;
import com.ard.tianyu.component.netty.command.notice.UavReadyReplyCmd;
import com.ard.tianyu.component.netty.command.real.SignalInfoCmd;
import com.ard.tianyu.component.netty.command.real.UavStateCmd;
import com.ard.tianyu.component.netty.command.real.UavTelemetryDataCmd;
import com.ard.tianyu.component.netty.handler.ErrorCodeEnum;
import com.ard.tianyu.component.netty.protobuf.TelemetryDataPB;
import com.ard.tianyu.service.ITyService;
import com.ard.tianyu.websocket.domain.UavControlType;
import com.ard.tianyu.domain.message.UavControlType;
import com.ard.vtdu.service.IMediaService;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;

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

@@ -1,7 +1,7 @@
package com.ard.tianyu.service.impl;

import com.ard.common.utils.DateUtils;
import com.ard.tianyu.domain.UavBox;
import com.ard.tianyu.domain.entity.UavBox;
import com.ard.tianyu.domain.receiver.BoxInfoReceiver;
import com.ard.tianyu.mapper.UavBoxMapper;
import com.ard.tianyu.service.ITyService;