From 3ba2ea4de914835bc316826f2c7f93a648760e9c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 26 Sep 2023 16:24:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 d9d43a7..3f1ae9d 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
@@ -68,7 +68,7 @@
mapper.convertValue(Objects.nonNull(param) ? param : new Object(), controlMethodEnum.getClazz())
: new RemoteDebugHandler();
if (!handler.canPublish(sn)) {
- throw new RuntimeException("The current state of the dock does not support this function.");
+ throw new RuntimeException("当前的机场状态不支持此功能。");
}
if (Objects.nonNull(param) && !handler.valid()) {
throw new RuntimeException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
@@ -80,14 +80,14 @@
public ResponseResult controlDockDebug(String sn, String serviceIdentifier, RemoteDebugParam param) {
RemoteDebugMethodEnum controlMethodEnum = RemoteDebugMethodEnum.find(serviceIdentifier);
if (RemoteDebugMethodEnum.UNKNOWN == controlMethodEnum) {
- return ResponseResult.error("The " + serviceIdentifier + " method does not exist.");
+ return ResponseResult.error(" 没有找到" + serviceIdentifier + " 这个指令。");
}
RemoteDebugHandler data = checkDebugCondition(sn, param, controlMethodEnum);
boolean isExist = deviceRedisService.checkDeviceOnline(sn);
if (!isExist) {
- return ResponseResult.error("The dock is offline.");
+ return ResponseResult.error("设备离线");
}
String bid = UUID.randomUUID().toString();
ServiceReply serviceReply = messageSenderService.publishServicesTopic(sn, serviceIdentifier, data, bid);
@@ -298,4 +298,12 @@
: ResponseResult.success();
}
+ @Override
+ public ResponseResult requestsConfig(String sn,String method, RequestsParam param) {
+ ServiceReply serviceReply = messageSenderService.publishRequestsTopic(sn, method, param);
+ return ResponseResult.CODE_SUCCESS != serviceReply.getResult() ?
+ ResponseResult.error(serviceReply.getResult(), " Error Code:" + serviceReply.getResult())
+ : ResponseResult.success();
+ }
+
}
--
Gitblit v1.9.3