diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java index 00026f3..ee527a7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java @@ -42,16 +42,11 @@ public class GlobalScheduleService { @Scheduled(initialDelay = 10, fixedRate = 30, timeUnit = TimeUnit.SECONDS) private void deviceStatusListen() { int start = RedisConst.DEVICE_ONLINE_PREFIX.length(); + redisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*").forEach(key -> { long expire = redisOpsUtils.getExpire(key); if (expire <= 30) { DeviceDTO device = (DeviceDTO) redisOpsUtils.get(key); - if (null == device) { - return; - } - if(device.getWorkspaceId().isEmpty()){ - return; - } if (DeviceDomainEnum.DRONE == device.getDomain()) { deviceService.subDeviceOffline(key.substring(start)); } else { 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 49765c0..25a6fae 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 @@ -1,5 +1,6 @@ package org.dromara.sample.manage.service.impl; +import cn.hutool.core.util.ObjectUtil; import org.dromara.common.sdk.cloudapi.device.*; import org.dromara.common.sdk.cloudapi.device.api.AbstractDeviceService; import org.dromara.common.sdk.cloudapi.psdk.PsdkUiResource; @@ -109,6 +110,8 @@ public class SDKDeviceService extends AbstractDeviceService { @Override public TopicStatusResponse updateTopoOffline(TopicStatusRequest request, MessageHeaders headers) { + + GatewayManager gatewayManager = SDKManager.registerDevice(request.getFrom(), null, request.getData().getDomain(), request.getData().getType(), request.getData().getSubType(), request.getData().getThingVersion(), null); @@ -120,7 +123,7 @@ public class SDKDeviceService extends AbstractDeviceService { DeviceDTO gatewayDevice = deviceGatewayConvertToDevice(request.getFrom(), request.getData()); Optional gatewayDeviceOpt = onlineSaveDevice(gatewayDevice, null, null); if (gatewayDeviceOpt.isEmpty()) { - return null; + return new TopicStatusResponse().setData(MqttReply.success()); } deviceService.pushDeviceOnlineTopo(gatewayDeviceOpt.get().getWorkspaceId(), request.getFrom(), null); return new TopicStatusResponse().setData(MqttReply.success()); @@ -142,15 +145,14 @@ public class SDKDeviceService extends AbstractDeviceService { if (deviceOpt.isEmpty() || !StringUtils.hasText(deviceOpt.get().getWorkspaceId())) { deviceOpt = deviceService.getDeviceBySn(from); if (deviceOpt.isEmpty()) { - log.error("请重新启动无人机。"); + return; + } + if(!StringUtils.hasText(deviceOpt.get().getWorkspaceId())){ return; } } DeviceDTO device = deviceOpt.get(); - if (!StringUtils.hasText(device.getWorkspaceId())) { - log.error("请先绑好码头。"); - } if (StringUtils.hasText(device.getChildDeviceSn())) { deviceService.getDeviceBySn(device.getChildDeviceSn()).ifPresent(device::setChildren); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java index 51c33dc..19ea60b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java @@ -61,9 +61,6 @@ public class SDKOrganizationService extends AbstractOrganizationService { @Override public TopicRequestsResponse> airportOrganizationGet(TopicRequestsRequest request, MessageHeaders headers) { AirportOrganizationGetRequest organizationGet = request.getData(); - if (!StringUtils.hasText(organizationGet.getDeviceBindingCode())) { - return new TopicRequestsResponse().setData(MqttReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT)); - } Optional workspace = workspaceService.getWorkspaceNameByBindCode(organizationGet.getDeviceBindingCode()); if (workspace.isEmpty()) { diff --git a/dk-modules/sample/src/main/resources/logback-plus.xml b/dk-modules/sample/src/main/resources/logback-plus.xml index a2fd413..5f53936 100644 --- a/dk-modules/sample/src/main/resources/logback-plus.xml +++ b/dk-modules/sample/src/main/resources/logback-plus.xml @@ -12,10 +12,10 @@ ${console.log.pattern} utf-8 - - - - + + + ERROR + @@ -26,7 +26,7 @@ - +