From bf4990ffb53e2a0e7b2ec0c7a8a054bdf8a57db5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 16 Nov 2023 10:02:13 +0800
Subject: [PATCH] 无人机 -设备分页新增保护区ID查询条件
---
src/main/java/com/dji/sample/manage/model/param/DeviceQueryParam.java | 2 ++
src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java | 1 +
src/main/java/com/dji/sample/manage/model/entity/DeviceEntity.java | 3 +++
src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java | 4 +++-
src/main/java/com/dji/sample/manage/controller/DeviceController.java | 4 ++--
src/main/java/com/dji/sample/manage/service/IDeviceService.java | 2 +-
6 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/controller/DeviceController.java b/src/main/java/com/dji/sample/manage/controller/DeviceController.java
index df16a22..9e8870e 100644
--- a/src/main/java/com/dji/sample/manage/controller/DeviceController.java
+++ b/src/main/java/com/dji/sample/manage/controller/DeviceController.java
@@ -79,8 +79,8 @@
* @return
*/
@GetMapping("/{workspace_id}/devices")
- public ResponseResult<List<DeviceDTO>> getDevices(@PathVariable("workspace_id") String workspaceId) {
- List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb(workspaceId);
+ public ResponseResult<List<DeviceDTO>> getDevices(@PathVariable("workspace_id") String workspaceId,String reserveId) {
+ List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb(workspaceId,reserveId);
return ResponseResult.success(devicesList);
}
diff --git a/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java b/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
index 30bc3cf..39e0fa3 100644
--- a/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
+++ b/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
@@ -68,4 +68,5 @@
private WaylineJobEntity latestWaylineJob;
+ private String reserveId;
}
diff --git a/src/main/java/com/dji/sample/manage/model/entity/DeviceEntity.java b/src/main/java/com/dji/sample/manage/model/entity/DeviceEntity.java
index 57ace0d..69a7f37 100644
--- a/src/main/java/com/dji/sample/manage/model/entity/DeviceEntity.java
+++ b/src/main/java/com/dji/sample/manage/model/entity/DeviceEntity.java
@@ -88,4 +88,7 @@
@TableField(value = "login_time")
private Long loginTime;
+ @TableField(value = "reserve_id")
+ private String reserveId;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/dji/sample/manage/model/param/DeviceQueryParam.java b/src/main/java/com/dji/sample/manage/model/param/DeviceQueryParam.java
index b9fc67e..81c4cd1 100644
--- a/src/main/java/com/dji/sample/manage/model/param/DeviceQueryParam.java
+++ b/src/main/java/com/dji/sample/manage/model/param/DeviceQueryParam.java
@@ -33,4 +33,6 @@
private boolean orderBy;
private boolean isAsc;
+
+ private String reserveId;
}
\ No newline at end of file
diff --git a/src/main/java/com/dji/sample/manage/service/IDeviceService.java b/src/main/java/com/dji/sample/manage/service/IDeviceService.java
index f5002d4..7ae6af8 100644
--- a/src/main/java/com/dji/sample/manage/service/IDeviceService.java
+++ b/src/main/java/com/dji/sample/manage/service/IDeviceService.java
@@ -87,7 +87,7 @@
* @param workspaceId
* @return
*/
- List<DeviceDTO> getDevicesTopoForWeb(String workspaceId);
+ List<DeviceDTO> getDevicesTopoForWeb(String workspaceId,String reserveId);
/**
* Set the remote controller and payloads information of the drone.
diff --git a/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java
index 1d767ce..23c8fb1 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java
@@ -304,6 +304,7 @@
.eq(StringUtils.hasText(param.getWorkspaceId()),
DeviceEntity::getWorkspaceId, param.getWorkspaceId())
.eq(param.getBoundStatus() != null, DeviceEntity::getBoundStatus, param.getBoundStatus())
+ .eq(param.getReserveId() != null, DeviceEntity::getReserveId, param.getReserveId())
.orderBy(param.isOrderBy(),
param.isAsc(), DeviceEntity::getId))
.stream()
@@ -312,10 +313,11 @@
}
@Override
- public List<DeviceDTO> getDevicesTopoForWeb(String workspaceId) {
+ public List<DeviceDTO> getDevicesTopoForWeb(String workspaceId, String reserveId) {
List<DeviceDTO> devicesList = this.getDevicesByParams(
DeviceQueryParam.builder()
.workspaceId(workspaceId)
+ .reserveId(reserveId)
.domains(List.of(DeviceDomainEnum.GATEWAY.getVal(), DeviceDomainEnum.DOCK.getVal()))
.build());
--
Gitblit v1.9.3