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/control/service/impl/ControlServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java b/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
index 511416d..beb1e29 100644
--- a/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
+++ b/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
@@ -38,9 +38,6 @@
public class ControlServiceImpl implements IControlService {
@Autowired
- private RedisOpsUtils redisOps;
-
- @Autowired
private IMessageSenderService messageSenderService;
@Autowired
@@ -62,6 +59,7 @@
return ResponseResult.error("The " + serviceIdentifier + " method does not exist.");
}
+ Object data = "";
// Add parameter validation.
if (Objects.nonNull(controlMethodEnum.getClazz())) {
if (Objects.isNull(param)) {
@@ -71,6 +69,7 @@
if (!basicDeviceProperty.valid()) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
+ data = basicDeviceProperty;
}
boolean isExist = deviceService.checkDeviceOnline(sn);
@@ -85,16 +84,18 @@
.bid(bid)
.method(serviceIdentifier)
.timestamp(System.currentTimeMillis())
- .data(Objects.requireNonNullElse(param, ""))
+ .data(data)
.build());
ServiceReply<EventsOutputReceiver> serviceReply = mapper.convertValue(
serviceReplyOpt, new TypeReference<ServiceReply<EventsOutputReceiver>>() {});
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
- return ResponseResult.error(serviceReply.getResult(), serviceReply.getOutput().getStatus());
+ return ResponseResult.error(serviceReply.getResult(),
+ Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus()
+ : "error: " + serviceIdentifier + serviceReply.getResult());
}
if (controlMethodEnum.getProgress()) {
- redisOps.setWithExpire(serviceIdentifier + RedisConst.DELIMITER + bid, sn,
+ RedisOpsUtils.setWithExpire(serviceIdentifier + RedisConst.DELIMITER + bid, sn,
RedisConst.DEVICE_ALIVE_SECOND * RedisConst.DEVICE_ALIVE_SECOND);
}
return ResponseResult.success();
@@ -104,10 +105,10 @@
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_CONTROL_PROGRESS, outputChannel = ChannelName.OUTBOUND)
public void handleControlProgress(CommonTopicReceiver receiver, MessageHeaders headers) {
String key = receiver.getMethod() + RedisConst.DELIMITER + receiver.getBid();
- if (redisOps.getExpire(key) <= 0) {
+ if (RedisOpsUtils.getExpire(key) <= 0) {
return;
}
- String sn = redisOps.get(key).toString();
+ String sn = RedisOpsUtils.get(key).toString();
EventsReceiver<EventsOutputReceiver> eventsReceiver = mapper.convertValue(receiver.getData(),
new TypeReference<EventsReceiver<EventsOutputReceiver>>(){});
@@ -123,10 +124,10 @@
if (eventsReceiver.getOutput().getProgress().getPercent() == 100 ||
EventsResultStatusEnum.find(eventsReceiver.getOutput().getStatus()).getEnd()) {
- redisOps.del(key);
+ RedisOpsUtils.del(key);
}
- DeviceDTO device = (DeviceDTO) redisOps.get(RedisConst.DEVICE_ONLINE_PREFIX + sn);
+ DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + sn);
webSocketMessageService.sendBatch(
webSocketManageService.getValueWithWorkspaceAndUserType(
device.getWorkspaceId(), UserTypeEnum.WEB.getVal()),
--
Gitblit v1.9.3