From 00a3c86c810d718a8cc4bf4de32ea3d394c58eac Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 12:15:53 +0800
Subject: [PATCH] 2025-12-07 zwy 整理代码
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java
index b09369e..ea622ca 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java
@@ -184,7 +184,10 @@
return new PaginationData<DeviceHmsDTO>(deviceHmsList, new Pagination(pagination));
- // region 原代码注释备份一份
+
+ }
+
+ // region 原代码注释备份一份
// LambdaQueryWrapper<DeviceHmsEntity> queryWrapper = new LambdaQueryWrapper<DeviceHmsEntity>()
// .and(wrapper -> param.getDeviceSn().forEach(sn -> wrapper.eq(DeviceHmsEntity::getSn, sn).or()))
// .between(param.getBeginTime() != null && param.getEndTime() != null,
@@ -208,8 +211,7 @@
// List<DeviceHmsDTO> deviceHmsList = pagination.getRecords().stream().map(this::entity2Dto).collect(Collectors.toList());
//
// return new PaginationData<DeviceHmsDTO>(deviceHmsList, new Pagination(pagination));
- // endregion
- }
+ // endregion
@Override
public void updateUnreadHms(String deviceSn) {
@@ -238,11 +240,13 @@
.module(entity.getModule())
.messageEn(entity.getMessageEn())
.messageZh(entity.getMessageZh())
+ .inTheSky(entity.getInTheSky())
+ .deviceType(entity.getDeviceType())
.build();
}
/**
- * Populate the received data into the entity. Please refer to the documentation for splicing rules.
+ * 将收到的数据填充到实体中。请参阅文档中的拼接规则。
* @param dto
* @param receiver
*/
@@ -250,6 +254,8 @@
dto.setLevel(receiver.getLevel());
dto.setModule(receiver.getModule());
dto.setHmsId(UUID.randomUUID().toString());
+ dto.setInTheSky(receiver.getInTheSky());
+ dto.setDeviceType(receiver.getDeviceType());
if (HmsEnum.DomainType.DRONE_NEST.getDomain().equals(receiver.getDomainType())) {
dto.setHmsKey(HmsEnum.HmsFaqIdEnum.DOCK_TIP.getText() + receiver.getCode());
--
Gitblit v1.9.3