添加抢夺飞机控制权监控日志

Backend/sample/src/main/java/com/dji/sample/component/mqtt/config/MqttPropertyConfiguration.java

@@ -7,6 +7,7 @@ import com.dji.sample.component.mqtt.model.MqttProtocolEnum;
 import com.dji.sample.component.mqtt.model.MqttUseEnum;
 import com.dji.sdk.cloudapi.control.DrcModeMqttBroker;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -25,6 +26,7 @@ import java.util.Map;
  */
 @Configuration
 @Data
+@Slf4j
 @ConfigurationProperties
 public class MqttPropertyConfiguration {
 
@@ -87,13 +89,15 @@ public class MqttPropertyConfiguration {
 
         String token = JwtUtil.createToken(map, age, algorithm, null, null);
 
-        return new DrcModeMqttBroker()
+        DrcModeMqttBroker broker = new DrcModeMqttBroker()
                 .setAddress(getMqttAddress(mqtt.get(MqttUseEnum.DRC)))
                 .setUsername(username)
                 .setClientId(clientId)
                 .setExpireTime(System.currentTimeMillis() / 1000 + age)
                 .setPassword(token)
                 .setEnableTls(false);
+        log.info("==============发送指令飞行控制模式Broker信息：" + broker);
+        return broker;
     }
 
 

Backend/sample/src/main/java/com/dji/sample/component/redis/RedisConst.java

@@ -55,7 +55,7 @@ public final class RedisConst {
 
     public static final String DRC_PREFIX = "drc" + DELIMITER;
 
-    public static final Integer DRC_MODE_ALIVE_SECOND = 3600;
+    public static final Integer DRC_MODE_ALIVE_SECOND = 3600 * 9;
 
     public static final String MQTT_ACL_PREFIX = "mqtt_acl" + DELIMITER;
 

Backend/sample/src/main/java/com/dji/sample/control/service/impl/DrcServiceImpl.java

@@ -174,7 +174,7 @@ public class DrcServiceImpl implements IDrcService {
         }
 
         checkDrcModeCondition(workspaceId, param.getDockSn());
-
+        log.info("=================drcModeEnter====docksn:" + param.getDockSn() + ",当前时间：" + System.currentTimeMillis() + ",pubTopic：" + pubTopic + ",subTopic:" + subTopic);
         TopicServicesResponse<ServicesReplyData> reply = abstractControlService.drcModeEnter(
                 SDKManager.getDeviceSDK(param.getDockSn()),
                 new DrcModeEnterRequest()
@@ -187,8 +187,9 @@ public class DrcServiceImpl implements IDrcService {
                         .setHsiFrequency(1).setOsdFrequency(10));
 
         if (!reply.getData().getResult().isSuccess()) {
-            throw new RuntimeException("SN: " + param.getDockSn() + "; Error:" + reply.getData().getResult() +
-                    "; Failed to enter command flight control mode, please try again later!");
+            String message = "SN: " + param.getDockSn() + "; Error:" + reply.getData().getResult() + "; Failed to enter command flight control mode, please try again later!";
+            log.error("=================drcModeEnter 失败：" + message);
+            throw new RuntimeException(message);
         }
 
         refreshAcl(param.getDockSn(), param.getClientId(), pubTopic, subTopic);