From 2caa210098644f51ff46daa33b87ce4b7f862a91 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev
---
src/main/java/com/dji/sample/control/service/impl/DrcServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/control/service/impl/DrcServiceImpl.java b/src/main/java/com/dji/sample/control/service/impl/DrcServiceImpl.java
index 7266142..aade731 100644
--- a/src/main/java/com/dji/sample/control/service/impl/DrcServiceImpl.java
+++ b/src/main/java/com/dji/sample/control/service/impl/DrcServiceImpl.java
@@ -63,10 +63,10 @@
@Autowired
private IDeviceService deviceService;
-
+
@Autowired
private ObjectMapper mapper;
-
+
@Autowired
private ISendMessageService webSocketMessageService;
@@ -190,13 +190,13 @@
@Override
public void deviceDrcExit(String workspaceId, DrcModeParam param) {
if (!deviceService.checkDockDrcMode(param.getDockSn())) {
- throw new RuntimeException("The dock is not in flight control mode.");
+ throw new RuntimeException("机场没有进入飞行控制模式");
}
ServiceReply reply = messageSenderService.publishServicesTopic(
param.getDockSn(), DrcMethodEnum.DRC_MODE_EXIT.getMethod(), "");
if (ResponseResult.CODE_SUCCESS != reply.getResult()) {
throw new RuntimeException("SN: " + param.getDockSn() + "; Error Code:" +
- reply.getResult() + "; Failed to exit command flight control mode, please try again later!");
+ reply.getResult() + "; 命令飞行控制模式退出失败，请稍后再试!");
}
String jobId = waylineRedisService.getPausedWaylineJobId(param.getDockSn());
--
Gitblit v1.9.3