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

shenyijian

2023-11-16 bf4990ffb53e2a0e7b2ec0c7a8a054bdf8a57db5

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