From 1a0d805f48d7b2f5d301cacc3fe5e11e6ddccffb Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 10:34:57 +0800
Subject: [PATCH] 2025-12-07 zwy 修改Hms中字段名为驼峰式。
---
ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java | 4 ++--
ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceHmsEntity.java | 4 ++--
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java | 16 +++++++++-------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java
index ed7d61b..801a897 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java
@@ -41,9 +41,9 @@
private LocalDateTime updateTime;
- private Integer in_the_sky;
+ private Integer inTheSky;
- private String device_type;
+ private String deviceType;
@Override
public DeviceHmsDTO clone() {
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceHmsEntity.java b/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceHmsEntity.java
index 7347eb0..4329e85 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceHmsEntity.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceHmsEntity.java
@@ -62,10 +62,10 @@
private Long updateTime;
@TableField("in_the_sky")
- private Integer in_the_sky;
+ private Integer inTheSky;
@TableField("device_type")
- private String device_type;
+ private String deviceType;
@Override
public DeviceHmsEntity clone() {
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 e4ddeb3..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,8 +240,8 @@
.module(entity.getModule())
.messageEn(entity.getMessageEn())
.messageZh(entity.getMessageZh())
- .in_the_sky(entity.getIn_the_sky())
- .device_type(entity.getDevice_type())
+ .inTheSky(entity.getInTheSky())
+ .deviceType(entity.getDeviceType())
.build();
}
@@ -252,8 +254,8 @@
dto.setLevel(receiver.getLevel());
dto.setModule(receiver.getModule());
dto.setHmsId(UUID.randomUUID().toString());
- dto.setIn_the_sky(receiver.getInTheSky());
- dto.setDevice_type(receiver.getDeviceType());
+ 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