From fa7479cd93d2b87c3a62a7c954c1833df34f3f0c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 03 Aug 2024 17:50:00 +0800
Subject: [PATCH] 国土调查注册对接，完成注册接口，完成SM2和SM4加密解密方法
---
src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 3e36a3b..56955a2 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
@@ -33,6 +33,7 @@
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.MessageHeaders;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.*;
@@ -336,8 +337,9 @@
@Override
public ResponseResult takeoffToPoint(String sn, TakeoffToPointParam param) {
checkTakeoffCondition(sn);
-
- param.setFlightId(UUID.randomUUID().toString());
+ if (!StringUtils.hasText(param.getFlightId())){
+ param.setFlightId(UUID.randomUUID().toString());
+ }
ServiceReply reply = messageSenderService.publishServicesTopic(sn, DroneControlMethodEnum.TAKE_OFF_TO_POINT.getMethod(), param, param.getFlightId());
return ResponseResult.CODE_SUCCESS != reply.getResult() ?
ResponseResult.error("无人机起飞失败 " + reply.getResult())
--
Gitblit v1.9.3