From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/manage/service/impl/DockOSDServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/DockOSDServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DockOSDServiceImpl.java
index 4c34cd5..afb9fc0 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DockOSDServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DockOSDServiceImpl.java
@@ -1,6 +1,8 @@
package com.dji.sample.manage.service.impl;
import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
+import com.dji.sample.component.redis.RedisConst;
+import com.dji.sample.component.redis.RedisOpsUtils;
import com.dji.sample.component.websocket.config.ConcurrentWebSocketSession;
import com.dji.sample.component.websocket.model.BizCodeEnum;
import com.dji.sample.component.websocket.model.CustomWebSocketMessage;
@@ -8,10 +10,10 @@
import com.dji.sample.manage.model.dto.TelemetryDTO;
import com.dji.sample.manage.model.enums.DeviceDomainEnum;
import com.dji.sample.manage.model.receiver.OsdDockReceiver;
-import com.dji.sample.manage.model.receiver.OsdDockTransmissionReceiver;
import org.springframework.stereotype.Service;
import java.util.Collection;
+import java.util.Objects;
/**
* @author sean
@@ -36,15 +38,25 @@
Collection<ConcurrentWebSocketSession> webSessions,
CustomWebSocketMessage<TelemetryDTO> wsMessage) {
- if (DeviceDomainEnum.DOCK.getDesc().equals(device.getDomain())) {
+ if (DeviceDomainEnum.DOCK.getVal() == device.getDomain()) {
wsMessage.setBizCode(BizCodeEnum.DOCK_OSD.getCode());
OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
wsMessage.getData().setHost(data);
- if (data.getSubDevice() == null) {
- OsdDockTransmissionReceiver transmission = mapper.convertValue(receiver.getData(), OsdDockTransmissionReceiver.class);
- wsMessage.getData().setHost(transmission);
- }
sendMessageService.sendBatch(webSessions, wsMessage);
+ String key = RedisConst.OSD_PREFIX + device.getDeviceSn();
+ OsdDockReceiver redisData = (OsdDockReceiver) RedisOpsUtils.get(key);
+ if (Objects.nonNull(data.getModeCode())) {
+ if (Objects.nonNull(redisData)) {
+ data.setDrcState(redisData.getDrcState());
+ }
+ RedisOpsUtils.setWithExpire(key, data, RedisConst.DEVICE_ALIVE_SECOND);
+ return;
+ }
+
+ if (Objects.nonNull(data.getDrcState()) && Objects.nonNull(redisData)) {
+ redisData.setDrcState(data.getDrcState());
+ RedisOpsUtils.setWithExpire(key, redisData, RedisConst.DEVICE_ALIVE_SECOND);
+ }
}
}
}
--
Gitblit v1.9.3