From 642dac3e705380eea241648f875836e64dbc809e Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Thu, 18 May 2023 17:43:06 +0800
Subject: [PATCH] Merge branch 'v1.5.0' What's new? 1. Add new model: DJI Matrices 350 RTK. 2. Update file hms.json. 3. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
index 9ef86b1..5d2c8cd 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -4,31 +4,25 @@
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.CommonTopicResponse;
import com.dji.sample.component.mqtt.model.ServiceReply;
-import com.dji.sample.component.mqtt.model.ServicesMethodEnum;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
import com.dji.sample.manage.model.dto.*;
import com.dji.sample.manage.model.enums.DeviceDomainEnum;
+import com.dji.sample.manage.model.enums.LiveStreamMethodEnum;
import com.dji.sample.manage.model.enums.LiveUrlTypeEnum;
import com.dji.sample.manage.model.enums.LiveVideoQualityEnum;
import com.dji.sample.manage.model.param.DeviceQueryParam;
import com.dji.sample.manage.model.receiver.CapacityDeviceReceiver;
import com.dji.sample.manage.model.receiver.LiveCapacityReceiver;
-import com.dji.sample.manage.service.ICapacityCameraService;
-import com.dji.sample.manage.service.IDeviceService;
-import com.dji.sample.manage.service.ILiveStreamService;
-import com.dji.sample.manage.service.IWorkspaceService;
+import com.dji.sample.manage.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -56,7 +50,7 @@
private IMessageSenderService messageSender;
@Autowired
- private RedisOpsUtils redisOps;
+ private IDeviceRedisService deviceRedisService;
@Override
public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId) {
@@ -70,9 +64,9 @@
// Query the live capability of each drone.
return devicesList.stream()
- .filter(device -> redisOps.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn()))
+ .filter(device -> deviceRedisService.checkDeviceOnline(device.getDeviceSn()))
.map(device -> CapacityDeviceDTO.builder()
- .name(device.getDeviceName())
+ .name(Objects.requireNonNullElse(device.getNickname(), device.getDeviceName()))
.sn(device.getDeviceSn())
.camerasList(capacityCameraService.getCapacityCameraByDeviceSn(device.getDeviceSn()))
.build())
@@ -80,11 +74,17 @@
}
@Override
- public void saveLiveCapacity(LiveCapacityReceiver liveCapacityReceiver) {
+ public void saveLiveCapacity(LiveCapacityReceiver liveCapacityReceiver, Long timestamp) {
+ // Solve timing problems
for (CapacityDeviceReceiver capacityDeviceReceiver : liveCapacityReceiver.getDeviceList()) {
+ long last = (long) Objects.requireNonNullElse(
+ RedisOpsUtils.get(RedisConst.LIVE_CAPACITY + capacityDeviceReceiver.getSn()), 0L);
+ if (last > timestamp) {
+ return;
+ }
capacityCameraService.saveCapacityCameraReceiverList(
capacityDeviceReceiver.getCameraList(),
- capacityDeviceReceiver.getSn());
+ capacityDeviceReceiver.getSn(), timestamp);
}
}
@@ -92,7 +92,7 @@
public ResponseResult liveStart(LiveTypeDTO liveParam) {
// Check if this lens is available live.
ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
- if (responseResult.getCode() != 0) {
+ if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
return responseResult;
}
@@ -100,13 +100,10 @@
// target topic
String respTopic = THING_MODEL_PRE + PRODUCT +
data.getDeviceSn() + SERVICES_SUF;
- Optional<ServiceReply> receiveReplyOpt = this.publishLiveStart(respTopic, liveParam);
+ ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
- if (receiveReplyOpt.isEmpty()) {
- return ResponseResult.error(LiveErrorEnum.NO_REPLY);
- }
- if (receiveReplyOpt.get().getResult() != 0) {
- return ResponseResult.error(LiveErrorEnum.find(receiveReplyOpt.get().getResult()));
+ if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+ return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
@@ -128,7 +125,7 @@
.toString());
break;
case RTSP:
- String url = receiveReplyOpt.get().getInfo().toString();
+ String url = receiveReply.getOutput().toString();
this.resolveUrlUser(url, live);
break;
case UNKNOWN:
@@ -147,12 +144,9 @@
String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;
- Optional<ServiceReply> receiveReplyOpt = this.publishLiveStop(respTopic, videoId);
- if (receiveReplyOpt.isEmpty()) {
- return ResponseResult.error(LiveErrorEnum.NO_REPLY);
- }
- if (receiveReplyOpt.get().getResult() != 0) {
- return ResponseResult.error(LiveErrorEnum.find(receiveReplyOpt.get().getResult()));
+ ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
+ if (receiveReply.getResult() != 0) {
+ return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
return ResponseResult.success();
@@ -173,15 +167,47 @@
String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;
- Optional<ServiceReply> receiveReplyOpt = this.publishLiveSetQuality(respTopic, liveParam);
- if (receiveReplyOpt.isEmpty()) {
- return ResponseResult.error(LiveErrorEnum.NO_REPLY);
- }
- if (receiveReplyOpt.get().getResult() != 0) {
- return ResponseResult.error(LiveErrorEnum.find(receiveReplyOpt.get().getResult()));
+ ServiceReply receiveReply = this.publishLiveSetQuality(respTopic, liveParam);
+ if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+ return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
return ResponseResult.success();
+ }
+
+ @Override
+ public ResponseResult liveLensChange(LiveTypeDTO liveParam) {
+ if (!StringUtils.hasText(liveParam.getVideoType())) {
+ return ResponseResult.error(LiveErrorEnum.ERROR_PARAMETERS);
+ }
+
+ ResponseResult<DeviceDTO> responseResult = this.checkBeforeLive(liveParam.getVideoId());
+ if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
+ return responseResult;
+ }
+ if (DeviceDomainEnum.GATEWAY.getVal() == responseResult.getData().getDomain()) {
+ return ResponseResult.error(LiveErrorEnum.FUNCTION_NOT_SUPPORT);
+ }
+
+ String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;
+
+ ServiceReply receiveReply = this.publishLiveLensChange(respTopic, liveParam);
+
+ if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+ return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
+ }
+
+ return ResponseResult.success();
+ }
+
+ private ServiceReply publishLiveLensChange(String respTopic, LiveTypeDTO liveParam) {
+ CommonTopicResponse<LiveTypeDTO> response = new CommonTopicResponse<>();
+ response.setTid(UUID.randomUUID().toString());
+ response.setBid(UUID.randomUUID().toString());
+ response.setMethod(LiveStreamMethodEnum.LIVE_LENS_CHANGE.getMethod());
+ response.setData(liveParam);
+
+ return messageSender.publishWithReply(ServiceReply.class, respTopic, response);
}
/**
@@ -190,6 +216,9 @@
* @return
*/
private ResponseResult<DeviceDTO> checkBeforeLive(String videoId) {
+ if (!StringUtils.hasText(videoId)) {
+ return ResponseResult.error(LiveErrorEnum.ERROR_PARAMETERS);
+ }
String[] videoIdArr = videoId.split("/");
// drone sn / enumeration value of the location where the payload is mounted / payload lens
if (videoIdArr.length != 3) {
@@ -202,7 +231,7 @@
return ResponseResult.error(LiveErrorEnum.NO_AIRCRAFT);
}
- if (deviceOpt.get().getDomain().equals(DeviceDomainEnum.DOCK.getDesc())) {
+ if (DeviceDomainEnum.DOCK.getVal() == deviceOpt.get().getDomain()) {
return ResponseResult.success(deviceOpt.get());
}
List<DeviceDTO> gatewayList = deviceService.getDevicesByParams(
@@ -268,14 +297,14 @@
* @param liveParam
* @return
*/
- private Optional<ServiceReply> publishLiveStart(String topic, LiveTypeDTO liveParam) {
+ private ServiceReply publishLiveStart(String topic, LiveTypeDTO liveParam) {
CommonTopicResponse<LiveTypeDTO> response = new CommonTopicResponse<>();
response.setTid(UUID.randomUUID().toString());
response.setBid(UUID.randomUUID().toString());
response.setData(liveParam);
- response.setMethod(ServicesMethodEnum.LIVE_START_PUSH.getMethod());
+ response.setMethod(LiveStreamMethodEnum.LIVE_START_PUSH.getMethod());
- return messageSender.publishWithReply(topic, response);
+ return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
/**
@@ -284,17 +313,17 @@
* @param liveParam
* @return
*/
- private Optional<ServiceReply> publishLiveSetQuality(String respTopic, LiveTypeDTO liveParam) {
+ private ServiceReply publishLiveSetQuality(String respTopic, LiveTypeDTO liveParam) {
Map<String, Object> data = new ConcurrentHashMap<>(Map.of(
"video_id", liveParam.getVideoId(),
"video_quality", liveParam.getVideoQuality()));
CommonTopicResponse<Map<String, Object>> response = new CommonTopicResponse<>();
response.setTid(UUID.randomUUID().toString());
response.setBid(UUID.randomUUID().toString());
- response.setMethod(ServicesMethodEnum.LIVE_SET_QUALITY.getMethod());
+ response.setMethod(LiveStreamMethodEnum.LIVE_SET_QUALITY.getMethod());
response.setData(data);
- return messageSender.publishWithReply(respTopic, response);
+ return messageSender.publishWithReply(ServiceReply.class, respTopic, response);
}
/**
@@ -303,15 +332,15 @@
* @param videoId
* @return
*/
- private Optional<ServiceReply> publishLiveStop(String topic, String videoId) {
+ private ServiceReply publishLiveStop(String topic, String videoId) {
Map<String, String> data = new ConcurrentHashMap<>(Map.of("video_id", videoId));
CommonTopicResponse<Map<String, String>> response = new CommonTopicResponse<>();
response.setTid(UUID.randomUUID().toString());
response.setBid(UUID.randomUUID().toString());
response.setData(data);
- response.setMethod(ServicesMethodEnum.LIVE_STOP_PUSH.getMethod());
+ response.setMethod(LiveStreamMethodEnum.LIVE_STOP_PUSH.getMethod());
- return messageSender.publishWithReply(topic, response);
+ return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
}
\ No newline at end of file
--
Gitblit v1.9.3