无人机 -设备分页新增保护区ID查询条件

shenyijian

2023-11-16 bf4990ffb53e2a0e7b2ec0c7a8a054bdf8a57db5

无人机 -设备分页新增保护区ID查询条件

 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);
    }

 src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java

@@ -68,4 +68,5 @@

    private WaylineJobEntity latestWaylineJob;

    private String reserveId;
}

 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;

}

 src/main/java/com/dji/sample/manage/model/param/DeviceQueryParam.java

@@ -33,4 +33,6 @@
    private boolean orderBy;

    private boolean isAsc;

    private String reserveId;
}

 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.

 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());