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 | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 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 7683a49..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
@@ -1,6 +1,8 @@
package com.ard.sample.manage.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ard.common.core.domain.model.LoginUser;
+import com.ard.common.utils.SecurityUtils;
import com.ard.device.camera.domain.ArdCamera;
import com.ard.device.camera.service.IArdCameraService;
import com.ard.device.channel.domain.ArdChannel;
@@ -42,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;
@@ -114,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;
@@ -357,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);
@@ -369,6 +376,7 @@
//region 单独写一个方法做权限验证，由于有好多定时任务也在实时获取设备列表，原方法不适用再添加权限注解
@Override
public List<DeviceDTO> getDockList(String nickname) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
List<DeviceDTO> devicesList = this.getDockListByParams(
DeviceQueryParam.builder()
.domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))
@@ -376,8 +384,9 @@
.build());
// 在獲取设备列表时，顺便获取直播地址
for(DeviceDTO devices : devicesList){
- _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn());
- _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn());
+ // 暂时注释掉机场设备视频直址 2026-04-01
+// _liveStreamHandler.StartLiveStreaming(devices.getDeviceSn(), loginUser.getUserId().toString());
+// _liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn(), loginUser.getUserId().toString());
ArdCamera ardCamera = new ArdCamera();
ardCamera.setDockId(devices.getId());
List<ArdCamera> ardCameraList = _cameraService.selectArdCameraList(ardCamera);
@@ -406,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);
}
@@ -433,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()
@@ -658,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={}",
@@ -742,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);
+ }
}
/**
@@ -1196,23 +1226,30 @@
return ResponseResult.success();
}
+ /**
+ * 属性设置
+ * */
@Override
- public void devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param) {
+ public ResponseResult devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param) {
boolean dockOnline = this.checkDeviceOnline(dockSn);
if (!dockOnline) {
- throw new RuntimeException(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
+ return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(),"机场" + CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
+ //throw new RuntimeException(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
}
DeviceDTO deviceDTO = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + dockSn);
boolean deviceOnline = this.checkDeviceOnline(deviceDTO.getChildDeviceSn());
if (!deviceOnline) {
- throw new RuntimeException("Device is offline.");
+ return ResponseResult.error(2222,"无人机" + CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
+ //throw new RuntimeException("Device is offline.");
+ // CommonErrorEnum.DEVICE_OFFLINE.getErrorCode()
}
// Make sure the data is valid.
BasicDeviceProperty basicDeviceProperty = objectMapper.convertValue(param, propertyEnum.getClazz());
boolean valid = basicDeviceProperty.valid();
if (!valid) {
- throw new IllegalArgumentException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
+ return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
+ // throw new IllegalArgumentException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
}
String topic = THING_MODEL_PRE + PRODUCT + dockSn + PROPERTY_SUF + SET_SUF;
@@ -1220,12 +1257,14 @@
(OsdSubDeviceReceiver) RedisOpsUtils.get(RedisConst.OSD_PREFIX + deviceDTO.getChildDeviceSn());
if (!param.isObject()) {
this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), param));
- return;
+ return ResponseResult.success();
+// return;
}
if(param.size()==1){
this.deviceOnePropertySetSilent(topic,propertyEnum,param);
- return;
+ return ResponseResult.success();
+// return;
}
// if(Objects.equals(param.fieldNames().next(), "silent_mode"))
// {
@@ -1242,7 +1281,7 @@
this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), node));
}
-
+ return ResponseResult.success();
}
/**
@@ -1504,7 +1543,7 @@
CommonTopicReceiver<Map<String,Integer>> stateReceiver = new CommonTopicReceiver<>();
stateReceiver.setTid(UUID.randomUUID().toString());
stateReceiver.setBid(UUID.randomUUID().toString());
- stateReceiver.setType(MessageType.LIVESTREAM.getType());
+ stateReceiver.setType(MessageType.LIVESTATUS.getType());
stateReceiver.setGateway(sn);
stateReceiver.setTimestamp(System.currentTimeMillis());
Map<String,Integer> live_status = new HashMap<>();
--
Gitblit v1.9.3