From c49aebafe55bca031c0c4f5c5fd45dad9ff46f32 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 20 Nov 2025 09:59:50 +0800
Subject: [PATCH] 优化
---
ard-sample/src/main/java/com/ard/sample/wayline/model/param/WaylineQueryParam.java | 6 ++----
ard-system/src/main/java/com/ard/data/map/domain/ArdMap.java | 2 ++
ard-vtdu/src/main/java/com/ard/vtdu/domain/ArdVtdu.java | 6 ++----
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 2 ++
ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java | 16 ++++++++++++----
ard-system/src/main/java/com/ard/data/model/domain/ArdModel.java | 2 ++
ard-system/src/main/java/com/ard/data/tile/domain/ArdTile.java | 2 ++
ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java | 2 ++
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java | 2 ++
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceHmsServiceImpl.java | 2 +-
10 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
index 7b9744e..9b6ee6e 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
@@ -5,6 +5,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* 分组对象 ard_route_group
@@ -12,6 +13,7 @@
* @author xia
* @date 2025-10-18
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdRouteGroup extends BaseEntity {
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index 9f4ec1c..d12c4d4 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -4,6 +4,7 @@
import com.ard.common.core.domain.BaseEntity;
import com.ard.route.domain.djuav.UavRouteReq;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* 航线(kmz)对象 ard_route_info
@@ -11,6 +12,7 @@
* @author xia
* @date 2025-10-23
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdRouteInfo extends BaseEntity {
diff --git a/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java b/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java
index c1a7963..ab95344 100644
--- a/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java
@@ -3,20 +3,28 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+@EqualsAndHashCode(callSuper = true)
@Data
-public class ArdRouteGroupVo extends BaseEntity {
+public class ArdRouteGroupVo extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** ID */
+ /**
+ * ID
+ */
private String id;
- /** 分组名称 */
+ /**
+ * 分组名称
+ */
@Excel(name = "分组名称")
private String groupName;
- /** 序列号 */
+ /**
+ * 序列号
+ */
@Excel(name = "序列号")
private Integer serialNumber;
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 94adc90..848a010 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
@@ -109,7 +109,7 @@
if (unReadList.isEmpty()) {
return;
}
- RedisOpsUtils.listRPush(key, unReadList.stream().map(DeviceHmsDTO::getKey).toArray(String[]::new));
+ RedisOpsUtils.listRPush(key, (Object) unReadList.stream().map(DeviceHmsDTO::getKey).toArray(String[]::new));
// push to the web
// Collection<ConcurrentWebSocketSession> sessions = webSocketManageService.getValueWithWorkspaceAndUserType(
// device.getWorkspaceId(), UserTypeEnum.WEB.getVal());
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/param/WaylineQueryParam.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/param/WaylineQueryParam.java
index 1a7bb3f..790bf2d 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/param/WaylineQueryParam.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/param/WaylineQueryParam.java
@@ -1,16 +1,14 @@
package com.ard.sample.wayline.model.param;
import com.ard.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
/**
* @author sean
* @version 0.3
* @date 2021/12/22
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@Builder
@AllArgsConstructor
diff --git a/ard-system/src/main/java/com/ard/data/map/domain/ArdMap.java b/ard-system/src/main/java/com/ard/data/map/domain/ArdMap.java
index fb7b6da..870ca52 100644
--- a/ard-system/src/main/java/com/ard/data/map/domain/ArdMap.java
+++ b/ard-system/src/main/java/com/ard/data/map/domain/ArdMap.java
@@ -3,6 +3,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* 地图管理对象 ard_map
@@ -10,6 +11,7 @@
* @author xia
* @date 2025-10-10
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdMap extends BaseEntity {
diff --git a/ard-system/src/main/java/com/ard/data/model/domain/ArdModel.java b/ard-system/src/main/java/com/ard/data/model/domain/ArdModel.java
index 45e44fc..8488424 100644
--- a/ard-system/src/main/java/com/ard/data/model/domain/ArdModel.java
+++ b/ard-system/src/main/java/com/ard/data/model/domain/ArdModel.java
@@ -3,6 +3,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* 模型管理对象 ard_model
@@ -10,6 +11,7 @@
* @author xia
* @date 2025-10-10
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdModel extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
index 0ed974c..1b88dd3 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
@@ -5,6 +5,7 @@
import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.util.List;
@@ -15,6 +16,7 @@
* @author ard
* @date 2025-10-14
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
diff --git a/ard-system/src/main/java/com/ard/data/tile/domain/ArdTile.java b/ard-system/src/main/java/com/ard/data/tile/domain/ArdTile.java
index be90b3c..b3fae81 100644
--- a/ard-system/src/main/java/com/ard/data/tile/domain/ArdTile.java
+++ b/ard-system/src/main/java/com/ard/data/tile/domain/ArdTile.java
@@ -3,6 +3,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* tile管理对象 ard_tile
@@ -10,6 +11,7 @@
* @author xia
* @date 2025-10-10
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdTile extends BaseEntity {
diff --git a/ard-vtdu/src/main/java/com/ard/vtdu/domain/ArdVtdu.java b/ard-vtdu/src/main/java/com/ard/vtdu/domain/ArdVtdu.java
index a1ec1b6..ebc8091 100644
--- a/ard-vtdu/src/main/java/com/ard/vtdu/domain/ArdVtdu.java
+++ b/ard-vtdu/src/main/java/com/ard/vtdu/domain/ArdVtdu.java
@@ -2,10 +2,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
/**
* 流媒体管理对象 vtdu
@@ -13,6 +10,7 @@
* @author ard
* @date 2023-08-29
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@Builder
@NoArgsConstructor
--
Gitblit v1.9.3