From f5fe67e04309b041ec98a5e071cb227a7a1021ca Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 04 Dec 2025 16:29:46 +0800
Subject: [PATCH] 2025-12-04 zwy hms增加in_the_sky、device_type两个字段
---
ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java | 5 +++++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/HmsArgsReceiver.java | 3 +++
ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceHmsReceiver.java | 8 ++++++++
ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceHmsEntity.java | 6 ++++++
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java | 6 +++++-
5 files changed, 27 insertions(+), 1 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 29cbece..ed7d61b 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
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -40,6 +41,10 @@
private LocalDateTime updateTime;
+ private Integer in_the_sky;
+
+ private String device_type;
+
@Override
public DeviceHmsDTO clone() {
try {
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 8794235..7347eb0 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
@@ -61,6 +61,12 @@
@TableField("update_time")
private Long updateTime;
+ @TableField("in_the_sky")
+ private Integer in_the_sky;
+
+ @TableField("device_type")
+ private String device_type;
+
@Override
public DeviceHmsEntity clone() {
try {
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceHmsReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceHmsReceiver.java
index e0f23a5..e6e0c7e 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceHmsReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/DeviceHmsReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -10,19 +11,26 @@
@Data
public class DeviceHmsReceiver {
+ @JsonProperty("code")
private String code;
+ @JsonProperty("device_type")
private String deviceType;
private String domainType;
+ @JsonProperty("imminent")
private Integer imminent;
+ @JsonProperty("in_the_sky")
private Integer inTheSky;
+ @JsonProperty("level")
private Integer level;
+ @JsonProperty("module")
private Integer module;
+ @JsonProperty("args")
private HmsArgsReceiver args;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/HmsArgsReceiver.java b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/HmsArgsReceiver.java
index c47700c..770286d 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/HmsArgsReceiver.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/receiver/HmsArgsReceiver.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.receiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
@@ -10,8 +11,10 @@
@Data
public class HmsArgsReceiver {
+ @JsonProperty("component_index")
private Long componentIndex;
+ @JsonProperty("sensor_index")
private Integer sensorIndex;
private Integer alarmId;
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..e4ddeb3 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
@@ -238,11 +238,13 @@
.module(entity.getModule())
.messageEn(entity.getMessageEn())
.messageZh(entity.getMessageZh())
+ .in_the_sky(entity.getIn_the_sky())
+ .device_type(entity.getDevice_type())
.build();
}
/**
- * Populate the received data into the entity. Please refer to the documentation for splicing rules.
+ * 将收到的数据填充到实体中。请参阅文档中的拼接规则。
* @param dto
* @param receiver
*/
@@ -250,6 +252,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());
if (HmsEnum.DomainType.DRONE_NEST.getDomain().equals(receiver.getDomainType())) {
dto.setHmsKey(HmsEnum.HmsFaqIdEnum.DOCK_TIP.getText() + receiver.getCode());
--
Gitblit v1.9.3