From dc0b17d8d9b6f2c17165cd394dbd74e304422a5c Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 14 Oct 2025 17:22:32 +0800
Subject: [PATCH] 1.重新修改文件分类。 2.整理文件名称统一规范。 3.修改新增时ID类型
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 32 ++++----------------------------
1 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index cc586d0..6858383 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -3,8 +3,6 @@
import com.ard.common.utils.ByteUtils;
import com.ard.work.aspect.annotation.CheckTakeoffAltitude;
import com.ard.work.aspect.annotation.CheckControlRight;
-import com.ard.work.component.netty.TcpClientSession;
-import com.ard.work.component.netty.TyTcpClientManager;
import com.ard.work.component.netty.command.BaseCmd;
import com.ard.work.component.netty.command.camera.*;
import com.ard.work.component.netty.command.manual.*;
@@ -47,14 +45,13 @@
import com.ard.work.component.netty.command.real.UavTelemetryDataCmd;
import com.ard.work.component.netty.handler.ErrorCodeEnum;
import com.ard.work.component.netty.protobuf.TelemetryDataPB;
-import com.ard.work.service.IArdDroneService;
-import com.ard.work.service.IArdServerService;
+import com.ard.work.service.IArdDroneInfoService;
+import com.ard.work.service.IArdServerInfoService;
import com.ard.work.service.ITyService;
import com.ard.work.domain.message.UavControlType;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -78,9 +75,9 @@
@Service
public class TyServiceImpl implements ITyService {
@Resource
- private IArdServerService ardServerService;
+ private IArdServerInfoService ardServerService;
@Resource
- private IArdDroneService ardDroneService;
+ private IArdDroneInfoService ardDroneService;
@Resource
private TyClient tyClient;
@@ -882,27 +879,6 @@
}
- /**
- * 定时向所有已连接的六合服务器发送心跳
- */
- @Scheduled(fixedRate = 5000) // 每5秒执行一次
- public void sendHeartBeat() {
- long timestamp = System.currentTimeMillis();
-
- for (TcpClientSession session : channels.values()) {
- ChannelFuture future = session.getChannelFuture();
- if (future == null || !future.channel().isActive()) {
- log.warn("边缘服务器 [{}] 连接未激活，跳过心跳发送", session.getServerId());
- continue;
- }
-
- HeartbeatCmd heartbeat = new HeartbeatCmd(timestamp);
- future.channel().writeAndFlush(heartbeat);
-
- log.info("→ 向边缘服务器 [{}] ({}:{}) 发送心跳，时间戳={}",
- session.getServerId(), session.getHost(), session.getPort(), timestamp);
- }
- }
/**
* 发送消息
*/
--
Gitblit v1.9.3