From 3f43e40ed1a1e9f66b3ad2862da9dbc4b710c712 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 23 Oct 2026 14:09:47 +0800
Subject: [PATCH] 智云3.0机场1适配内容提交
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index b768415..a607a8b 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -44,7 +44,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.mqtt.support.MqttHeaders;
import org.springframework.messaging.Message;
@@ -116,9 +116,9 @@
@Resource
private AuthorizeService authorizeService;
+ // 机场1：OSD 按机型分发（原为 @Qualifier("gatewayOSDServiceImpl") ITSAService tsaService，直连 dock2 链头）
@Autowired
- @Qualifier("gatewayOSDServiceImpl")
- private ITSAService tsaService;
+ private DockOsdDispatcher dockOsdDispatcher;
@Resource
private ISysDeptService sysDeptService;
@@ -359,8 +359,13 @@
return;
}
- DeviceDTO subDevice =
- getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build()).get(0);
+ List<DeviceDTO> subDevices =
+ getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build());
+ if (CollectionUtils.isEmpty(subDevices)) {
+ log.warn("网关 {} 的子设备 {} 不存在，跳过拓扑拼接", gateway.getDeviceSn(), gateway.getChildDeviceSn());
+ return;
+ }
+ DeviceDTO subDevice = subDevices.get(0);
subDevice.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + subDevice.getDeviceSn()));
gateway.setChildren(subDevice);
@@ -410,8 +415,13 @@
if (!StringUtils.hasText(gateway.getChildDeviceSn())) {
return;
}
- DeviceDTO subDevice =
- getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build()).get(0);
+ List<DeviceDTO> subDevices =
+ getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build());
+ if (CollectionUtils.isEmpty(subDevices)) {
+ log.warn("网关 {} 的子设备 {} 不存在，跳过拓扑拼接", gateway.getDeviceSn(), gateway.getChildDeviceSn());
+ return;
+ }
+ DeviceDTO subDevice = subDevices.get(0);
subDevice.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + subDevice.getDeviceSn()));
gateway.setChildren(subDevice);
}
@@ -437,7 +447,7 @@
})
.eq(param.getBoundStatus() != null, DeviceEntity::getBoundStatus,
param.getBoundStatus())
- .like(param.getNickname()!=null, DeviceEntity::getNickname, "%" + param.getNickname() + "%")
+ .like(StringUtils.hasText(param.getNickname()), DeviceEntity::getNickname, "%" + param.getNickname() + "%")
.orderBy(param.isOrderBy(),
param.isAsc(), DeviceEntity::getId))
.stream()
@@ -662,7 +672,8 @@
.getValueAndUserType(UserTypeEnum.WEB.getVal());
- tsaService.handleOSD(receiver, device, webSessions, wsMessage);
+ // 机场1：OSD 按机型分发（dock1=67 → dock1 链；其余透传 dock2 原链）
+ dockOsdDispatcher.dispatch(receiver, device, webSessions, wsMessage);
} catch (NullPointerException e) {
log.error("处理OSD消息NPE，headers={}, payload={}",
@@ -746,7 +757,22 @@
}
// 调用验证方法
- return mapper.insert(entity) > 0 ? Optional.of(entity) : Optional.empty();
+ try {
+ return mapper.insert(entity) > 0 ? Optional.of(entity) : Optional.empty();
+ } catch (DuplicateKeyException e) {
+ // 机场首次上线时 MQTT QoS1 可能重复投递 update_topo（或多线程并发），
+ // 两个线程同时查到“设备不存在”后会并发 insert，后插入者触发唯一键冲突。
+ // 此时数据已被另一线程写入，退化为更新即可，避免整条状态消息处理失败。
+ DeviceEntity exist = mapper.selectOne(
+ new LambdaQueryWrapper<DeviceEntity>()
+ .eq(DeviceEntity::getDeviceSn, entity.getDeviceSn()));
+ if (exist == null) {
+ throw e;
+ }
+ entity.setId(exist.getId());
+ mapper.updateById(entity);
+ return Optional.of(exist);
+ }
}
/**
--
Gitblit v1.9.3