From 3eb98b88c32d8c50d096d59c1b71e6bcfe8f074a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 15:24:18 +0800
Subject: [PATCH] 2025-11-6 zwy 调整静音模式功能BUG
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 254 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 233 insertions(+), 21 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 e62cb5f..b9c7713 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,12 @@
package com.ard.sample.manage.service.impl;
+import com.alibaba.fastjson2.JSONObject;
+import com.ard.common.annotation.DataScope;
+import com.ard.common.annotation.DataScopePlus;
+import com.ard.system.authorize.service.AuthorizeService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ard.common.core.domain.entity.SysDept;
@@ -26,10 +32,11 @@
import com.ard.sample.manage.model.param.DeviceQueryParam;
import com.ard.sample.manage.model.receiver.*;
import com.ard.sample.manage.service.*;
-import com.ard.system.service.system.ISysDeptService;
+import com.ard.system.service.ISysDeptService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -89,6 +96,9 @@
@Autowired
private IDeviceFirmwareService deviceFirmwareService;
+
+ @Resource
+ private AuthorizeService authorizeService;
@Autowired
@Qualifier("gatewayOSDServiceImpl")
@@ -256,6 +266,12 @@
> 0;
}
+ /**
+ * 发布状态回复消息
+ *
+ * @param sn 序列号
+ * @param response 通用主题响应对象
+ */
@Override
public void publishStatusReply(String sn, CommonTopicResponse<Object> response) {
Map<String, Integer> result = new ConcurrentHashMap<>(1);
@@ -299,6 +315,9 @@
.collect(Collectors.toList());
}
+ /**
+ * 设备列表
+ */
@Override
public List<DeviceDTO> getDevicesTopoForWeb() {
List<DeviceDTO> devicesList = this.getDevicesByParams(
@@ -332,6 +351,64 @@
// payloads
// subDevice.setPayloadsList(payloadService.getDevicePayloadEntitiesByDeviceSn(gateway.getChildDeviceSn()));
}
+
+ //region 单独写一个方法做权限验证，由于有好多定时任务也在实时获取设备列表，原方法不适用再添加权限注解
+ @Override
+ public List<DeviceDTO> getDockList() {
+ List<DeviceDTO> devicesList = this.getDockListByParams(
+ DeviceQueryParam.builder()
+ .domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))
+ .build());
+
+ devicesList.stream()
+ .filter(gateway -> DeviceDomainEnum.DOCK.getVal() == gateway.getDomain() ||
+ RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + gateway.getDeviceSn()))
+ .forEach(this::spliceDeviceTopoPer);
+
+ return devicesList;
+ }
+
+ @Override
+ public void spliceDeviceTopoPer(DeviceDTO gateway) {
+ gateway.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + gateway.getDeviceSn()));
+ // sub device
+ if (!StringUtils.hasText(gateway.getChildDeviceSn())) {
+ return;
+ }
+ DeviceDTO subDevice =
+ getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build()).get(0);
+ subDevice.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + subDevice.getDeviceSn()));
+ gateway.setChildren(subDevice);
+ }
+
+
+ @Override
+ public List<DeviceDTO> getDockListByParams(DeviceQueryParam param){
+ // 在mapper中添加查询方法做权限验证
+ return mapper.selectListPer(
+ new LambdaQueryWrapper<DeviceEntity>()
+ .eq(StringUtils.hasText(param.getDeviceSn()),
+ DeviceEntity::getDeviceSn, param.getDeviceSn())
+ .eq(param.getDeviceType() != null,
+ DeviceEntity::getDeviceType, param.getDeviceType())
+ .eq(param.getSubType() != null,
+ DeviceEntity::getSubType, param.getSubType())
+ .eq(StringUtils.hasText(param.getChildSn()),
+ DeviceEntity::getChildSn, param.getChildSn())
+ .and(!CollectionUtils.isEmpty(param.getDomains()), wrapper -> {
+ for (Integer domain : param.getDomains()) {
+ wrapper.eq(DeviceEntity::getDomain, domain).or();
+ }
+ })
+ .eq(param.getBoundStatus() != null, DeviceEntity::getBoundStatus,
+ param.getBoundStatus())
+ .orderBy(param.isOrderBy(),
+ param.isAsc(), DeviceEntity::getId))
+ .stream()
+ .map(this::deviceEntityConvertToDTO)
+ .collect(Collectors.toList());
+ }
+ //endregion
@Override
public Optional<TopologyDeviceDTO> getDeviceTopoForPilot(String sn) {
@@ -417,6 +494,12 @@
this.pushDeviceUpdateTopo(allSessions, sn);
}
+ /**
+ * 处理来自MQTT消息的OSD消息
+ *
+ * @param message 接收到的MQTT消息
+ * @throws IOException 如果处理消息时出现IO异常
+ */
@Override
@ServiceActivator(inputChannel = ChannelName.INBOUND_OSD)
public void handleOSD(Message<?> message) {
@@ -521,7 +604,50 @@
mapper.updateById(entity);
return Optional.of(deviceEntity);
}
+ // 2025-10-20 zwy 添加时增加授权验证及数量限制，限制为3台机场设备，超出则抛出异常
+ try {
+ // 查询数据库中机器设备数量
+ // 根据参数获取设备列表
+ List<DeviceDTO> devicesList = this.getDevicesByParams(
+ DeviceQueryParam.builder()
+ // 过滤设备域为GATEWAY和DOCK的设备
+ .domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))
+ .build());
+ // 验证授权数量
+ validateAuthorization(devicesList.size(), 1);
+ } catch (Exception e) {
+ return Optional.empty();
+ }
+ // 调用验证方法
+
return mapper.insert(entity) > 0 ? Optional.of(entity) : Optional.empty();
+ }
+
+ /**
+ * 验证授权数量
+ */
+ private void validateAuthorization(int existingCount, int newCount) {
+ int totalCount = existingCount + newCount;
+
+ JSONObject authInfo = authorizeService.getAuthorizationInfo();
+ String authType = authInfo.getString("Type");
+
+ switch (authType) {
+ case "normal":
+ int allowedDockNum = authInfo.getIntValue("dockNum");
+ if (totalCount > allowedDockNum) {
+ throw new RuntimeException(String.format(
+ "授权数量%d，当前操作将导致总数达到%d，超过授权限制",
+ allowedDockNum, totalCount));
+ }
+ break;
+ case "expired":
+ throw new RuntimeException("授权文件已过期");
+ case "mismatch":
+ throw new RuntimeException("授权文件不匹配");
+ default:
+ throw new RuntimeException("未知的授权类型: " + authType);
+ }
}
/**
@@ -559,6 +685,7 @@
/**
* Convert the received drone device object into a database entity object.
+ * 将接收到的无人机设备对象转换为数据库实体对象。
*
* @param device
* @return
@@ -623,6 +750,7 @@
.nickname(entity.getNickname())
.firmwareVersion(entity.getFirmwareVersion())
.deptId(entity.getDeptId())
+ .workType(entity.getWorkType())
.workspaceName(entity.getDeptId() != null
? Optional.ofNullable(sysDeptService.selectDeptById(entity.getDeptId()))
.map(SysDept::getDeptName)
@@ -658,6 +786,19 @@
public Boolean updateDevice(DeviceDTO deviceDTO) {
int update = mapper.update(this.deviceDTO2Entity(deviceDTO),
new LambdaUpdateWrapper<DeviceEntity>().eq(DeviceEntity::getDeviceSn, deviceDTO.getDeviceSn()));
+ return update > 0;
+ }
+
+ @Override
+ public Boolean updateWorkType(String sn, Long workType) {
+ // 方式1：使用LambdaUpdateWrapper（推荐，类型安全，避免字段名硬编码）
+ LambdaUpdateWrapper<DeviceEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ // 设置更新条件：deviceSn = sn
+ lambdaUpdateWrapper.eq(DeviceEntity::getDeviceSn, sn)
+ // 只更新workType字段
+ .set(DeviceEntity::getWorkType, workType);
+ // 执行更新（第一个参数传null，因为更新字段已通过wrapper的set指定）
+ int update = mapper.update(null, lambdaUpdateWrapper);
return update > 0;
}
@@ -781,14 +922,30 @@
}
+ /**
+ * 根据域名分页获取已绑定的设备信息
+ *
+ * @param page 当前页码
+ * @param pageSize 每页显示数量
+ * @param domain 域名
+ * @return PaginationData<DeviceDTO> 包含分页信息的设备DTO列表
+ */
@Override
public PaginationData<DeviceDTO> getBoundDevicesWithDomain(Long page,
- Long pageSize, Integer domain) {
+ Long pageSize, Integer domain, Long deptId) {
Page<DeviceEntity> pagination = mapper.selectPage(new Page<>(page, pageSize),
- new LambdaQueryWrapper<DeviceEntity>()
- .eq(DeviceEntity::getDomain, domain)
- .eq(DeviceEntity::getBoundStatus, true));
+ new QueryWrapper<DeviceEntity>()
+ .eq("m.domain", domain)
+ .eq(deptId != null, "m.dept_id", deptId)
+ .isNotNull("m.dept_id"));
+
+ //以前的写法
+// new LambdaQueryWrapper<DeviceEntity>()
+// .eq(DeviceEntity::getDomain, domain)
+// .eq(deptId != null, DeviceEntity::getDeptId, deptId)
+// .isNotNull(DeviceEntity::getDeptId);
+
List<DeviceDTO> devicesList = pagination.getRecords().stream().map(this::deviceEntityConvertToDTO)
.peek(device -> {
device.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn()));
@@ -814,6 +971,7 @@
DeviceDTO device = DeviceDTO.builder()
.deviceSn(deviceSn)
.boundStatus(false)
+ .deptId(null)
.build();
this.updateDevice(device);
}
@@ -915,6 +1073,16 @@
this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), param));
return;
}
+
+ if(param.size()==1){
+ this.deviceOnePropertySetSilent(topic,propertyEnum,param);
+ return;
+ }
+// if(Objects.equals(param.fieldNames().next(), "silent_mode"))
+// {
+// this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), param.get("silent_mode")));
+// return;
+// }
// If there are multiple parameters, set them separately.
for (Iterator<Map.Entry<String, JsonNode>> filed = param.fields(); filed.hasNext(); ) {
Map.Entry<String, JsonNode> node = filed.next();
@@ -922,12 +1090,34 @@
if (!isPublish) {
continue;
}
+
this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), node));
}
}
+ /**
+ * 为静音模式单独列出来一个方法，只有一个值的时候都可以调用，不限于静音模式
+ * */
@Override
+ public void deviceOnePropertySetSilent(String topic, DeviceSetPropertyEnum propertyEnum,
+ JsonNode value) {
+// if (Objects.isNull(value) || Objects.isNull(value.getValue())) {
+// throw new IllegalArgumentException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
+// }
+
+ Map reply = messageSender.publishWithReply(
+ Map.class, topic,
+ CommonTopicResponse.builder()
+ .bid(UUID.randomUUID().toString())
+ .tid(UUID.randomUUID().toString())
+ .timestamp(System.currentTimeMillis())
+ .data(value)
+ .build(),
+ 2);
+ }
+
+ @Override
public void deviceOnePropertySet(String topic, DeviceSetPropertyEnum propertyEnum,
Map.Entry<String, Object> value) {
if (Objects.isNull(value) || Objects.isNull(value.getValue())) {
@@ -944,20 +1134,29 @@
.build(),
2);
- while (true) {
- reply = (Map<String, Object>) reply.get(value.getKey());
- if (value.getValue() instanceof JsonNode) {
- break;
- }
- value = (Map.Entry) value.getValue();
- }
-
- SetReply setReply = objectMapper.convertValue(reply, SetReply.class);
- if (SetReplyStatusResultEnum.SUCCESS.getVal() != setReply.getResult()) {
- throw new RuntimeException("Failed to set " + value.getKey() + "; Error Code: " + setReply.getResult());
- }
+// 接收返回信息在serviceReply中，订阅thing/product/7CTDLCE00A1UPE/property/set_reply上报的信息，此处不处理
+// while (true) {
+// reply = (Map<String, Object>) reply.get(value.getKey());
+// if (value.getValue() instanceof JsonNode) {
+// break;
+// }
+// value = (Map.Entry) value.getValue();
+// }
+// SetReply setReply = objectMapper.convertValue(reply, SetReply.class);
+// if (SetReplyStatusResultEnum.SUCCESS.getVal() != setReply.getResult()) {
+// throw new RuntimeException("Failed to set " + value.getKey() + "; Error Code: " + setReply.getResult());
+// }
}
+
+// public JsonNode getJsonNode(JsonNode jsonNode) {
+// ObjectNode parentNode = objectMapper.createObjectNode();
+// parentNode.put("bid", UUID.randomUUID().toString());
+// parentNode.set("data", jsonNode);
+// parentNode.put("tid", UUID.randomUUID().toString());
+// parentNode.put("timestamp", System.currentTimeMillis());
+// return parentNode;
+// }
@Override
public Boolean checkDeviceOnline(String sn) {
@@ -988,6 +1187,7 @@
.childSn(dto.getChildDeviceSn())
.domain(dto.getDomain())
.firmwareVersion(dto.getFirmwareVersion())
+ .workType(dto.getWorkType())
.compatibleStatus(dto.getFirmwareStatus() == null ? null :
DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
.build();
@@ -1091,6 +1291,12 @@
}
+ /**
+ * 处理获取机场组织信息的请求
+ *
+ * @param receiver 接收到的消息
+ * @param headers 消息头
+ */
@ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_AIRPORT_ORGANIZATION_GET, outputChannel =
ChannelName.OUTBOUND)
public void replyOrganizationGet(CommonTopicReceiver receiver, MessageHeaders headers) {
@@ -1098,10 +1304,10 @@
OrganizationGetReceiver.class);
CommonTopicResponse.CommonTopicResponseBuilder<RequestsReply> builder =
CommonTopicResponse.<RequestsReply>builder()
- .tid(receiver.getTid())
- .bid(receiver.getBid())
- .method(RequestsMethodEnum.AIRPORT_ORGANIZATION_GET.getMethod())
- .timestamp(System.currentTimeMillis());
+ .tid(receiver.getTid())
+ .bid(receiver.getBid())
+ .method(RequestsMethodEnum.AIRPORT_ORGANIZATION_GET.getMethod())
+ .timestamp(System.currentTimeMillis());
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC).toString() + TopicConst._REPLY_SUF;
@@ -1122,4 +1328,10 @@
messageSender.publish(topic, builder.build());
}
+
+// @DataScopePlus(deptAlias="d")
+// @Override
+// public List<DeviceEntity> selectList(Wrapper<DeviceEntity> queryWrapper) {
+// return mapper.selectList(queryWrapper);
+// }
}
\ No newline at end of file
--
Gitblit v1.9.3