From 694b9483c7a551626244cbc222c602ea9ff74094 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Tue, 25 Apr 2023 21:44:00 +0800
Subject: [PATCH] What's new? 1. Wayline management: added `pause wayline task` and `recover wayline task`. 2. Added command flight function. 3. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/DockOSDServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 36cd9b3..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;
@@ -11,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.Collection;
+import java.util.Objects;
/**
* @author sean
@@ -40,6 +43,20 @@
OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
wsMessage.getData().setHost(data);
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