|
@ -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.dto.DevicePayloadReceiver; |
|
|
import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum; |
|
|
import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum; |
|
|
import org.dromara.sample.manage.model.param.DeviceQueryParam; |
|
|
import org.dromara.sample.manage.model.param.DeviceQueryParam; |
|
|
import org.dromara.sample.manage.service.IDeviceDictionaryService; |
|
|
import org.dromara.sample.manage.service.*; |
|
|
import org.dromara.sample.manage.service.IDevicePayloadService; |
|
|
|
|
|
import org.dromara.sample.manage.service.IDeviceRedisService; |
|
|
|
|
|
import org.dromara.sample.manage.service.IDeviceService; |
|
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.messaging.MessageHeaders; |
|
|
import org.springframework.messaging.MessageHeaders; |
|
@ -53,6 +50,9 @@ public class SDKDeviceService extends AbstractDeviceService { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private IDevicePayloadService devicePayloadService; |
|
|
private IDevicePayloadService devicePayloadService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private IDeviceQrtzService deviceQrtzService; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public TopicStatusResponse<MqttReply> updateTopoOnline(TopicStatusRequest<UpdateTopo> request, MessageHeaders headers) { |
|
|
public TopicStatusResponse<MqttReply> updateTopoOnline(TopicStatusRequest<UpdateTopo> request, MessageHeaders headers) { |
|
|
UpdateTopoSubDevice updateTopoSubDevice = request.getData().getSubDevices().get(0); |
|
|
UpdateTopoSubDevice updateTopoSubDevice = request.getData().getSubDevices().get(0); |
|
@ -147,6 +147,11 @@ public class SDKDeviceService extends AbstractDeviceService { |
|
|
if (StringUtils.hasText(device.getChildDeviceSn())) { |
|
|
if (StringUtils.hasText(device.getChildDeviceSn())) { |
|
|
deviceService.getDeviceBySn(device.getChildDeviceSn()).ifPresent(device::setChildren); |
|
|
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); |
|
|
deviceRedisService.setDeviceOnline(device); |
|
|
fillDockOsd(from, request.getData()); |
|
|
fillDockOsd(from, request.getData()); |
|
|