From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/AbstractTSAService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/AbstractTSAService.java b/src/main/java/com/dji/sample/manage/service/impl/AbstractTSAService.java
index 35597fa..91e390a 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/AbstractTSAService.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/AbstractTSAService.java
@@ -1,16 +1,16 @@
package com.dji.sample.manage.service.impl;
-import com.dji.sample.component.mqtt.model.TopicStateReceiver;
+import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
import com.dji.sample.component.websocket.config.ConcurrentWebSocketSession;
import com.dji.sample.component.websocket.model.BizCodeEnum;
import com.dji.sample.component.websocket.model.CustomWebSocketMessage;
-import com.dji.sample.component.websocket.model.WebSocketManager;
import com.dji.sample.component.websocket.service.ISendMessageService;
+import com.dji.sample.component.websocket.service.IWebSocketManageService;
+import com.dji.sample.manage.model.dto.DeviceDTO;
import com.dji.sample.manage.model.dto.TelemetryDTO;
import com.dji.sample.manage.model.enums.UserTypeEnum;
import com.dji.sample.manage.service.ITSAService;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
@@ -24,6 +24,12 @@
protected AbstractTSAService tsaService;
+ @Autowired
+ protected ObjectMapper mapper;
+
+ @Autowired
+ private IWebSocketManageService webSocketManageService;
+
public AbstractTSAService(AbstractTSAService tsaService) {
this.tsaService = tsaService;
}
@@ -34,9 +40,8 @@
@Override
public void pushTelemetryData(String workspaceId, Object osdData, String sn) {
// All connected accounts on the pilot side of this workspace.
- Collection<ConcurrentWebSocketSession> pilotSessions = WebSocketManager
- .getValueWithWorkspaceAndUserType(
- workspaceId, UserTypeEnum.PILOT.getVal());
+ Collection<ConcurrentWebSocketSession> pilotSessions = webSocketManageService
+ .getValueWithWorkspaceAndUserType(workspaceId, UserTypeEnum.PILOT.getVal());
TelemetryDTO telemetry = TelemetryDTO.builder()
.sn(sn)
@@ -53,7 +58,6 @@
public abstract void pushTelemetryData(Collection<ConcurrentWebSocketSession> sessions,
CustomWebSocketMessage<TelemetryDTO> message, Object Object);
- protected abstract void handleOSD(TopicStateReceiver receiver, String sn, String workspaceId, JsonNode hostNode,
- Collection<ConcurrentWebSocketSession> webSessions, CustomWebSocketMessage wsMessage)
- throws JsonProcessingException;
+ public abstract void handleOSD(CommonTopicReceiver receiver, DeviceDTO device,
+ Collection<ConcurrentWebSocketSession> webSessions, CustomWebSocketMessage<TelemetryDTO> wsMessage);
}
--
Gitblit v1.9.3