From e6b8661e9e7cfd694baf25ea0b106a73fb84418a Mon Sep 17 00:00:00 2001 From: wuyuan <15505152113@163.com> Date: Wed, 26 Mar 2025 21:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=98=A0=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/IDeviceQrtzService.java | 2 +- .../manage/service/impl/DeviceQrtzServiceImpl.java | 2 +- .../manage/service/impl/SDKDeviceService.java | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java index 86acb27..f40df20 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java @@ -53,5 +53,5 @@ public interface IDeviceQrtzService { Boolean fileSort(Long id ,Integer sort); //通知启用飞行任务 - DeviceQrtzFileEntity getDeviceQrtzFileEntity(Long id); + DeviceQrtzFileEntity getDeviceQrtzFileEntity(String deviceSn); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 36a3ab8..bb24788 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -251,7 +251,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { } @Override - public DeviceQrtzFileEntity getDeviceQrtzFileEntity(Long id) { + public DeviceQrtzFileEntity getDeviceQrtzFileEntity(String deviceSn) { return null; } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java index 38f62fa..ff6d83d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java @@ -16,10 +16,7 @@ import org.dromara.sample.manage.model.dto.DeviceDTO; import org.dromara.sample.manage.model.dto.DevicePayloadReceiver; import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum; import org.dromara.sample.manage.model.param.DeviceQueryParam; -import org.dromara.sample.manage.service.IDeviceDictionaryService; -import org.dromara.sample.manage.service.IDevicePayloadService; -import org.dromara.sample.manage.service.IDeviceRedisService; -import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.manage.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; @@ -53,6 +50,9 @@ public class SDKDeviceService extends AbstractDeviceService { @Autowired private IDevicePayloadService devicePayloadService; + @Autowired + private IDeviceQrtzService deviceQrtzService; + @Override public TopicStatusResponse updateTopoOnline(TopicStatusRequest request, MessageHeaders headers) { UpdateTopoSubDevice updateTopoSubDevice = request.getData().getSubDevices().get(0); @@ -147,6 +147,11 @@ public class SDKDeviceService extends AbstractDeviceService { if (StringUtils.hasText(device.getChildDeviceSn())) { deviceService.getDeviceBySn(device.getChildDeviceSn()).ifPresent(device::setChildren); } + if(request.getData().getDroneChargeState() != null + && request.getData().getDroneChargeState().getState() == false + && request.getData().getDroneChargeState().getCapacityPercent() >= 80){ + deviceQrtzService.getDeviceQrtzFileEntity(device.getDeviceSn()); + } deviceRedisService.setDeviceOnline(device); fillDockOsd(from, request.getData());