forked from uav/ard-uav-server
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -1,69 +1,61 @@ package com.ard.work.service.impl; import com.ard.common.utils.ByteUtils; import com.ard.work.aspect.annotation.CheckTakeoffAltitude; import com.ard.work.aspect.annotation.CheckControlRight; import com.ard.work.aspect.annotation.CheckTakeoffAltitude; import com.ard.work.component.forest.TyClient; import com.ard.work.component.netty.TcpClientUtil; import com.ard.work.component.netty.command.BaseCmd; import com.ard.work.component.netty.command.camera.*; import com.ard.work.component.netty.command.manual.*; import com.ard.work.component.netty.command.register.*; import com.ard.work.component.netty.command.settings.*; import com.ard.work.component.netty.command.speaker.*; import com.ard.work.component.netty.command.wayline.*; import com.ard.work.domain.dto.camera.*; import com.ard.work.domain.dto.manual.*; import com.ard.work.domain.dto.speaker.*; import com.ard.work.domain.dto.wayline.*; import com.ard.work.domain.entity.ArdDroneInfo; import com.ard.work.domain.entity.ArdServerInfo; import com.ard.work.domain.receiver.*; import com.ard.work.component.forest.TyClient; import com.ard.work.domain.cache.UavSignalInfoCache; import com.ard.work.domain.cache.UavStateCache; import com.ard.work.domain.cache.UavTelemetryDataCache; import com.ard.work.domain.dto.BoxHistoryDTO; import com.ard.work.domain.dto.BoxPhotosDTO; import com.ard.work.domain.dto.BoxSettingsDTO; import com.ard.work.domain.dto.control.AbsAngleControlDTO; import com.ard.work.domain.dto.control.AngleControlDTO; import com.ard.work.domain.dto.control.SpeedControlDTO; import com.ard.work.domain.dto.converter.wayline.PlanLineDataConverter; import com.ard.work.domain.dto.settings.ReturnHeightSettingDTO; import com.ard.work.domain.dto.settings.ReturnPointSettingDTO; import com.ard.work.domain.dto.settings.VideoStreamSettingDTO; import com.ard.work.domain.dto.signal.SignalInfo; import com.ard.work.domain.dto.state.UavState; import com.ard.work.domain.dto.telemetry.TelemetryData; import com.ard.work.component.netty.command.control.AbsAngleControlCmd; import com.ard.work.component.netty.command.control.AngleControlCmd; import com.ard.work.component.netty.command.control.SpeedControlCmd; import com.ard.work.component.netty.command.manual.*; import com.ard.work.component.netty.command.notice.BoxPowerStatusReplyCmd; import com.ard.work.component.netty.command.notice.FlyWayEndReplyCmd; import com.ard.work.component.netty.command.notice.UavReadyReplyCmd; import com.ard.work.component.netty.command.real.SignalInfoCmd; import com.ard.work.component.netty.command.real.UavStateCmd; import com.ard.work.component.netty.command.real.UavTelemetryDataCmd; import com.ard.work.component.netty.command.register.*; import com.ard.work.component.netty.command.settings.*; import com.ard.work.component.netty.command.speaker.*; import com.ard.work.component.netty.command.wayline.*; import com.ard.work.component.netty.handler.ErrorCodeEnum; import com.ard.work.component.netty.protobuf.TelemetryDataPB; import com.ard.work.domain.cache.UavSignalInfoCache; import com.ard.work.domain.cache.UavStateCache; import com.ard.work.domain.cache.UavTelemetryDataCache; import com.ard.work.domain.dto.BoxHistoryDTO; import com.ard.work.domain.dto.BoxPhotosDTO; import com.ard.work.domain.dto.BoxSettingsDTO; import com.ard.work.domain.dto.camera.*; import com.ard.work.domain.dto.control.AbsAngleControlDTO; import com.ard.work.domain.dto.control.AngleControlDTO; import com.ard.work.domain.dto.control.SpeedControlDTO; import com.ard.work.domain.dto.converter.wayline.PlanLineDataConverter; import com.ard.work.domain.dto.manual.*; import com.ard.work.domain.dto.settings.ReturnHeightSettingDTO; import com.ard.work.domain.dto.settings.ReturnPointSettingDTO; import com.ard.work.domain.dto.settings.VideoStreamSettingDTO; import com.ard.work.domain.dto.signal.SignalInfo; import com.ard.work.domain.dto.speaker.*; import com.ard.work.domain.dto.state.UavState; import com.ard.work.domain.dto.telemetry.TelemetryData; import com.ard.work.domain.dto.wayline.*; import com.ard.work.domain.entity.ArdDroneInfo; import com.ard.work.domain.entity.ArdServerInfo; import com.ard.work.domain.message.UavControlType; import com.ard.work.domain.receiver.*; import com.ard.work.service.IArdDroneInfoService; import com.ard.work.service.IArdServerInfoService; import com.ard.work.service.ITyService; import com.ard.work.domain.message.UavControlType; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; import static com.ard.work.component.netty.TyTcpClientManager.channels; /** * TyServiceImpl @@ -92,7 +84,7 @@ } /** * 获取云盒列表 * 获取全部云盒列表 * * @return List<BoxInfoReceiver> */ @@ -101,7 +93,16 @@ List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo()); return getBoxList(ardServerInfos); } /** * 获取指定服务器云盒列表 * * @return List<BoxInfoReceiver> */ @Override public List<BoxInfoReceiver> getBoxList(String serverId) { TyHttpCommonReceiver<List<BoxInfoReceiver>> boxList = tyClient.getBoxList(serverId); return boxList.getContent(); } /** * 获取直播地址 * @@ -110,7 +111,7 @@ @Override public BoxStreamUrlReceiver getBoxLiveUrl(String boxSn) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxSn); TyHttpCommonReceiver<BoxStreamUrlReceiver> boxLiveUrl = tyClient.getBoxLiveUrl(ardDroneInfo.getServerInfoId(),boxSn); TyHttpCommonReceiver<BoxStreamUrlReceiver> boxLiveUrl = tyClient.getBoxLiveUrl(ardDroneInfo.getServerId(),boxSn); return boxLiveUrl.getContent(); } @@ -122,7 +123,7 @@ @Override public List<BoxHistoryReceiver> getBoxHistory(BoxHistoryDTO boxHistoryDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxHistoryDTO.getBoxSn()); TyHttpCommonReceiver<List<BoxHistoryReceiver>> boxHistory = tyClient.getBoxHistory(ardDroneInfo.getServerInfoId(), TyHttpCommonReceiver<List<BoxHistoryReceiver>> boxHistory = tyClient.getBoxHistory(ardDroneInfo.getServerId(), boxHistoryDTO); return boxHistory.getContent(); } @@ -135,7 +136,7 @@ @Override public List<BoxPhotosReceiver> getBoxPhotos(BoxPhotosDTO boxPhotosDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxPhotosDTO.getBoxSn()); TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(ardDroneInfo.getServerInfoId(),boxPhotosDTO); TyHttpCommonReceiver<List<BoxPhotosReceiver>> boxPhotos = tyClient.getBoxPhotos(ardDroneInfo.getServerId(),boxPhotosDTO); return boxPhotos.getContent(); } @@ -145,7 +146,7 @@ @Override public Boolean updateBoxSettings(BoxSettingsDTO boxSettingsDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxSettingsDTO.getBoxSn()); TyHttpCommonReceiver<?> result = tyClient.updateBoxSettings(ardDroneInfo.getServerInfoId(),boxSettingsDTO); TyHttpCommonReceiver<?> result = tyClient.updateBoxSettings(ardDroneInfo.getServerId(),boxSettingsDTO); return result.getState() == 1; } @@ -156,7 +157,7 @@ public Boolean updateReturnHeight(ReturnHeightSettingDTO returnHeightSettingDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(returnHeightSettingDTO.getBoxSn()); ReturnHeightSettingCmd returnHeightSettingCmd = new ReturnHeightSettingCmd(returnHeightSettingDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), returnHeightSettingCmd); this.sendMessage(ardDroneInfo.getServerId(), returnHeightSettingCmd); return true; } @@ -167,7 +168,7 @@ public Boolean updateReturnPoint(ReturnPointSettingDTO returnPointSettingDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(returnPointSettingDTO.getBoxSn()); ReturnPointSettingCmd returnPointSettingCmd = new ReturnPointSettingCmd(returnPointSettingDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), returnPointSettingCmd); this.sendMessage(ardDroneInfo.getServerId(), returnPointSettingCmd); return true; } @@ -178,7 +179,7 @@ public Boolean updateVideoStream(VideoStreamSettingDTO videoStreamSettingDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(videoStreamSettingDTO.getBoxSn()); VideoStreamSettingCmd videoStreamSettingCmd = new VideoStreamSettingCmd(videoStreamSettingDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), videoStreamSettingCmd); this.sendMessage(ardDroneInfo.getServerId(), videoStreamSettingCmd); return true; } @@ -205,7 +206,7 @@ public Boolean angleControl(AngleControlDTO angleControlDto) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(angleControlDto.getBoxSn()); AngleControlCmd controlAngleCommand = new AngleControlCmd(angleControlDto); this.sendMessage(ardDroneInfo.getServerInfoId(), controlAngleCommand); this.sendMessage(ardDroneInfo.getServerId(), controlAngleCommand); return true; } @@ -217,7 +218,7 @@ public Boolean absAngleControl(AbsAngleControlDTO absAngleControlDto) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(absAngleControlDto.getBoxSn()); AbsAngleControlCmd absAngleControlCommand = new AbsAngleControlCmd(absAngleControlDto); this.sendMessage(ardDroneInfo.getServerInfoId(), absAngleControlCommand); this.sendMessage(ardDroneInfo.getServerId(), absAngleControlCommand); return true; } @@ -229,7 +230,7 @@ public Boolean speedControl(SpeedControlDTO speedControlDto) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(speedControlDto.getBoxSn()); SpeedControlCmd speedControlCommand = new SpeedControlCmd(speedControlDto); this.sendMessage(ardDroneInfo.getServerInfoId(), speedControlCommand); this.sendMessage(ardDroneInfo.getServerId(), speedControlCommand); return true; } @@ -240,7 +241,7 @@ public Boolean updateCameraMode(CameraModeDTO cameraModeDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(cameraModeDTO.getBoxSn()); CameraModeCmd cameraModeCommand = new CameraModeCmd(cameraModeDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), cameraModeCommand); this.sendMessage(ardDroneInfo.getServerId(), cameraModeCommand); return true; } @@ -255,7 +256,7 @@ photoReturnToggle(PhotoReturnToggleDTO.builder().boxSn(capturePicDto.getBoxSn()).actionParam((byte) 0x01).build()); ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(capturePicDto.getBoxSn()); CapturePicCmd capturePicCommand = new CapturePicCmd(capturePicDto); this.sendMessage(ardDroneInfo.getServerInfoId(), capturePicCommand); this.sendMessage(ardDroneInfo.getServerId(), capturePicCommand); return true; } @@ -272,7 +273,7 @@ baseCmd = new RecordStopCmd(recordDto); } ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(recordDto.getBoxSn()); this.sendMessage(ardDroneInfo.getServerInfoId(), baseCmd); this.sendMessage(ardDroneInfo.getServerId(), baseCmd); return true; } @@ -284,7 +285,7 @@ public Boolean zoom(ZoomDTO zoomDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(zoomDTO.getBoxSn()); ZoomCmd zoomCommand = new ZoomCmd(zoomDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), zoomCommand); this.sendMessage(ardDroneInfo.getServerId(), zoomCommand); return true; } @@ -296,7 +297,7 @@ public Boolean zoomToLevel(ZoomToLevelDTO zoomToLevelDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(zoomToLevelDTO.getBoxSn()); ZoomToLevelCmd zoomToLevelCommand = new ZoomToLevelCmd(zoomToLevelDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), zoomToLevelCommand); this.sendMessage(ardDroneInfo.getServerId(), zoomToLevelCommand); return true; } @@ -307,7 +308,7 @@ public Boolean switchCamera(SwitchCameraDTO switchCameraDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(switchCameraDTO.getBoxSn()); SwitchCameraCmd switchCameraCmd = new SwitchCameraCmd(switchCameraDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), switchCameraCmd); this.sendMessage(ardDroneInfo.getServerId(), switchCameraCmd); return true; } @@ -318,7 +319,7 @@ public Boolean switchSource(SwitchSourceDTO switchSourceDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(switchSourceDTO.getBoxSn()); SwitchSourceCmd switchSourceCmd = new SwitchSourceCmd(switchSourceDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), switchSourceCmd); this.sendMessage(ardDroneInfo.getServerId(), switchSourceCmd); return true; } @@ -329,7 +330,7 @@ public Boolean photoReturnToggle(PhotoReturnToggleDTO photoReturnToggleDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(photoReturnToggleDTO.getBoxSn()); PhotoReturnToggleCmd photoReturnToggleCmd = new PhotoReturnToggleCmd(photoReturnToggleDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), photoReturnToggleCmd); this.sendMessage(ardDroneInfo.getServerId(), photoReturnToggleCmd); return true; } @@ -340,7 +341,7 @@ public Boolean switchUavControl(SwitchUavControlDTO switchUavControlDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(switchUavControlDTO.getBoxSn()); SwitchUavControlCmd switchUavControlCmd = new SwitchUavControlCmd(switchUavControlDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), switchUavControlCmd); this.sendMessage(ardDroneInfo.getServerId(), switchUavControlCmd); return true; } @@ -352,7 +353,7 @@ public Boolean takeOff(TakeOffDTO takeOffDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(takeOffDTO.getBoxSn()); TakeOffCmd takeOffCmd = new TakeOffCmd(takeOffDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), takeOffCmd); this.sendMessage(ardDroneInfo.getServerId(), takeOffCmd); return true; } @@ -364,7 +365,7 @@ public Boolean returnHome(ReturnHomeDTO returnHomeDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(returnHomeDTO.getBoxSn()); ReturnHomeCmd returnHomeCmd = new ReturnHomeCmd(returnHomeDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), returnHomeCmd); this.sendMessage(ardDroneInfo.getServerId(), returnHomeCmd); return true; } @@ -376,7 +377,7 @@ public Boolean returnHomeCancel(ReturnHomeCancelDTO returnHomeCancelDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(returnHomeCancelDTO.getBoxSn()); ReturnHomeCancelCmd returnHomeCancelCmd = new ReturnHomeCancelCmd(returnHomeCancelDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), returnHomeCancelCmd); this.sendMessage(ardDroneInfo.getServerId(), returnHomeCancelCmd); return true; } @@ -388,7 +389,7 @@ public Boolean land(LandDTO landDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(landDTO.getBoxSn()); LandCmd landCmd = new LandCmd(landDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), landCmd); this.sendMessage(ardDroneInfo.getServerId(), landCmd); return true; } @@ -400,7 +401,7 @@ public Boolean landCancel(LandCancelDTO landCancelDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(landCancelDTO.getBoxSn()); LandCancelCmd landCancelCmd = new LandCancelCmd(landCancelDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), landCancelCmd); this.sendMessage(ardDroneInfo.getServerId(), landCancelCmd); return true; } @@ -412,7 +413,7 @@ public Boolean landForced(LandForcedDTO landForcedDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(landForcedDTO.getBoxSn()); LandForcedCmd landForcedCmd = new LandForcedCmd(landForcedDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), landForcedCmd); this.sendMessage(ardDroneInfo.getServerId(), landForcedCmd); return true; } @@ -425,7 +426,7 @@ public Boolean flyControl(FlyControlDTO flyControlDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(flyControlDTO.getBoxSn()); FlyControlCmd flyControlCmd = new FlyControlCmd(flyControlDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), flyControlCmd); this.sendMessage(ardDroneInfo.getServerId(), flyControlCmd); return true; } @@ -438,7 +439,7 @@ public Boolean flyPointControl(FlyPointControlDTO flyPointControlDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(flyPointControlDTO.getBoxSn()); FlyPointControlCmd flyPointControlCmd = new FlyPointControlCmd(flyPointControlDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), flyPointControlCmd); this.sendMessage(ardDroneInfo.getServerId(), flyPointControlCmd); return true; } @@ -450,7 +451,7 @@ public Boolean flyPointControlCancel(FlyPointControlCancelDTO flyPointControlCancelDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(flyPointControlCancelDTO.getBoxSn()); FlyPointControlCancelCmd flyPointControlCancelCmd = new FlyPointControlCancelCmd(flyPointControlCancelDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), flyPointControlCancelCmd); this.sendMessage(ardDroneInfo.getServerId(), flyPointControlCancelCmd); return true; } @@ -462,7 +463,7 @@ public Boolean emeragencyBrake(EmeragencyBrakeDTO emeragencyBrakeDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(emeragencyBrakeDTO.getBoxSn()); EmergencyBrakeCmd emergencyBrakeCmd = new EmergencyBrakeCmd(emeragencyBrakeDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), emergencyBrakeCmd); this.sendMessage(ardDroneInfo.getServerId(), emergencyBrakeCmd); return true; } @@ -497,7 +498,7 @@ public void speakModeSwitch(SpeakModeSwitchDTO speakModeSwitchDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(speakModeSwitchDTO.getBoxSn()); SpeakModeSwitchCmd speakModeSwitchCmd = new SpeakModeSwitchCmd(speakModeSwitchDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), speakModeSwitchCmd); this.sendMessage(ardDroneInfo.getServerId(), speakModeSwitchCmd); } /** @@ -507,7 +508,7 @@ public void textSpeak(TextSpeakDTO textSpeakDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(textSpeakDTO.getBoxSn()); TextSpeakCmd textSpeakCmd = new TextSpeakCmd(textSpeakDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), textSpeakCmd); this.sendMessage(ardDroneInfo.getServerId(), textSpeakCmd); } /** @@ -517,7 +518,7 @@ public void realSpeak(RealSpeakDTO realSpeakDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(realSpeakDTO.getBoxSn()); RealSpeakCmd realSpeakCmd = new RealSpeakCmd(realSpeakDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), realSpeakCmd); this.sendMessage(ardDroneInfo.getServerId(), realSpeakCmd); } /** @@ -527,7 +528,7 @@ public void recordSpeak(RecordSpeakDTO recordSpeakDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(recordSpeakDTO.getBoxSn()); RecordSpeakCmd recordSpeakCmd = new RecordSpeakCmd(recordSpeakDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), recordSpeakCmd); this.sendMessage(ardDroneInfo.getServerId(), recordSpeakCmd); } /** @@ -537,7 +538,7 @@ public void volumeSetting(VolumeSettingDTO volumeSettingDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(volumeSettingDTO.getBoxSn()); VolumeSettingCmd volumeSettingCmd = new VolumeSettingCmd(volumeSettingDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), volumeSettingCmd); this.sendMessage(ardDroneInfo.getServerId(), volumeSettingCmd); } /** @@ -547,7 +548,7 @@ public void loopSetting(LoopSettingDTO loopSettingDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(loopSettingDTO.getBoxSn()); LoopSettingCmd loopSettingCmd = new LoopSettingCmd(loopSettingDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), loopSettingCmd); this.sendMessage(ardDroneInfo.getServerId(), loopSettingCmd); } /** @@ -557,7 +558,7 @@ public void stopSpeak(StopSpeakDTO stopSpeakDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(stopSpeakDTO.getBoxSn()); StopSpeakCmd stopSpeakCmd = new StopSpeakCmd(stopSpeakDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), stopSpeakCmd); this.sendMessage(ardDroneInfo.getServerId(), stopSpeakCmd); } /** @@ -568,7 +569,7 @@ ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(wayLineUploadDTO.getBoxSn()); wayLineUploadDTO.setWayLineData(this.CreatePlanLineData());//设置航线数据 WayLineUploadCmd wayLineUploadCmd = new WayLineUploadCmd(wayLineUploadDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), wayLineUploadCmd); this.sendMessage(ardDroneInfo.getServerId(), wayLineUploadCmd); } //创建航线 @@ -613,7 +614,7 @@ public void wayLineBegin(WayLineBeginDTO wayLineBeginDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(wayLineBeginDTO.getBoxSn()); WayLineBeginCmd wayLineBeginCmd = new WayLineBeginCmd(wayLineBeginDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), wayLineBeginCmd); this.sendMessage(ardDroneInfo.getServerId(), wayLineBeginCmd); } /** @@ -624,7 +625,7 @@ public void wayLinePause(WayLinePauseDTO wayLinePauseDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(wayLinePauseDTO.getBoxSn()); WayLinePauseCmd wayLinePauseCmd = new WayLinePauseCmd(wayLinePauseDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), wayLinePauseCmd); this.sendMessage(ardDroneInfo.getServerId(), wayLinePauseCmd); } /** @@ -635,7 +636,7 @@ public void wayLineResume(WayLineResumeDTO wayLineResumeDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(wayLineResumeDTO.getBoxSn()); WayLineResumeCmd wayLineResumeCmd = new WayLineResumeCmd(wayLineResumeDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), wayLineResumeCmd); this.sendMessage(ardDroneInfo.getServerId(), wayLineResumeCmd); } /** @@ -646,7 +647,7 @@ public void wayLineEnd(WayLineEndDTO wayLineEndDTO) { ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(wayLineEndDTO.getBoxSn()); WayLineEndCmd wayLineEndCmd = new WayLineEndCmd(wayLineEndDTO); this.sendMessage(ardDroneInfo.getServerInfoId(), wayLineEndCmd); this.sendMessage(ardDroneInfo.getServerId(), wayLineEndCmd); } /** @@ -834,25 +835,50 @@ } /** * 根据boxSn获取六合盒子列表 * @return List<BoxInfoReceiver> * 根据[服务器id]获取六合盒子列表 */ @Override public List<BoxInfoReceiver> getBoxSnToList(String id) { List<BoxInfoReceiver> lisbox = new ArrayList<>(); try { lisbox = tyClient.getBoxList(id).getContent(); return lisbox; List<BoxInfoReceiver> remoteBoxList = tyClient.getBoxList(id).getContent(); List<ArdDroneInfo> existingDrones = getDroneLs(id); return existingDrones.isEmpty() ? remoteBoxList : filterBoxInfoReceivers(remoteBoxList, existingDrones); } catch (Exception e) { log.error("获取云盒列表失败: {}", id, e); return lisbox; log.error("获取云盒列表失败, 服务器id: {}", id, e); return Collections.emptyList(); // 返回不可变空列表，更安全 } } /** * 根据[服务器id]查询无人机盒子列表 */ private List<ArdDroneInfo> getDroneLs(String serverId) { ArdDroneInfo query = new ArdDroneInfo(); query.setServerId(serverId); return ardDroneService.selectArdDroneList(query); } /** * 过滤掉在ardDroneInfos中已存在的boxSn */ public List<BoxInfoReceiver> filterBoxInfoReceivers( List<BoxInfoReceiver> boxInfoReceivers, List<ArdDroneInfo> ardDroneInfos) { Set<String> existingBoxSns = ardDroneInfos.stream() .map(ArdDroneInfo::getBoxSn) .filter(Objects::nonNull) .collect(Collectors.toSet()); return boxInfoReceivers.stream() .filter(box -> box.getBoxSn() != null && !existingBoxSns.contains(box.getBoxSn())) .collect(Collectors.toList()); } private List<BoxInfoReceiver> getBoxList(List<ArdServerInfo> ls) { return ls.stream() .filter(ardServerInfo -> ardServerInfo.getServerStatus().equals("1")) .flatMap(ardServerInfo -> { try { List<BoxInfoReceiver> boxes = tyClient.getBoxList(ardServerInfo.getId()).getContent(); return Optional.ofNullable(boxes).orElse(Collections.emptyList()).stream(); @@ -883,21 +909,7 @@ * 发送消息 */ private void sendMessage(String key, BaseCmd msg) { try { ChannelFuture future = channels.get(key).getChannelFuture(); Channel channel = future.channel(); if (channel.isActive()) { InetSocketAddress ipSocket = (InetSocketAddress) channel.remoteAddress(); String host = ipSocket.getHostString(); int port = ipSocket.getPort(); channel.writeAndFlush(msg); // 发送编码后的数据 log.debug("向六合服务器【{}:{}】发送数据，命令码：{}", host, port, String.format("0x%02X", msg.getCmdCode() & 0xFF)); } else { log.error("与六合服务器链接断开，无法发送数据！"); } } catch (Exception e) { log.error("发送消息异常：{}", e.getMessage()); } TcpClientUtil.sendMessage(key, msg); } }
