From 731faee87796e78f943028a8cf9a11abd231a49a Mon Sep 17 00:00:00 2001 From: wuyuan <15505152113@163.com> Date: Tue, 20 May 2025 17:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B4=9F=E8=BD=BD=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/service/impl/ControlServiceImpl.java | 12 ++++++------ .../control/service/impl/PayloadCommandsHandler.java | 2 +- .../manage/service/impl/DeviceServiceImpl.java | 11 ++++++++--- .../manage/service/impl/LiveStreamServiceImpl.java | 4 ++-- .../wayline/controller/WaylineJobController.java | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java index b024571..b0b21a6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java @@ -225,16 +225,16 @@ public class ControlServiceImpl implements IControlService { TopicServicesResponse response; switch (authority) { case FLIGHT: - if (deviceService.checkAuthorityFlight(sn)) { - return HttpResultResponse.success(); - } +// if (deviceService.checkAuthorityFlight(sn)) { +// return HttpResultResponse.success(); +// } response = abstractControlService.flightAuthorityGrab(SDKManager.getDeviceSDK(sn)); break; case PAYLOAD: - if (checkPayloadAuthority(sn, param.getPayloadIndex())) { - return HttpResultResponse.success(); - } +// if (checkPayloadAuthority(sn, param.getPayloadIndex())) { +// return HttpResultResponse.success(); +// } response = abstractControlService.payloadAuthorityGrab(SDKManager.getDeviceSDK(sn), new PayloadAuthorityGrabRequest().setPayloadIndex(new PayloadIndex(param.getPayloadIndex()))); break; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java index 4618fed..f0b905c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java @@ -73,7 +73,7 @@ public abstract class PayloadCommandsHandler { String deviceSn = checkDockOnline(dockSn); checkDeviceOnline(deviceSn); - checkAuthority(deviceSn); + //checkAuthority(deviceSn); if (!canPublish(deviceSn)) { throw new RuntimeException("无人机的当前状态不支持此功能，请稍后再试。"); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java index 5be3633..07ad409 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java @@ -9,6 +9,7 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.sdk.cloudapi.device.*; import org.dromara.common.sdk.cloudapi.firmware.*; import org.dromara.common.sdk.cloudapi.firmware.api.AbstractFirmwareService; +import org.dromara.common.sdk.cloudapi.livestream.VideoTypeEnum; import org.dromara.common.sdk.cloudapi.property.api.AbstractPropertyService; import org.dromara.common.sdk.cloudapi.tsa.DeviceIconUrl; import org.dromara.common.sdk.cloudapi.tsa.TopologyDeviceModel; @@ -60,6 +61,9 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import static org.dromara.common.core.utils.StringUtils.DASH; +import static org.dromara.common.core.utils.StringUtils.SLASH; + /** * * @author sean.zhou @@ -270,14 +274,15 @@ public class DeviceServiceImpl implements IDeviceService { DeviceDTO subDevice = getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build()).get(0); subDevice.setStatus(deviceRedisService.checkDeviceOnline(subDevice.getDeviceSn())); - List capacityCameraByDeviceSn = capacityCameraService.getCapacityCameraByDeviceSn(gateway.getChildDeviceSn()); + /*List capacityCameraByDeviceSn = capacityCameraService.getCapacityCameraByDeviceSn(gateway.getChildDeviceSn()); String videoId = ""; if(capacityCameraByDeviceSn != null && capacityCameraByDeviceSn.size() > 0 ){ if(capacityCameraByDeviceSn.get(0).getVideosList().size() > 0){ videoId = gateway.getChildDeviceSn() + "/" + capacityCameraByDeviceSn.get(0).getIndex() + "/" + capacityCameraByDeviceSn.get(0).getVideosList().get(0).getIndex(); } - } - subDevice.setVideoId(videoId); + }*/ + String deviceVideoEnum = DeviceVideoEnum.find(subDevice.getDeviceName()).getDevice(); + subDevice.setVideoId(new VideoId(subDevice.getDeviceSn()+SLASH+deviceVideoEnum+SLASH + VideoTypeEnum.NORMAL.getType() + DASH+DeviceTypeVideoEnum.ZERO.getVideoType()).toString()); gateway.setChildren(subDevice); // gateway.setVideoId(DeviceEnum.videoId); // payloads diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java index b81b722..5bea65e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java @@ -139,7 +139,7 @@ public class LiveStreamServiceImpl implements ILiveStreamService { default: return HttpResultResponse.error(LiveErrorCodeEnum.URL_TYPE_NOT_SUPPORTED); } - DeviceEntity deviceBySn = deviceService.getDeviceByChildSn(liveParam.getVideoId().getDroneSn()); + /* DeviceEntity deviceBySn = deviceService.getDeviceByChildSn(liveParam.getVideoId().getDroneSn()); if(deviceBySn != null){ Optional> runningWaylineJob = waylineRedisService.getRunningWaylineJob(deviceBySn.getDeviceSn()); @@ -172,7 +172,7 @@ public class LiveStreamServiceImpl implements ILiveStreamService { } } - } + }*/ // MessageProducerUtil.sendAsyncProducerMessage("videoStartConsum","videoStart",liveParam.getVideoId().getDroneSn(),liveParam.getVideoId().toString()); return HttpResultResponse.success(live); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java index 5301e0c..758bd5e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java @@ -134,7 +134,7 @@ public class WaylineJobController { @RequestParam(name = "device_sn") String deviceSn, HttpServletRequest req, HttpServletResponse rsp) { Optional> runningWaylineJob = waylineRedisService.getRunningWaylineJob(deviceSn); if(runningWaylineJob.isEmpty())HttpResultResponse.error("不存在"); - return HttpResultResponse.success(runningWaylineJob.get().getOutput().getExt().getFlightId()); + return HttpResultResponse.success(runningWaylineJob.get().getOutput().getExt().getFlightId()==null?runningWaylineJob.get().getOutput().getExt().getFlightId():null); } @GetMapping("/{workspace_id}/getJobFileUrlByDeviceSn")