From 0d9fb1b9336da142d070109782a8c260744f5e57 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 12:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java | 63 ++++++++++++++++++++-----------
ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java | 4 +-
ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java | 1
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java | 6 +-
4 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
index 42cd0a1..49272f5 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
@@ -53,7 +53,7 @@
@Override
protected void initChannel(SocketChannel socketChannel) {
ChannelPipeline pipeline = socketChannel.pipeline();
- pipeline.addLast("heart", new IdleStateHandler(0, 5, 0, TimeUnit.SECONDS));
+ pipeline.addLast("heart", new IdleStateHandler(5, 5, 0, TimeUnit.SECONDS));
pipeline.addLast("encoder", new MessageProtocolEncoder());
pipeline.addLast("decoder", new MessageProtocolDecoder());
pipeline.addLast("handler", clientHandler);
@@ -140,7 +140,7 @@
}
}
- @Scheduled(fixedDelay = 10000) // 每 10 秒检查一次
+ @Scheduled(fixedDelay = 5000) // 每 5 秒检查一次
public void reconnectFailedServers() {
TyTcpServerCache.getTcpServerCacheMap().forEach((key, state) -> {
if (Boolean.FALSE.equals(state)) { // 连接失败的服务器
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java b/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
index ba614ae..0613572 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
@@ -63,6 +63,7 @@
switch (event.state()) {
case READER_IDLE:
log.debug("读空闲超时 - 可能服务器未响应");
+ ctx.close(); // <-- 必须加这句
break;
case WRITER_IDLE:
// 写空闲时主动发心跳
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
index 051b21b..c4366ea 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java
@@ -10,12 +10,15 @@
import com.ard.system.authorize.service.AuthorizeService;
import com.ard.work.domain.dto.BoxSettingsDTO;
import com.ard.work.domain.entity.ArdDroneInfo;
+import com.ard.work.domain.entity.ArdServerInfo;
import com.ard.work.domain.receiver.BoxInfoReceiver;
import com.ard.work.domain.receiver.BoxStreamUrlReceiver;
import com.ard.work.mapper.ArdDroneInfoMapper;
import com.ard.work.service.IArdDroneInfoService;
+import com.ard.work.service.IArdServerInfoService;
import com.ard.work.service.ITyService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
@@ -45,6 +48,9 @@
@Resource
private RedisCache redisCache;
+
+ @Autowired
+ private IArdServerInfoService ardServerInfoService;
/**
* 查询无人机盒子
@@ -113,7 +119,8 @@
*/
@Override
public int updateArdDrone(ArdDroneInfo ArdDroneInfo) {
- Boolean b = tyService.updateBoxSettings(BoxSettingsDTO.builder().boxSn(ArdDroneInfo.getBoxSn()).boxName(ArdDroneInfo.getBoxName()).build());
+ Boolean b =
+ tyService.updateBoxSettings(BoxSettingsDTO.builder().boxSn(ArdDroneInfo.getBoxSn()).boxName(ArdDroneInfo.getBoxName()).build());
if (!b) {
throw new ServiceException("修改无人机盒子名称失败");
}
@@ -277,29 +284,39 @@
*/
@Scheduled(fixedRate = 1000 * 5)
public void syncBoxInfo() {
- List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo() {{
- setUseDataScope(false);
- }});
- Map<String, ArdDroneInfo> localMap = localList.stream()
- .collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
-
- tyService.getBoxList().forEach(remote -> {
- String boxSn = remote.getBoxSn();
-
- // ✅ 维护在线状态缓存
- // 只有在线的无人机才存 Redis
- String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
- if (remote.getOnLine() == 1) {
- redisCache.setCacheObject(redisKey, remote, 30, TimeUnit.SECONDS);
- } else {
- redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ ArdServerInfo ardServerInfo = new ArdServerInfo();
+ ardServerInfo.setUseDataScope(false);
+ List<ArdServerInfo> servers = ardServerInfoService.selectArdServerInfoList(ardServerInfo);
+ servers.forEach(server -> {
+ ArdDroneInfo droneInfo = new ArdDroneInfo();
+ droneInfo.setServerId(server.getId());
+ droneInfo.setUseDataScope(false);
+ List<ArdDroneInfo> localList = selectArdDroneList(droneInfo);
+ Map<String, ArdDroneInfo> localMap = localList.stream()
+ .collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
+ List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
+ if (boxList == null) {
+ updateArdDrone(ArdDroneInfo.builder().serverId(server.getId()).onLine(0).build());
+ return;
}
- // 数据库同步
- ArdDroneInfo local = localMap.get(boxSn);
- if (local != null && !local.isSameAs(remote)) {
- updateChangedAttributes(local, remote);
- updateArdDrone(local);
- }
+ boxList.forEach(remote -> {
+ String boxSn = remote.getBoxSn();
+
+ // ✅ 维护在线状态缓存
+ // 只有在线的无人机才存 Redis
+ String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
+ if (remote.getOnLine() == 1) {
+ redisCache.setCacheObject(redisKey, remote, 30, TimeUnit.SECONDS);
+ } else {
+ redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
+ }
+ // 数据库同步
+ ArdDroneInfo local = localMap.get(boxSn);
+ if (local != null && !local.isSameAs(remote)) {
+ updateChangedAttributes(local, remote);
+ updateArdDrone(local);
+ }
+ });
});
}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
index dc38ada..d4063de 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
@@ -133,9 +133,9 @@
.encryptStr(getEncryptStr(serverInfo, timeStamp))
.timeStamp(timeStamp)
.build();
- // try {
- TyHttpCommonReceiver<AccessTokenReceiver> getTokenRes = tyClient.getToken(id, gtd);
- return getTokenRes.getContent();
+ // try {
+ TyHttpCommonReceiver<AccessTokenReceiver> getTokenRes = tyClient.getToken(id, gtd);
+ return getTokenRes.getContent();
// } catch (Exception e) {
// log.error("获取 Token 失败 serverId={}, 异常: {}", id, e.getMessage());
// return null; // 请求失败返回 null
--
Gitblit v1.9.3