From 7ac5daf5f36f305e576f0765191cd4b8cb4e1698 Mon Sep 17 00:00:00 2001 From: wuyuan <15505152113@163.com> Date: Thu, 20 Feb 2025 16:02:37 +0800 Subject: [PATCH] mqtt --- .../sdk/cloudapi/map/api/IHttpMapService.java | 3 +- .../cloudapi/media/api/IHttpMediaService.java | 31 +-- .../sdk/cloudapi/storage/OssTypeEnum.java | 25 ++ .../storage/api/IHttpStorageService.java | 4 +- .../sdk/cloudapi/tsa/api/IHttpTsaService.java | 10 +- .../wayline/api/IHttpWaylineService.java | 35 +-- dk-common/common-oss/pom.xml | 23 ++ .../dromara/common/oss/core/OssClient.java | 25 ++ .../dromara/common/oss/factory/AliyunOss.java | 53 +++++ .../common/oss/factory/IOssService.java | 24 ++ .../org/dromara/common/oss/factory/Minio.java | 37 +++ .../common/oss/factory/OssFactory.java | 35 ++- .../common/oss/properties/OssProperties.java | 22 ++ .../common/redis/config}/RedisConst.java | 2 +- .../common/redis/utils}/RedisOpsUtils.java | 2 +- .../config/MyConcurrentWebSocketSession.java | 4 +- .../common/websocket/dto/BizCodeEnum.java | 69 +++++- .../dto/WebSocketMessageResponse.java | 83 +++++++ .../websocket/utils/WebSocketUtils.java | 51 +++++ dk-modules/pom.xml | 1 + .../dromara/resource/domain/SysOssConfig.java | 20 ++ .../resource/domain/bo/SysOssConfigBo.java | 20 ++ .../resource/domain/vo/SysOssConfigVo.java | 20 ++ dk-modules/sample/pom.xml | 138 +++++++++++ .../sample/CloudApiSampleApplication.java | 4 +- .../sample/common/error/CommonErrorEnum.java | 5 +- .../sample/common/model/CustomClaim.java | 88 ------- .../dromara/sample/common/util/JwtUtil.java | 144 ------------ .../common/util/SpringBeanUtilsTest.java | 2 +- .../component/ApplicationBootInitial.java | 21 +- .../sample/component/AuthInterceptor.java | 60 ----- .../dromara/sample/component/CorsFilter.java | 35 --- .../component/GlobalExceptionHandler.java | 4 +- .../component/GlobalScheduleService.java | 19 +- .../mqtt/config/MqttMessageChannel.java | 4 +- .../config/MqttPropertyConfiguration.java | 21 +- .../component/mqtt/model/EventsReceiver.java | 7 +- .../component/mqtt/model/MapKeyConst.java | 2 +- .../mqtt/model/MqttClientOptions.java | 2 +- .../mqtt/model/MqttProtocolEnum.java | 2 +- .../component/mqtt/model/MqttUseEnum.java | 2 +- .../mybatis/MybatisPlusConfiguration.java | 24 -- .../mybatis/MybatisPlusMetaObjectHandler.java | 37 --- .../component/oss/model/OssConfiguration.java | 93 -------- .../component/oss/service/IOssService.java | 51 ----- .../service/impl/AliyunOssServiceImpl.java | 120 ---------- .../oss/service/impl/AmazonS3ServiceImpl.java | 126 ----------- .../oss/service/impl/MinIOServiceImpl.java | 140 ------------ .../oss/service/impl/OssAspectHandler.java | 31 --- .../oss/service/impl/OssServiceContext.java | 68 ------ .../component/redis/RedisConfiguration.java | 63 ------ .../config/AuthPrincipalHandler.java | 70 ------ .../websocket/config/MyWebSocketFactory.java | 27 --- .../websocket/config/MyWebSocketHandler.java | 58 ----- .../websocket/model/BizCodeEnum.java | 93 -------- .../service/IWebSocketManageService.java | 23 -- .../service/IWebSocketMessageService.java | 32 --- .../impl/WebSocketManageServiceImpl.java | 86 ------- .../impl/WebSocketMessageServiceImpl.java | 99 -------- .../GlobalThreadPoolConfiguration.java | 2 +- .../SpringBeanConfiguration.java | 2 +- .../mvc/GlobalMVCConfigurer.java | 40 ---- .../control/controller/DockController.java | 23 +- .../control/controller/DrcController.java | 46 ++-- .../control/model/dto/AirConditionerMode.java | 6 +- .../sample/control/model/dto/AlarmState.java | 6 +- .../control/model/dto/BatteryStoreMode.java | 6 +- .../sample/control/model/dto/JwtAclDTO.java | 2 +- .../control/model/dto/LinkWorkMode.java | 6 +- .../model/dto/RemoteDebugOpenState.java | 10 +- .../control/model/dto/ResultNotifyDTO.java | 2 +- .../model/dto/ReturnHomeCancelState.java | 14 +- .../control/model/dto/ReturnHomeState.java | 14 +- .../control/model/enums/CameraModeEnum.java | 2 +- .../control/model/enums/DrcMethodEnum.java | 2 +- .../model/enums/DroneAuthorityEnum.java | 2 +- .../model/enums/DroneControlMethodEnum.java | 2 +- .../model/enums/GimbalResetModeEnum.java | 2 +- .../model/enums/MqttAclAccessEnum.java | 2 +- .../model/enums/PayloadCommandsEnum.java | 25 +- .../model/enums/RemoteDebugMethodEnum.java | 12 +- .../model/param/DeviceDrcInfoParam.java | 2 +- .../control/model/param/DrcConnectParam.java | 4 +- .../control/model/param/DrcModeParam.java | 8 +- .../model/param/DronePayloadParam.java | 13 +- .../control/model/param/FlyToPointParam.java | 11 +- .../model/param/PayloadCommandsParam.java | 10 +- .../control/model/param/RemoteDebugParam.java | 4 +- .../model/param/TakeoffToPointParam.java | 19 +- .../control/service/IControlService.java | 11 +- .../sample/control/service/IDrcService.java | 11 +- .../control/service/impl/CameraAimImpl.java | 7 +- .../impl/CameraFocalLengthSetImpl.java | 9 +- .../service/impl/CameraModeSwitchImpl.java | 6 +- .../service/impl/CameraPhotoTakeImpl.java | 7 +- .../impl/CameraRecordingStartImpl.java | 9 +- .../service/impl/CameraRecordingStopImpl.java | 7 +- .../service/impl/ControlServiceImpl.java | 56 +++-- .../control/service/impl/DrcServiceImpl.java | 75 +++--- .../control/service/impl/GimbalResetImpl.java | 5 +- .../service/impl/PayloadCommandsHandler.java | 19 +- .../service/impl/RemoteDebugHandler.java | 8 +- .../service/impl/SDKControlService.java | 41 ++-- .../control/service/impl/SDKRemoteDebug.java | 30 ++- .../manage/controller/DeviceController.java | 70 +++--- .../controller/DeviceFirmwareController.java | 64 +++--- .../controller/DeviceHmsController.java | 26 +-- .../controller/DeviceLogsController.java | 74 +++--- .../controller/LiveStreamController.java | 32 +-- .../manage/controller/LoginController.java | 48 ---- .../manage/controller/TopologyController.java | 27 ++- .../manage/controller/UserController.java | 64 ------ .../controller/WorkspaceController.java | 23 +- .../manage/dao/IDeviceDictionaryMapper.java | 4 +- .../manage/dao/IDeviceFirmwareMapper.java | 4 +- .../sample/manage/dao/IDeviceHmsMapper.java | 4 +- .../sample/manage/dao/IDeviceLogsMapper.java | 4 +- .../sample/manage/dao/IDeviceMapper.java | 6 +- .../manage/dao/IDevicePayloadMapper.java | 4 +- .../manage/dao/IFirmwareModelMapper.java | 4 +- .../manage/dao/ILogsFileIndexMapper.java | 4 +- .../sample/manage/dao/ILogsFileMapper.java | 4 +- .../sample/manage/dao/IUserMapper.java | 4 +- .../sample/manage/dao/IWorkspaceMapper.java | 4 +- .../model/common/AppLicenseProperties.java | 2 +- .../manage/model/common/HmsJsonUtil.java | 2 +- .../manage/model/common/HmsMessage.java | 2 +- .../model/common/NtpServerProperties.java | 2 +- .../manage/model/dto/CapacityCameraDTO.java | 4 +- .../manage/model/dto/CapacityDeviceDTO.java | 4 +- .../manage/model/dto/CapacityVideoDTO.java | 4 +- .../manage/model/dto/DeviceAuthorityDTO.java | 6 +- .../sample/manage/model/dto/DeviceDTO.java | 19 +- .../manage/model/dto/DeviceDictionaryDTO.java | 4 +- .../manage/model/dto/DeviceFirmwareDTO.java | 2 +- .../model/dto/DeviceFirmwareNoteDTO.java | 2 +- .../model/dto/DeviceFirmwareUpgradeDTO.java | 2 +- .../sample/manage/model/dto/DeviceHmsDTO.java | 2 +- .../manage/model/dto/DeviceLogsDTO.java | 4 +- .../manage/model/dto/DevicePayloadDTO.java | 8 +- .../model/dto/DevicePayloadReceiver.java | 8 +- .../model/dto/FirmwareFileProperties.java | 2 +- .../manage/model/dto/FirmwareModelDTO.java | 2 +- .../sample/manage/model/dto/LiveDTO.java | 4 +- .../manage/model/dto/LiveStreamProperty.java | 6 +- .../sample/manage/model/dto/LiveTypeDTO.java | 13 +- .../manage/model/dto/LiveUrlAgoraDTO.java | 4 +- .../manage/model/dto/LiveUrlGB28181DTO.java | 4 +- .../manage/model/dto/LiveUrlRTSPDTO.java | 4 +- .../sample/manage/model/dto/LogsFileDTO.java | 2 +- .../manage/model/dto/LogsFileUploadDTO.java | 6 +- .../model/dto/LogsFileUploadListDTO.java | 2 +- .../model/dto/LogsOutputProgressDTO.java | 4 +- .../manage/model/dto/LogsProgressDTO.java | 2 +- .../model/dto/LogsUploadCredentialsDTO.java | 10 +- .../manage/model/dto/ProductConfigDTO.java | 2 +- .../sample/manage/model/dto/TelemetryDTO.java | 2 +- .../manage/model/dto/TopologyDeviceDTO.java | 11 +- .../sample/manage/model/dto/UserDTO.java | 2 +- .../sample/manage/model/dto/UserListDTO.java | 2 +- .../sample/manage/model/dto/UserLoginDTO.java | 2 +- .../sample/manage/model/dto/WorkspaceDTO.java | 4 +- .../model/entity/DeviceDictionaryEntity.java | 4 +- .../manage/model/entity/DeviceEntity.java | 4 +- .../model/entity/DeviceFirmwareEntity.java | 2 +- .../manage/model/entity/DeviceHmsEntity.java | 2 +- .../manage/model/entity/DeviceLogsEntity.java | 2 +- .../model/entity/DevicePayloadEntity.java | 4 +- .../model/entity/FirmwareModelEntity.java | 2 +- .../manage/model/entity/LogsFileEntity.java | 2 +- .../model/entity/LogsFileIndexEntity.java | 2 +- .../manage/model/entity/UserEntity.java | 2 +- .../manage/model/entity/WorkspaceEntity.java | 6 +- .../model/enums/CustomizeConfigScopeEnum.java | 8 +- .../model/enums/DeviceFirmwareStatusEnum.java | 2 +- .../model/enums/DeviceLogsStatusEnum.java | 4 +- .../ExitWaylineWhenRcLostActionEnum.java | 4 +- .../model/enums/FirmwareMethodEnum.java | 2 +- .../model/enums/LiveStreamMethodEnum.java | 2 +- .../manage/model/enums/LiveUrlTypeEnum.java | 2 +- .../model/enums/LiveVideoQualityEnum.java | 2 +- .../model/enums/LogsFileUpdateMethodEnum.java | 2 +- .../manage/model/enums/PayloadModelEnum.java | 2 +- .../model/enums/PropertySetFieldEnum.java | 6 +- .../manage/model/enums/StateSwitchEnum.java | 2 +- .../manage/model/enums/UserTypeEnum.java | 2 +- .../model/param/DeviceFirmwareQueryParam.java | 4 +- .../param/DeviceFirmwareUpdateParam.java | 4 +- .../param/DeviceFirmwareUploadParam.java | 6 +- .../model/param/DeviceHmsQueryParam.java | 2 +- .../model/param/DeviceLogsCreateParam.java | 4 +- .../model/param/DeviceLogsGetParam.java | 4 +- .../model/param/DeviceLogsQueryParam.java | 2 +- .../manage/model/param/DeviceQueryParam.java | 4 +- .../model/param/LogsFileUpdateParam.java | 2 +- .../model/receiver/BasicDeviceProperty.java | 5 +- .../receiver/CapacityCameraReceiver.java | 6 +- .../receiver/CapacityDeviceReceiver.java | 4 +- .../model/receiver/CapacityVideoReceiver.java | 6 +- .../model/receiver/DeviceBasicReceiver.java | 6 +- .../DeviceMaintainStatusReceiver.java | 2 +- .../receiver/DistanceLimitStatusReceiver.java | 8 +- .../model/receiver/DockSdrReceiver.java | 2 +- .../receiver/FirmwareVersionReceiver.java | 4 +- .../model/receiver/HeightLimitReceiver.java | 4 +- .../model/receiver/LiveCapacityReceiver.java | 2 +- .../receiver/MaintainStatusReceiver.java | 2 +- .../receiver/NightLightsStateReceiver.java | 6 +- .../receiver/ObstacleAvoidanceReceiver.java | 8 +- .../receiver/OutOfControlActionReceiver.java | 6 +- .../receiver/OutputLogsProgressReceiver.java | 4 +- .../model/receiver/RthAltitudeReceiver.java | 4 +- .../model/receiver/StatusGatewayReceiver.java | 4 +- .../receiver/StatusSubDeviceReceiver.java | 4 +- .../receiver/WirelessLinkStateReceiver.java | 4 +- .../manage/service/ICameraVideoService.java | 6 +- .../service/ICapacityCameraService.java | 6 +- .../service/IDeviceDictionaryService.java | 4 +- .../service/IDeviceFirmwareService.java | 16 +- .../manage/service/IDeviceHmsService.java | 8 +- .../manage/service/IDeviceLogsService.java | 17 +- .../manage/service/IDevicePayloadService.java | 12 +- .../manage/service/IDeviceRedisService.java | 8 +- .../sample/manage/service/IDeviceService.java | 30 +-- .../manage/service/IFirmwareModelService.java | 4 +- .../manage/service/ILiveStreamService.java | 10 +- .../manage/service/ILogsFileIndexService.java | 8 +- .../manage/service/ILogsFileService.java | 10 +- .../service/IRequestsConfigService.java | 2 +- .../manage/service/ITopologyService.java | 5 +- .../sample/manage/service/IUserService.java | 44 ---- .../manage/service/IWorkspaceService.java | 6 +- .../service/impl/CameraVideoServiceImpl.java | 12 +- .../impl/CapacityCameraServiceImpl.java | 22 +- .../impl/ConfigProductServiceImpl.java | 10 +- .../impl/DeviceDictionaryServiceImpl.java | 12 +- .../impl/DeviceFirmwareServiceImpl.java | 75 +++--- .../service/impl/DeviceHmsServiceImpl.java | 45 ++-- .../service/impl/DeviceLogsServiceImpl.java | 68 +++--- .../impl/DevicePayloadServiceImpl.java | 32 ++- .../service/impl/DeviceRedisServiceImpl.java | 18 +- .../service/impl/DeviceServiceImpl.java | 92 ++++---- .../impl/FirmwareModelServiceImpl.java | 10 +- .../service/impl/LiveStreamServiceImpl.java | 28 +-- .../impl/LogsFileIndexServiceImpl.java | 16 +- .../service/impl/LogsFileServiceImpl.java | 41 ++-- .../service/impl/RequestConfigContext.java | 22 +- .../manage/service/impl/SDKDeviceService.java | 48 ++-- .../service/impl/SDKLivestreamService.java | 16 +- .../manage/service/impl/SDKLogService.java | 4 +- .../service/impl/SDKOrganizationService.java | 36 +-- .../service/impl/SDKPropertySetService.java | 4 +- .../service/impl/TopologyServiceImpl.java | 18 +- .../manage/service/impl/UserServiceImpl.java | 214 ------------------ .../service/impl/WorkspaceServiceImpl.java | 18 +- .../map/controller/DeviceDataController.java | 17 +- .../map/controller/FlightAreaController.java | 58 ++--- .../WorkspaceElementController.java | 71 +++--- .../map/dao/IDeviceFlightAreaMapper.java | 4 +- .../map/dao/IElementCoordinateMapper.java | 4 +- .../sample/map/dao/IFlightAreaFileMapper.java | 4 +- .../map/dao/IFlightAreaPropertyMapper.java | 4 +- .../sample/map/dao/IGroupElementMapper.java | 4 +- .../dromara/sample/map/dao/IGroupMapper.java | 4 +- .../map/model/dto/DeviceDataStatusDTO.java | 2 +- .../map/model/dto/DeviceFlightAreaDTO.java | 6 +- .../map/model/dto/FlightAreaContent.java | 10 +- .../sample/map/model/dto/FlightAreaDTO.java | 4 +- .../map/model/dto/FlightAreaFileDTO.java | 2 +- .../map/model/dto/FlightAreaNotifyDTO.java | 2 +- .../map/model/dto/FlightAreaPropertyDTO.java | 6 +- .../model/dto/FlightAreaPropertyUpdate.java | 2 +- .../sample/map/model/dto/FlightAreaWs.java | 6 +- .../sample/map/model/dto/GroupElementDTO.java | 4 +- .../model/entity/DeviceFlightAreaEntity.java | 2 +- .../model/entity/ElementCoordinateEntity.java | 2 +- .../model/entity/FlightAreaFileEntity.java | 2 +- .../entity/FlightAreaPropertyEntity.java | 2 +- .../map/model/entity/GroupElementEntity.java | 2 +- .../sample/map/model/entity/GroupEntity.java | 2 +- .../enums/FlightAreaGeometryTypeEnum.java | 4 +- .../model/enums/FlightAreaOpertaionEnum.java | 2 +- .../map/model/param/PostFlightAreaParam.java | 10 +- .../map/model/param/PutFlightAreaParam.java | 4 +- .../map/model/param/SyncFlightAreaParam.java | 2 +- .../map/service/IDeviceDataService.java | 6 +- .../map/service/IDeviceFlightAreaService.java | 4 +- .../service/IElementCoordinateService.java | 5 +- .../map/service/IFlightAreaFileService.java | 6 +- .../service/IFlightAreaPropertyServices.java | 6 +- .../map/service/IFlightAreaService.java | 10 +- .../map/service/IGroupElementService.java | 10 +- .../sample/map/service/IGroupService.java | 5 +- .../map/service/IWorkspaceElementService.java | 11 +- .../service/impl/DeviceDataServiceImpl.java | 24 +- .../impl/DeviceFlightAreaServiceImpl.java | 14 +- .../impl/ElementCoordinateServiceImpl.java | 10 +- .../impl/FlightAreaFileServiceImpl.java | 42 ++-- .../impl/FlightAreaPropertyServiceImpl.java | 16 +- .../service/impl/FlightAreaServiceImpl.java | 73 +++--- .../service/impl/GroupElementServiceImpl.java | 15 +- .../map/service/impl/GroupServiceImpl.java | 14 +- .../service/impl/SDKFlightAreaService.java | 4 +- .../impl/WorkspaceElementServiceImpl.java | 34 ++- .../media/controller/FileController.java | 36 +-- .../media/controller/MediaController.java | 42 ++-- .../dromara/sample/media/dao/IFileMapper.java | 4 +- .../sample/media/model/MediaFileCountDTO.java | 2 +- .../sample/media/model/MediaFileDTO.java | 2 +- .../sample/media/model/MediaFileEntity.java | 2 +- .../sample/media/model/MediaMethodEnum.java | 2 +- .../sample/media/service/IFileService.java | 8 +- .../media/service/IMediaRedisService.java | 4 +- .../sample/media/service/IMediaService.java | 5 +- .../media/service/impl/FileServiceImpl.java | 35 ++- .../service/impl/MediaRedisServiceImpl.java | 10 +- .../media/service/impl/MediaServiceImpl.java | 49 ++-- .../storage/controller/StorageController.java | 21 +- .../storage/service/IStorageService.java | 7 +- .../service/impl/StorageServiceImpl.java | 47 ++-- .../controller/WaylineFileController.java | 103 +++++---- .../controller/WaylineJobController.java | 70 +++--- .../wayline/dao/IWaylineFileMapper.java | 4 +- .../sample/wayline/dao/IWaylineJobMapper.java | 4 +- .../model/dto/ConditionalWaylineJobKey.java | 4 +- .../model/dto/FlighttaskProgressExt.java | 2 +- .../model/dto/FlighttaskProgressProgress.java | 2 +- .../wayline/model/dto/KmzFileProperties.java | 2 +- .../wayline/model/dto/WaylineFileDTO.java | 2 +- .../model/dto/WaylineJobBreakPointDTO.java | 2 +- .../wayline/model/dto/WaylineJobDTO.java | 7 +- .../model/dto/WaylineTaskConditionDTO.java | 6 +- .../dto/WaylineTaskCreateBreakPointDTO.java | 2 +- .../model/dto/WaylineTaskCreateDTO.java | 2 +- .../WaylineTaskExecutableConditionDTO.java | 2 +- .../wayline/model/dto/WaylineTaskFileDTO.java | 2 +- .../dto/WaylineTaskProgressReceiver.java | 2 +- .../dto/WaylineTaskReadyConditionDTO.java | 2 +- .../model/entity/WaylineFileEntity.java | 2 +- .../model/entity/WaylineJobEntity.java | 5 +- .../model/enums/WaylineErrorCodeEnum.java | 4 +- .../model/enums/WaylineJobStatusEnum.java | 2 +- .../model/enums/WaylineMethodEnum.java | 2 +- .../model/enums/WaylineTaskStatusEnum.java | 2 +- .../model/enums/WaylineTemplateTypeEnum.java | 2 +- .../model/param/CreateJobBreakPointParam.java | 2 +- .../wayline/model/param/CreateJobParam.java | 14 +- .../wayline/model/param/UpdateJobParam.java | 4 +- .../model/param/WaylineQueryParam.java | 2 +- .../wayline/service/IFlightTaskService.java | 16 +- .../wayline/service/IWaylineFileService.java | 10 +- .../wayline/service/IWaylineJobService.java | 10 +- .../wayline/service/IWaylineRedisService.java | 10 +- .../service/impl/FlightTaskServiceImpl.java | 79 ++++--- .../service/impl/SDKWaylineService.java | 54 ++--- .../service/impl/WaylineFileServiceImpl.java | 65 +++--- .../service/impl/WaylineJobServiceImpl.java | 48 ++-- .../service/impl/WaylineRedisServiceImpl.java | 19 +- .../sample/src/main/resources/application.yml | 63 +----- dk-modules/system/pom.xml | 6 - pom.xml | 1 + 361 files changed, 2473 insertions(+), 3895 deletions(-) create mode 100644 dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/AliyunOss.java create mode 100644 dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/IOssService.java create mode 100644 dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/Minio.java rename {dk-modules/sample/src/main/java/org/dromara/sample/component/redis => dk-common/common-redis/src/main/java/org/dromara/common/redis/config}/RedisConst.java (98%) rename {dk-modules/sample/src/main/java/org/dromara/sample/component/redis => dk-common/common-redis/src/main/java/org/dromara/common/redis/utils}/RedisOpsUtils.java (99%) rename {dk-modules/sample/src/main/java/org/dromara/sample/component => dk-common/common-websocket/src/main/java/org/dromara/common}/websocket/config/MyConcurrentWebSocketSession.java (93%) create mode 100644 dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageResponse.java create mode 100644 dk-modules/sample/pom.xml delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/common/model/CustomClaim.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/common/util/JwtUtil.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/AuthInterceptor.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/CorsFilter.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusConfiguration.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusMetaObjectHandler.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/model/OssConfiguration.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/IOssService.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AliyunOssServiceImpl.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AmazonS3ServiceImpl.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/MinIOServiceImpl.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssAspectHandler.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssServiceContext.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConfiguration.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/AuthPrincipalHandler.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketFactory.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketHandler.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/model/BizCodeEnum.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketManageService.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketMessageService.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketManageServiceImpl.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketMessageServiceImpl.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/configuration/mvc/GlobalMVCConfigurer.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LoginController.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/UserController.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IUserService.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/UserServiceImpl.java diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/map/api/IHttpMapService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/map/api/IHttpMapService.java index 4776e21..fc12cef 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/map/api/IHttpMapService.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/map/api/IHttpMapService.java @@ -49,9 +49,8 @@ public interface IHttpMapService { "it only needs to return the set of elements in the specified element group", schema = @Schema(format = "uuid")), @Parameter(name = "is_distributed", description = "Whether the element group is distributed.") }) - @GetMapping(PREFIX + "/workspaces/{workspace_id}/element-groups") + @GetMapping(PREFIX + "/workspaces/element-groups") HttpResultResponse> getMapElements( - @PathVariable(name = "workspace_id") String workspaceId, @RequestParam(name = "group_id", required = false) String groupId, @RequestParam(name = "is_distributed", required = false) Boolean isDistributed, HttpServletRequest req, HttpServletResponse rsp); diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java index d25ea85..4fd6018 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java @@ -30,19 +30,14 @@ public interface IHttpMediaService { /** * Check if the file has been uploaded by the fingerprint. - * @param workspaceId * @param request * @param req * @param rsp * @return */ - @Operation(summary = "media fast upload", description = "Check if the file has been uploaded by the fingerprint.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")) - }) - @PostMapping(PREFIX + "/workspaces/{workspace_id}/fast-upload") + @Operation(summary = "media fast upload", description = "Check if the file has been uploaded by the fingerprint.") + @PostMapping(PREFIX + "/workspace/fast-upload") HttpResultResponse mediaFastUpload( - @PathVariable(name = "workspace_id") String workspaceId, @Valid @RequestBody MediaFastUploadRequest request, HttpServletRequest req, HttpServletResponse rsp); @@ -50,7 +45,6 @@ public interface IHttpMediaService { /** * When the file is uploaded to the storage server by pilot, * the basic information of the file is reported through this interface. - * @param workspaceId * @param request * @param req * @param rsp @@ -58,9 +52,7 @@ public interface IHttpMediaService { */ @Operation(summary = "app reports file upload result", description = "When the file is uploaded to the storage server by pilot, " + "the basic information of the file is reported through this interface.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")) - }, responses = @ApiResponse(responseCode = "200", description = "OK", + responses = @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/json", examples = {@ExampleObject(name = "responseObjectKey", summary = "response object key", @@ -68,47 +60,36 @@ public interface IHttpMediaService { value = "{\"code\": 0, \"message\":\"success\", \"data\": \"media/DJI_20220831151616_0004_W_Waypoint4.JPG\"}" )}))) - @PostMapping(PREFIX + "/workspaces/{workspace_id}/upload-callback") + @PostMapping(PREFIX + "/workspaces/upload-callback") HttpResultResponse mediaUploadCallback( - @PathVariable(name = "workspace_id") String workspaceId, @Valid @RequestBody MediaUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp); /** * Query the files that already exist in this workspace based on the workspace id and the collection of tiny fingerprints. - * @param workspaceId * @param request There is only one tiny_fingerprint parameter in the body. * @param req * @param rsp * @return */ @Operation(summary = "checks whether the file fingerprint exists", description = "Query the files that already exist in this " + - "workspace based on the workspace id and the collection of tiny fingerprints.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")) - }) + "workspace based on the workspace id and the collection of tiny fingerprints.") @PostMapping(PREFIX + "/workspaces/{workspace_id}/files/tiny-fingerprints") HttpResultResponse getExistFileTinyFingerprint( - @PathVariable(name = "workspace_id") String workspaceId, @Valid @RequestBody GetFileFingerprintRequest request, HttpServletRequest req, HttpServletResponse rsp); /** * Report the upload status of the media files in the file group in real time. - * @param workspaceId * @param request * @param req * @param rsp * @return */ @Operation(summary = "callback after the file group upload complete", description = "Report the upload status of " + - "the media files in the file group in real time.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")) - }) + "the media files in the file group in real time.") @PostMapping(PREFIX + "/workspaces/{workspace_id}/group-upload-callback") HttpResultResponse folderUploadCallback( - @PathVariable(name = "workspace_id") String workspaceId, @Valid @RequestBody FolderUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp); diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/OssTypeEnum.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/OssTypeEnum.java index 29f266b..9885023 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/OssTypeEnum.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/OssTypeEnum.java @@ -1,8 +1,16 @@ package org.dromara.common.sdk.cloudapi.storage; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * @author sean * @version 1.0 @@ -19,6 +27,11 @@ public enum OssTypeEnum { private String type; + private static final Map TYPE_MAP = Collections.unmodifiableMap( + Stream.of(values()).collect( Collectors.toMap(OssTypeEnum::getType, Function.identity()) + ) + ); + OssTypeEnum(String type) { this.type = type; } @@ -27,4 +40,16 @@ public enum OssTypeEnum { public String getType() { return type; } + + @JsonCreator + public static OssTypeEnum fromType(String type) { + return Optional.ofNullable(TYPE_MAP.get(type)) + .orElse(TYPE_MAP.get("minio")); + } + + @Override + public String toString() { + return type; + } + } diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/api/IHttpStorageService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/api/IHttpStorageService.java index 5005131..ce502a8 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/api/IHttpStorageService.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/storage/api/IHttpStorageService.java @@ -22,7 +22,6 @@ public interface IHttpStorageService { /** * Get temporary credentials for uploading the media and wayline in DJI Pilot. - * @param workspaceId workspace id * @param req * @param rsp * @return @@ -31,9 +30,8 @@ public interface IHttpStorageService { parameters = { @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")) }) - @PostMapping(PREFIX + "/workspaces/{workspace_id}/sts") + @PostMapping(PREFIX + "/workspaces/sts") HttpResultResponse getTemporaryCredential( - @PathVariable(name = "workspace_id") String workspaceId, HttpServletRequest req, HttpServletResponse rsp); } diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/tsa/api/IHttpTsaService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/tsa/api/IHttpTsaService.java index d54de4a..89796f8 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/tsa/api/IHttpTsaService.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/tsa/api/IHttpTsaService.java @@ -22,8 +22,8 @@ public interface IHttpTsaService { String PREFIX = "manage/api/v1"; /** + * 获取当前用户工作区中所有设备的拓扑列表，以供飞行员显示。 * Get the topology list of all devices in the current user workspace for pilot display. - * @param workspaceId * @param req * @param rsp * @return @@ -31,13 +31,9 @@ public interface IHttpTsaService { @Operation(summary = "obtain device topology list", description = "Get the topology list of all devices in the current user workspace for pilot display." + "In the first connection, DJI Pilot 2 will call this interface to obtain the list topology of all devices." + "Also, when Pilot receives a websocket command to notify the device of online, offline, and update, " + - "it will also call this interface to request the device topology list to be updated.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")), - }) - @GetMapping(PREFIX + "/workspaces/{workspace_id}/devices/topologies") + "it will also call this interface to request the device topology list to be updated.") + @GetMapping(PREFIX + "/workspaces/devices/topologies") HttpResultResponse obtainDeviceTopologyList( - @PathVariable(name = "workspace_id") String workspaceId, HttpServletRequest req, HttpServletResponse rsp); } diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java index 195f464..31cd61e 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java @@ -33,47 +33,37 @@ public interface IHttpWaylineService { /** * Query the basic data of the wayline file according to the query conditions. * The query condition field in pilot is fixed. - * @param workspaceId workspace id * @param request get waylines params * @param req * @param rsp * @return wayline list */ @Operation(summary = "get wayline list", description = "Query the basic data of the wayline file according to " + - "the query conditions. The query condition field in pilot is fixed.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")) - }) - @GetMapping(PREFIX + "/workspaces/{workspace_id}/waylines") + "the query conditions. The query condition field in pilot is fixed.") + @GetMapping(PREFIX + "/workspaces/waylines") HttpResultResponse> getWaylineList( @Valid @ParameterObject GetWaylineListRequest request, - @PathVariable(name = "workspace_id") String workspaceId, HttpServletRequest req, HttpServletResponse rsp); /** * Query the download address of the file according to the wayline file id, * and redirect to this address directly for download. - * @param workspaceId workspace id - * @param waylineId wayline file id * @param req * @param rsp */ @Operation(summary = "get wayline file download address", description = "Query the download address of the file " + "according to the wayline file id, and redirect to this address directly for download.", parameters = { - @Parameter(name = "workspace_id", description = "workspace id", schema = @Schema(format = "uuid")), @Parameter(name = "wayline_id", description = "wayline id", schema = @Schema(format = "uuid")) }) @GetMapping(PREFIX + "/workspaces/{workspace_id}/waylines/{wayline_id}/url") void getWaylineFileDownloadAddress( - @PathVariable(name = "workspace_id") String workspaceId, @PathVariable(name = "wayline_id") String waylineId, HttpServletRequest req, HttpServletResponse rsp); /** * Checking whether the name already exists according to the wayline name must ensure the uniqueness of the wayline name. * This interface will be called when uploading waylines and must be available. - * @param workspaceId workspace id * @param names wayline file name collection * @param req * @param rsp @@ -83,38 +73,30 @@ public interface IHttpWaylineService { "according to the wayline name must ensure the uniqueness of the wayline name. " + "This interface will be called when uploading waylines and must be available.", parameters = { - @Parameter(name = "workspace_id", description = "workspace id", required = true), @Parameter(name = "name", description = "wayline file name", required = true) }) - @GetMapping(PREFIX + "/workspaces/{workspace_id}/waylines/duplicate-names") + @GetMapping(PREFIX + "/workspaces/waylines/duplicate-names") HttpResultResponse> getDuplicatedWaylineName( - @PathVariable(name = "workspace_id") String workspaceId, @NotNull @Size(min = 1) @RequestParam(name = "name") List names, HttpServletRequest req, HttpServletResponse rsp); /** * When the wayline file is uploaded to the storage server by pilot, * the basic information of the file is reported through this interface. - * @param workspaceId workspace id * @param request upload callback params * @param req * @param rsp * @return success */ @Operation(summary = "file upload result report", description = "When the wayline file is uploaded to the " + - "storage server by pilot, the basic information of the file is reported through this interface.", - parameters = { - @Parameter(name = "workspace_id", description = "workspace id", required = true) - }) - @PostMapping(PREFIX + "/workspaces/{workspace_id}/upload-callback") + "storage server by pilot, the basic information of the file is reported through this interface.") + @PostMapping(PREFIX + "/workspaces/upload-callback") HttpResultResponse fileUploadResultReport( - @PathVariable(name = "workspace_id") String workspaceId, @Valid @RequestBody WaylineUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp); /** * Favorite the wayline file according to the wayline file id. - * @param workspaceId workspace id * @param ids wayline file id * @param req * @param rsp @@ -122,18 +104,15 @@ public interface IHttpWaylineService { */ @Operation(summary = "batch favorites wayline", description = "Favorite the wayline file according to the wayline file id.", parameters = { - @Parameter(name = "workspace_id", description = "workspace id", required = true), @Parameter(name = "id", description = "wayline id", required = true) }) - @PostMapping(PREFIX + "/workspaces/{workspace_id}/favorites") + @PostMapping(PREFIX + "/workspaces/favorites") HttpResultResponse batchFavoritesWayline( - @PathVariable(name = "workspace_id") String workspaceId, @NotNull @Size(min = 1) @RequestParam(name = "id") List ids, HttpServletRequest req, HttpServletResponse rsp); /** * Delete the favorites of this wayline file based on the wayline file id. - * @param workspaceId workspace id * @param ids wayline file id * @param req * @param rsp @@ -141,12 +120,10 @@ public interface IHttpWaylineService { */ @Operation(summary = "batch unfavorites wayline", description = "Delete the favorites of this wayline file based on the wayline file id.", parameters = { - @Parameter(name = "workspace_id", description = "workspace id", required = true), @Parameter(name = "id", description = "wayline id", required = true) }) @DeleteMapping(PREFIX + "/workspaces/{workspace_id}/favorites") HttpResultResponse batchUnfavoritesWayline( - @PathVariable(name = "workspace_id") String workspaceId, @NotNull @Size(min = 1) @RequestParam(name = "id") List ids, HttpServletRequest req, HttpServletResponse rsp); } diff --git a/dk-common/common-oss/pom.xml b/dk-common/common-oss/pom.xml index 0216aae..b27d8fa 100644 --- a/dk-common/common-oss/pom.xml +++ b/dk-common/common-oss/pom.xml @@ -65,7 +65,30 @@ software.amazon.awssdk s3-transfer-manager + + org.dromara + common-cloudsdk + 2.2.2 + compile + + + com.amazonaws + aws-java-sdk-core + 1.12.261 + compile + + + com.amazonaws + aws-java-sdk-sts + 1.12.261 + compile + + + com.aliyun.oss + aliyun-sdk-oss + ${aliyun-oss.version} + diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java index ba924c0..c320b92 100644 --- a/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java @@ -125,6 +125,8 @@ public class OssClient { } } + + /** * 同步创建存储桶 * 如果存储桶不存在，会进行创建；如果存储桶存在，不执行任何操作 @@ -342,6 +344,25 @@ public class OssClient { return url.toString(); } + /** + * 获取私有URL链接 + * + * @param objectKey 对象KEY + * @param second 授权时间 + */ + public URL getPrivateUrlURL(String objectKey, Integer second) { + // 使用 AWS S3 预签名 URL 的生成器 获取对象的预签名 URL + URL url = presigner.presignGetObject( + x -> x.signatureDuration(Duration.ofSeconds(second)) + .getObjectRequest( + y -> y.bucket(properties.getBucketName()) + .key(objectKey) + .build()) + .build()) + .url(); + return url; + } + /** * 上传 byte[] 数据到 Amazon S3，使用指定的后缀构造对象键。 * @@ -433,6 +454,10 @@ public class OssClient { return header + endpoint; } + public OssProperties getOssProperties() { + return this.properties; + } + /** * 根据传入的 region 参数返回相应的 AWS 区域 * 如果 region 参数非空，使用 Region.of 方法创建并返回对应的 AWS 区域对象 diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/AliyunOss.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/AliyunOss.java new file mode 100644 index 0000000..836cb13 --- /dev/null +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/AliyunOss.java @@ -0,0 +1,53 @@ +package org.dromara.common.oss.factory; + +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.auth.sts.AssumeRoleRequest; +import com.aliyuncs.auth.sts.AssumeRoleResponse; +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.http.MethodType; +import com.aliyuncs.profile.DefaultProfile; +import com.aliyuncs.profile.IClientProfile; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; +import org.springframework.stereotype.Service; + + +/** + * @auther wuyuan + * @data 2025/2/15 + */ +@Slf4j +@Service +public class AliyunOss { + + public static CredentialsToken getCredentials( OssClient client) { + try { + String regionId = ""; + // 添加endpoint。适用于Java SDK 3.12.0及以上版本。 + DefaultProfile.addEndpoint(regionId, "Sts", "sts.cn-hangzhou.aliyuncs.com"); + // 添加endpoint。适用于Java SDK 3.12.0以下版本。 + // DefaultProfile.addEndpoint("",regionId, "Sts", endpoint); + // 构造default profile。 + IClientProfile profile = DefaultProfile.getProfile(regionId, client.getOssProperties().getAccessKey(), client.getOssProperties().getSecretKey()); + // 构造client。 + DefaultAcsClient ascClient = new DefaultAcsClient(profile); + AssumeRoleRequest request = new AssumeRoleRequest(); + // 适用于Java SDK 3.12.0及以上版本。 + request.setSysMethod(MethodType.POST); + // 适用于Java SDK 3.12.0以下版本。 + //request.setMethod(MethodType.POST); + request.setRoleArn(client.getOssProperties().getRoleArn()); + request.setRoleSessionName(client.getOssProperties().getRoleSessionName()); + request.setDurationSeconds(client.getOssProperties().getExpire()); + AssumeRoleResponse response = ascClient.getAcsResponse(request); + + return new CredentialsToken(response.getCredentials().getAccessKeyId(), response.getCredentials().getAccessKeySecret(), response.getCredentials().getSecurityToken(), client.getOssProperties().getExpire()); + } catch (ClientException e) { + log.debug("Failed to obtain sts."); + e.printStackTrace(); + } + return null; + } + +} diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/IOssService.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/IOssService.java new file mode 100644 index 0000000..4da6d41 --- /dev/null +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/IOssService.java @@ -0,0 +1,24 @@ +package org.dromara.common.oss.factory; + + +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; +import org.dromara.common.sdk.cloudapi.storage.OssTypeEnum; + +import java.io.InputStream; +import java.net.URL; + +/** + * @author sean + * @version 0.3 + * @date 2021/12/23 + */ +public interface IOssService { + + /** + * Get temporary credentials. + * @return + */ + CredentialsToken getCredentials(OssClient client); + +} diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/Minio.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/Minio.java new file mode 100644 index 0000000..e824c68 --- /dev/null +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/Minio.java @@ -0,0 +1,37 @@ +package org.dromara.common.oss.factory; + +import com.amazonaws.auth.AWSCredentialsProvider; +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.client.builder.AwsClientBuilder; +import com.amazonaws.services.securitytoken.AWSSecurityTokenService; +import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder; +import com.amazonaws.services.securitytoken.model.Credentials; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; + +/** + * @auther wuyuan + * @data 2025/2/15 + */ +@Slf4j +public class Minio { + + public static CredentialsToken getCredentials(OssClient client) { + try { + AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(client.getOssProperties().getEndpoint(), client.getOssProperties().getRegion()); + BasicAWSCredentials basicAWSCredentials = new BasicAWSCredentials(client.getOssProperties().getAccessKey(), client.getOssProperties().getSecretKey()); + AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(basicAWSCredentials); + AWSSecurityTokenService stsClient = AWSSecurityTokenServiceClientBuilder.standard() + .withEndpointConfiguration(endpointConfiguration) + .withCredentials(credentialsProvider).build(); + Credentials credentials = stsClient.getSessionToken().getCredentials(); + return new CredentialsToken(credentials.getAccessKeyId(), credentials.getSecretAccessKey(), credentials.getSessionToken(), client.getOssProperties().getExpire()); + } catch (Exception e) { + log.debug("Failed to obtain sts."); + e.printStackTrace(); + } + return null; + } +} diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java index f7a0f6b..e7b8688 100644 --- a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java @@ -10,6 +10,8 @@ import org.dromara.common.oss.properties.OssProperties; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; +import org.dromara.common.sdk.cloudapi.storage.OssTypeEnum; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -25,7 +27,6 @@ public class OssFactory { private static final Map CLIENT_CACHE = new ConcurrentHashMap<>(); private static final ReentrantLock LOCK = new ReentrantLock(); - /** * 获取默认实例 */ @@ -70,4 +71,36 @@ public class OssFactory { return client; } + public static synchronized CredentialsToken getCredentials(String configKey) { + String json = CacheUtils.get(CacheNames.SYS_OSS_CONFIG, configKey); + if (json == null) { + throw new OssException("系统异常, '" + configKey + "'配置信息不存在!"); + } + OssProperties properties = JsonUtils.parseObject(json, OssProperties.class); + // 使用租户标识避免多个租户相同key实例覆盖 + String key = configKey; + if (StringUtils.isNotBlank(properties.getTenantId())) { + key = properties.getTenantId() + ":" + configKey; + } + OssClient client = CLIENT_CACHE.get(key); + // 客户端不存在或配置不相同则重新构建 + if (client == null || !client.checkPropertiesSame(properties)) { + LOCK.lock(); + try { + if(OssTypeEnum.ALIYUN.getType().equals(client.getOssProperties().getSThreeType())){ + AliyunOss.getCredentials(client); + }else if(OssTypeEnum.MINIO.getType().equals(client.getOssProperties().getSThreeType())){ + Minio.getCredentials(client); + } + } catch (Exception e) { + log.debug("Failed to obtain sts."); + e.printStackTrace(); + } finally { + LOCK.unlock(); + } + } + return null; + } + + } diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java index cb37206..c7242b3 100644 --- a/dk-common/common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java @@ -50,6 +50,26 @@ public class OssProperties { */ private String region; + /** + * s3类型（0minio，1oss，2aws） + */ + private String sThreeType; + + /** + * 角色会话名称 + */ + private String roleSessionName; + + /** + * AWS账户 + */ + private String roleArn; + + /** + * 授权时间 + */ + private Long expire; + /** * 是否https（Y=是,N=否） */ @@ -60,4 +80,6 @@ public class OssProperties { */ private String accessPolicy; + + } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConst.java b/dk-common/common-redis/src/main/java/org/dromara/common/redis/config/RedisConst.java similarity index 98% rename from dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConst.java rename to dk-common/common-redis/src/main/java/org/dromara/common/redis/config/RedisConst.java index a2b2523..68548ed 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConst.java +++ b/dk-common/common-redis/src/main/java/org/dromara/common/redis/config/RedisConst.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.redis; +package org.dromara.common.redis.config; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisOpsUtils.java b/dk-common/common-redis/src/main/java/org/dromara/common/redis/utils/RedisOpsUtils.java similarity index 99% rename from dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisOpsUtils.java rename to dk-common/common-redis/src/main/java/org/dromara/common/redis/utils/RedisOpsUtils.java index a3e83b3..1be68dc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisOpsUtils.java +++ b/dk-common/common-redis/src/main/java/org/dromara/common/redis/utils/RedisOpsUtils.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.redis; +package org.dromara.common.redis.utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyConcurrentWebSocketSession.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/config/MyConcurrentWebSocketSession.java similarity index 93% rename from dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyConcurrentWebSocketSession.java rename to dk-common/common-websocket/src/main/java/org/dromara/common/websocket/config/MyConcurrentWebSocketSession.java index 6941064..03a40bd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyConcurrentWebSocketSession.java +++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/config/MyConcurrentWebSocketSession.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.websocket.config; +package org.dromara.common.websocket.config; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator; @@ -22,4 +22,4 @@ public class MyConcurrentWebSocketSession extends ConcurrentWebSocketSessionDeco this(delegate, SEND_TIME_LIMIT, SEND_BUFFER_SIZE_LIMIT); } -} \ No newline at end of file +} diff --git a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/BizCodeEnum.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/BizCodeEnum.java index 427c644..cf932e5 100644 --- a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/BizCodeEnum.java +++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/BizCodeEnum.java @@ -1,14 +1,10 @@ package org.dromara.common.websocket.dto; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.v3.oas.annotations.media.Schema; - /** * @author sean * @version 0.1 * @date 2021/11/26 */ -@Schema(enumAsRef = true, description = "Pilot2 will receive these bizCode, and then do corresponding processing according to the value.") public enum BizCodeEnum { DEVICE_ONLINE("device_online"), @@ -19,24 +15,79 @@ public enum BizCodeEnum { DEVICE_OSD("device_osd"), + RC_OSD("gateway_osd"), + + DOCK_OSD("dock_osd"), + MAP_ELEMENT_CREATE("map_element_create"), MAP_ELEMENT_UPDATE("map_element_update"), MAP_ELEMENT_DELETE("map_element_delete"), - MAP_GROUP_REFRESH("map_group_refresh"); + MAP_GROUP_REFRESH("map_group_refresh"), + + FLIGHT_TASK_PROGRESS("flighttask_progress"), + + DEVICE_HMS("device_hms"), + + DEVICE_REBOOT("device_reboot"), + + DRONE_OPEN("drone_open"), + + DRONE_CLOSE("drone_close"), + + DEVICE_CHECK("device_check"), + + DRONE_FORMAT("drone_format"), + + DEVICE_FORMAT("device_format"), + + COVER_OPEN("cover_open"), + + COVER_CLOSE("cover_close"), + + PUTTER_OPEN("putter_open"), + + PUTTER_CLOSE("putter_close"), + + CHARGE_OPEN("charge_open"), - private final String code; + CHARGE_CLOSE("charge_close"), + + FILE_UPLOAD_CALLBACK("file_upload_callback"), + + FILE_UPLOAD_PROGRESS("fileupload_progress"), + + OTA_PROGRESS("ota_progress"), + + HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA("highest_priority_upload_flighttask_media"), + + CONTROL_SOURCE_CHANGE("control_source_change"), + + FLY_TO_POINT_PROGRESS("fly_to_point_progress"), + + TAKE_OFF_TO_POINT_PROGRESS("takeoff_to_point_progress"), + + DRC_STATUS_NOTIFY("drc_status_notify"), + + JOYSTICK_INVALID_NOTIFY("joystick_invalid_notify"), + + FLIGHT_AREAS_SYNC_PROGRESS("flight_areas_sync_progress"), + + FLIGHT_AREAS_DRONE_LOCATION("flight_areas_drone_location"), + + FLIGHT_AREAS_UPDATE("flight_areas_update"), + + ; + + private String code; BizCodeEnum(String code) { this.code = code; } - @JsonValue public String getCode() { return code; } - - } diff --git a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageResponse.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageResponse.java new file mode 100644 index 0000000..97d1a3e --- /dev/null +++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageResponse.java @@ -0,0 +1,83 @@ +package org.dromara.common.websocket.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + + +/** + * The format of WebSocket messages that the pilot can receive. + * @author sean.zhou + * @date 2021/11/17 + * @version 0.1 + */ +@Schema(description = "The format of WebSocket messages that the pilot can receive.") +public class WebSocketMessageResponse { + + @JsonProperty("biz_code") + @NotNull + @Schema(description = "webSocket messages identity", implementation = BizCodeEnum.class) + private String bizCode; + + @Schema(description = "webSocket messages version") + private String version = "1.0"; + + @NotNull + @Min(123456789012L) + @Schema(description = "timestamp (milliseconds)") + private Long timestamp; + + @NotNull + @Schema(description = "Data corresponding to business functions") + private T data; + + public WebSocketMessageResponse() { + } + + @Override + public String toString() { + return "WebSocketMessageResponse{" + + "bizCode=" + bizCode + + ", version='" + version + '\'' + + ", timestamp=" + timestamp + + ", data=" + data + + '}'; + } + + public String getBizCode() { + return bizCode; + } + + public WebSocketMessageResponse setBizCode(String bizCode) { + this.bizCode = bizCode; + return this; + } + + public String getVersion() { + return version; + } + + public WebSocketMessageResponse setVersion(String version) { + this.version = version; + return this; + } + + public Long getTimestamp() { + return timestamp; + } + + public WebSocketMessageResponse setTimestamp(Long timestamp) { + this.timestamp = timestamp; + return this; + } + + public T getData() { + return data; + } + + public WebSocketMessageResponse setData(T data) { + this.data = data; + return this; + } +} diff --git a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java index 35320c6..0d7d695 100644 --- a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java +++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java @@ -1,12 +1,17 @@ package org.dromara.common.websocket.utils; import cn.hutool.core.collection.CollUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.checkerframework.checker.units.qual.C; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.websocket.dto.WebSocketMessageDto; +import org.dromara.common.websocket.dto.WebSocketMessageResponse; import org.dromara.common.websocket.holder.WebSocketSessionHolder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketMessage; @@ -15,6 +20,7 @@ import org.springframework.web.socket.WebSocketSession; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; @@ -75,6 +81,51 @@ public class WebSocketUtils { } } + /** + * 发布WebSocket订阅消息 + * + * @param + */ + public static void publishAll(Integer userType, String bizCode, Object data) { + WebSocketMessageResponse message = new WebSocketMessageResponse() + .setData(Objects.requireNonNullElse(data, "")) + .setTimestamp(System.currentTimeMillis()) + .setBizCode(bizCode); + ObjectMapper mapper = new ObjectMapper(); + try { + WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); + broadcastMessage.setMessage(mapper.writeValueAsString(message)); + RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { + log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message); + }); + }catch (Exception e) { + e.printStackTrace(); + } + } + /** + * 发布WebSocket订阅消息 + * + * @param + */ + public static void publishAll(String bizCode, Object data) { + WebSocketMessageResponse message = new WebSocketMessageResponse() + .setData(Objects.requireNonNullElse(data, "")) + .setTimestamp(System.currentTimeMillis()) + .setBizCode(bizCode); + ObjectMapper mapper = new ObjectMapper(); + try { + WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); + broadcastMessage.setMessage(mapper.writeValueAsString(message)); + RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { + log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message); + }); + }catch (Exception e) { + e.printStackTrace(); + } + } + + + /** * 向所有的WebSocket会话发布订阅的消息(群发) * diff --git a/dk-modules/pom.xml b/dk-modules/pom.xml index 6f2c279..c6aace5 100644 --- a/dk-modules/pom.xml +++ b/dk-modules/pom.xml @@ -14,6 +14,7 @@ job resource workflow + sample dk-modules diff --git a/dk-modules/resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java b/dk-modules/resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java index 53a620c..53a1f6e 100644 --- a/dk-modules/resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java +++ b/dk-modules/resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java @@ -68,6 +68,26 @@ public class SysOssConfig extends BaseEntity { */ private String region; + /** + * s3类型（minio(包含其他方式)，oss，aws） + */ + private String sThreeType; + + /** + * 角色会话名称 + */ + private String roleSessionName; + + /** + * AWS账户 + */ + private String roleArn; + + /** + * 授权时间 + */ + private Long expire; + /** * 是否默认（0=是,1=否） */ diff --git a/dk-modules/resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java b/dk-modules/resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java index 2871bf6..2bd1b4a 100644 --- a/dk-modules/resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java +++ b/dk-modules/resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java @@ -90,6 +90,26 @@ public class SysOssConfigBo extends BaseEntity { */ private String region; + /** + * s3类型（minio(包含其他方式)，oss，aws） + */ + private String sThreeType; + + /** + * 角色会话名称 + */ + private String roleSessionName; + + /** + * AWS账户 + */ + private String roleArn; + + /** + * 授权时间 + */ + private Long expire; + /** * 扩展字段 */ diff --git a/dk-modules/resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java b/dk-modules/resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java index 7d0860a..4000008 100644 --- a/dk-modules/resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java +++ b/dk-modules/resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java @@ -72,6 +72,26 @@ public class SysOssConfigVo implements Serializable { */ private String region; + /** + * s3类型（0minio，1oss，2aws） + */ + private String sThreeType; + + /** + * 角色会话名称 + */ + private String roleSessionName; + + /** + * AWS账户 + */ + private String roleArn; + + /** + * 授权时间 + */ + private Long expire; + /** * 是否默认（0=是,1=否） */ diff --git a/dk-modules/sample/pom.xml b/dk-modules/sample/pom.xml new file mode 100644 index 0000000..053c659 --- /dev/null +++ b/dk-modules/sample/pom.xml @@ -0,0 +1,138 @@ + + + + org.dromara + dk-modules + ${revision} + + 4.0.0 + + sample + + + + + + org.dromara + common-nacos + + + org.dromara + common-core + + + org.dromara + common-cloudsdk + 2.2.2 + + + org.dromara + common-sentinel + + + + + org.dromara + common-log + + + + org.dromara + common-dict + + + + org.dromara + common-doc + + + + org.dromara + common-web + + + + org.dromara + common-mybatis + + + + org.dromara + common-dubbo + + + + org.dromara + common-seata + + + + org.dromara + common-idempotent + + + + org.dromara + common-tenant + + + + org.dromara + common-security + + + + org.dromara + common-translation + + + + org.dromara + common-sensitive + + + + org.dromara + common-encrypt + + + + + org.dromara + api-system + + + + org.dromara + api-resource + + + org.dromara + common-websocket + + + org.dom4j + dom4j + 2.1.3 + compile + + + org.dromara + common-oss + + + + com.amazonaws + aws-java-sdk-s3 + 1.12.261 + + + com.amazonaws + aws-java-sdk-sts + 1.12.261 + + + + diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java index b36e909..b0e9b04 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java @@ -1,4 +1,4 @@ -package com.dji.sample; +package org.dromara.sample; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; -@MapperScan("com.dji.sample.*.dao") +@MapperScan("org.dromara.sample.*.dao") @SpringBootApplication @EnableScheduling @ComponentScan("com.dji") diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/common/error/CommonErrorEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/common/error/CommonErrorEnum.java index 18af675..9e78007 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/common/error/CommonErrorEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/common/error/CommonErrorEnum.java @@ -1,6 +1,7 @@ -package com.dji.sample.common.error; +package org.dromara.sample.common.error; -import com.dji.sdk.common.IErrorInfo; + +import org.dromara.common.sdk.common.IErrorInfo; /** * @author sean.zhou diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/common/model/CustomClaim.java b/dk-modules/sample/src/main/java/org/dromara/sample/common/model/CustomClaim.java deleted file mode 100644 index 85c16a9..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/common/model/CustomClaim.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.dji.sample.common.model; - -import com.auth0.jwt.interfaces.Claim; -import com.fasterxml.jackson.annotation.JsonAlias; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.lang.reflect.Field; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * A custom claim for storing custom information in the token. - * @author sean.zhou - * @date 2021/11/16 - * @version 0.1 - */ -@AllArgsConstructor -@NoArgsConstructor -@Data -@Slf4j -public class CustomClaim { - - /** - * The id of the account. - */ - private String id; - - private String username; - - @JsonAlias("user_type") - private Integer userType; - - @JsonAlias("workspace_id") - private String workspaceId; - - /** - * Convert the custom claim data type to the Map type. - * @return map - */ - public ConcurrentHashMap convertToMap() { - ConcurrentHashMap map = new ConcurrentHashMap<>(4); - try { - Field[] declaredFields = this.getClass().getDeclaredFields(); - for (Field field : declaredFields) { - JsonAlias annotation = field.getAnnotation(JsonAlias.class); - field.setAccessible(true); - // The value of key is named underscore. - map.put(annotation != null ? annotation.value()[0] : field.getName(), - field.get(this).toString()); - } - } catch (IllegalAccessException e) { - log.info("CustomClaim converts failed. {}", this.toString()); - e.printStackTrace(); - } - return map; - } - - /** - * Convert the data in Map into a custom claim object. - * @param claimMap - */ - public CustomClaim (Map claimMap) { - Field[] declaredFields = this.getClass().getDeclaredFields(); - for (Field field : declaredFields) { - field.setAccessible(true); - JsonAlias annotation = field.getAnnotation(JsonAlias.class); - - Claim value = claimMap.get(annotation == null ? field.getName() : annotation.value()[0]); - try { - Class type = field.getType(); - if (Integer.class.equals(type)) { - field.set(this, Integer.valueOf(value.asString())); - continue; - } - if (String.class.equals(type)) { - field.set(this, value.asString()); - continue; - } - } catch (IllegalAccessException e) { - log.info("Claim parses failed. {}", claimMap.toString()); - e.printStackTrace(); - } - } - } -} \ No newline at end of file diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/common/util/JwtUtil.java b/dk-modules/sample/src/main/java/org/dromara/sample/common/util/JwtUtil.java deleted file mode 100644 index d1e9c03..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/common/util/JwtUtil.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.dji.sample.common.util; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.JWTCreator; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.TokenExpiredException; -import com.auth0.jwt.interfaces.DecodedJWT; -import com.dji.sample.common.model.CustomClaim; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.util.*; - -@Slf4j -@Component -public class JwtUtil { - - private static String issuer; - - private static String subject; - - private static long age; - - private static String secret; - - public static Algorithm algorithm; - - @Value("${jwt.issuer: DJI}") - private void setIssuer(String issuer) { - JwtUtil.issuer = issuer; - } - - @Value("${jwt.subject: CloudApiSample}") - private void setSubject(String subject) { - JwtUtil.subject = subject; - } - - @Value("${jwt.age: 86400}") - private void setAge(long age) { - JwtUtil.age = age * 1000; - } - - @Value("${jwt.secret: CloudApiSample}") - private void setSecret(String secret) { - JwtUtil.secret = secret; - setAlgorithm(); - } - - private void setAlgorithm() { - JwtUtil.algorithm = Algorithm.HMAC256(secret); - } - - private JwtUtil() { - - } - - /** - * Create a token based on custom information. - * @param claims custom information - * @return token - */ - public static String createToken(Map claims) { - return JwtUtil.createToken(claims, age, algorithm, subject, issuer); - } - - /** - * - * @param claims - * @param age unit: s - * @param algorithm - * @param subject - * @param issuer - * @return - */ - public static String createToken(Map claims, Long age, Algorithm algorithm, String subject, String issuer) { - if (Objects.isNull(algorithm)) { - throw new IllegalArgumentException(); - } - - Date now = new Date(); - JWTCreator.Builder builder = JWT.create(); - // Add custom information to the token's payload segment. - claims.forEach((k, v) -> { - if (Objects.nonNull(v.getClass().getClassLoader())) { - log.error("claim can't be set to a custom object."); - return; - } - if (v instanceof Map) { - builder.withClaim(k, (Map) v); - } else if (v instanceof List) { - builder.withClaim(k, (List) v); - } else { - builder.withClaim(k, String.valueOf(v)); - } - }); - - if (StringUtils.hasText(subject)) { - builder.withSubject(subject); - } - - if (StringUtils.hasText(issuer)) { - builder.withIssuer(issuer); - } - - if (Objects.nonNull(age)) { - builder.withExpiresAt(new Date(now.getTime() + age)); - } - - String token = builder - .withIssuedAt(now) - .withNotBefore(now) - .sign(algorithm); - log.debug("token created. " + token); - return token; - } - - /** - * Verify that the token is valid. - * @param token - * @return - * @throws TokenExpiredException - */ - public static DecodedJWT verifyToken(String token) { - return JWT.require(algorithm).build().verify(token); - } - - /** - * Parses the custom information in the token into a CustomClaim object. - * @param token - * @return custom claim - */ - public static Optional parseToken(String token) { - DecodedJWT jwt; - try { - jwt = verifyToken(token); - } catch (Exception e) { - e.printStackTrace(); - return Optional.empty(); - } - return Optional.of(new CustomClaim(jwt.getClaims())); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/common/util/SpringBeanUtilsTest.java b/dk-modules/sample/src/main/java/org/dromara/sample/common/util/SpringBeanUtilsTest.java index cbe4ab1..7ffb80b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/common/util/SpringBeanUtilsTest.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/common/util/SpringBeanUtilsTest.java @@ -1,4 +1,4 @@ -package com.dji.sample.common.util; +package org.dromara.sample.common.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java index 16a691c..9480f33 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/ApplicationBootInitial.java @@ -1,12 +1,13 @@ -package com.dji.sample.component; - -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.common.SDKManager; +package org.dromara.sample.component; + + +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.common.SDKManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; @@ -49,4 +50,4 @@ public class ApplicationBootInitial implements CommandLineRunner { deviceRedisService.getDeviceOnline(device.getChildDeviceSn()).map(DeviceDTO::getThingVersion).orElse(null)))); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/AuthInterceptor.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/AuthInterceptor.java deleted file mode 100644 index 9933466..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/AuthInterceptor.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.dji.sample.component; - -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.common.util.JwtUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Optional; - -@Slf4j -@Component -public class AuthInterceptor implements HandlerInterceptor { - - public static final String PARAM_TOKEN = "x-auth-token"; - - public static final String TOKEN_CLAIM = "customClaim"; - - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String uri = request.getRequestURI(); - log.debug("request uri: {}, IP: {}", uri, request.getRemoteAddr()); - // The options method is passed directly. - if (HttpMethod.OPTIONS.matches(request.getMethod())) { - response.setStatus(HttpStatus.OK.value()); - return false; - } - String token = request.getHeader(PARAM_TOKEN); - // Check if the token exists. - if (!StringUtils.hasText(token)) { - response.setStatus(HttpStatus.UNAUTHORIZED.value()); - log.error(CommonErrorEnum.NO_TOKEN.getMessage()); - return false; - } - - // Check if the current token is valid. - Optional customClaimOpt = JwtUtil.parseToken(token); - if (customClaimOpt.isEmpty()) { - response.setStatus(HttpStatus.UNAUTHORIZED.value()); - return false; - } - - // Put the custom data from the token into the request. - request.setAttribute(TOKEN_CLAIM, customClaimOpt.get()); - return true; - } - - @Override - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { - // Delete the custom data in the request after the request ends. - request.removeAttribute(TOKEN_CLAIM); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/CorsFilter.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/CorsFilter.java deleted file mode 100644 index a4c245f..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/CorsFilter.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.dji.sample.component; - -import org.springframework.stereotype.Component; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -import static com.dji.sample.component.AuthInterceptor.PARAM_TOKEN; - -/** - * @author sean.zhou - * @version 0.1 - * @date 2021/11/22 - */ -@Component -public class CorsFilter implements Filter { - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Credentials", "true"); - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Access-Control-Allow-Headers," + - "Authorization, Content-Length, X-CSRF-Token, Token,session,X_Requested_With,Accept, "+ - "Origin, Host, Connection, Accept-Encoding, Accept-Language,DNT, X-CustomHeader, Keep-Alive," + - " User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Pragma," + PARAM_TOKEN); - if (((HttpServletRequest) request).getMethod().equals("OPTIONS")) { - return; - } - filterChain.doFilter(request, response); - } -} \ No newline at end of file diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java index f7e79c2..5451562 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package com.dji.sample.component; +package org.dromara.sample.component; -import com.dji.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.HttpResultResponse; import org.springframework.validation.BindException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java index fe4dfd2..2def2b5 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java @@ -1,13 +1,14 @@ -package com.dji.sample.component; - -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.mqtt.IMqttTopicService; +package org.dromara.sample.component; + + +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.mqtt.IMqttTopicService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -58,4 +59,4 @@ public class GlobalScheduleService { log.info("Subscriptions: {}", Arrays.toString(topicService.getSubscribedTopic())); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttMessageChannel.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttMessageChannel.java index aba87cb..f47bb8c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttMessageChannel.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttMessageChannel.java @@ -1,6 +1,6 @@ -package com.dji.sample.component.mqtt.config; +package org.dromara.sample.component.mqtt.config; -import com.dji.sdk.mqtt.ChannelName; +import org.dromara.common.sdk.mqtt.ChannelName; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttPropertyConfiguration.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttPropertyConfiguration.java index 1cc5b17..dcdbfe3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttPropertyConfiguration.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/config/MqttPropertyConfiguration.java @@ -1,14 +1,11 @@ -package com.dji.sample.component.mqtt.config; +package org.dromara.sample.component.mqtt.config; -import com.auth0.jwt.algorithms.Algorithm; -import com.dji.sample.common.util.JwtUtil; -import com.dji.sample.component.mqtt.model.MqttClientOptions; -import com.dji.sample.component.mqtt.model.MqttProtocolEnum; -import com.dji.sample.component.mqtt.model.MqttUseEnum; -import com.dji.sdk.cloudapi.control.DrcModeMqttBroker; +import org.dromara.sample.component.mqtt.model.MqttClientOptions; +import org.dromara.sample.component.mqtt.model.MqttProtocolEnum; +import org.dromara.sample.component.mqtt.model.MqttUseEnum; import lombok.Data; +import org.dromara.common.sdk.cloudapi.control.DrcModeMqttBroker; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -38,6 +35,7 @@ public class MqttPropertyConfiguration { } /** + * 获取mqtt客户端基本链接的配置选项。 * Get the configuration options of the basic link of the mqtt client. * @return */ @@ -49,6 +47,7 @@ public class MqttPropertyConfiguration { } /** + * 获取基本链接的mqtt地址。 * Get the mqtt address of the basic link. * @return */ @@ -57,6 +56,7 @@ public class MqttPropertyConfiguration { } /** + * 根据不同客户端的参数拼接mqtt地址。 * Splice the mqtt address according to the parameters of different clients. * @param options * @return @@ -75,7 +75,7 @@ public class MqttPropertyConfiguration { } /** - * Get the connection parameters of the mqtt client of the drc link. + * 获取drc链接的mqtt客户端的连接参数。 * @param clientId * @param username * @param age The validity period of the token. unit: s @@ -86,9 +86,6 @@ public class MqttPropertyConfiguration { if (!mqtt.containsKey(MqttUseEnum.DRC)) { throw new RuntimeException("请先在后端配置文件中配置mqtt的drc链接参数。"); } - Algorithm algorithm = JwtUtil.algorithm; - - String token = JwtUtil.createToken(map, age, algorithm, null, null); return new DrcModeMqttBroker() .setAddress(getMqttAddress(mqtt.get(MqttUseEnum.DRC))) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/EventsReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/EventsReceiver.java index f24f6af..a02ca2e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/EventsReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/EventsReceiver.java @@ -1,9 +1,10 @@ -package com.dji.sample.component.mqtt.model; +package org.dromara.sample.component.mqtt.model; + -import com.dji.sdk.mqtt.events.EventsDataRequest; -import com.dji.sdk.mqtt.events.EventsErrorCode; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.*; +import org.dromara.common.sdk.mqtt.events.EventsDataRequest; +import org.dromara.common.sdk.mqtt.events.EventsErrorCode; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MapKeyConst.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MapKeyConst.java index 632152e..afe29af 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MapKeyConst.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MapKeyConst.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.mqtt.model; +package org.dromara.sample.component.mqtt.model; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttClientOptions.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttClientOptions.java index d1168bd..8c29c0c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttClientOptions.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttClientOptions.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.mqtt.model; +package org.dromara.sample.component.mqtt.model; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttProtocolEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttProtocolEnum.java index 49bce90..e3794e1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttProtocolEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttProtocolEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.mqtt.model; +package org.dromara.sample.component.mqtt.model; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttUseEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttUseEnum.java index 3f56704..33432b7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttUseEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/mqtt/model/MqttUseEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.component.mqtt.model; +package org.dromara.sample.component.mqtt.model; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusConfiguration.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusConfiguration.java deleted file mode 100644 index 2992641..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusConfiguration.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.dji.sample.component.mybatis; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @author sean - * @version 0.3 - * @date 2021/12/22 - */ -@Configuration -public class MybatisPlusConfiguration { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // select database - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); - return interceptor; - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusMetaObjectHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusMetaObjectHandler.java deleted file mode 100644 index ffd6bb1..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/mybatis/MybatisPlusMetaObjectHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.dji.sample.component.mybatis; - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.apache.ibatis.reflection.MetaObject; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.time.ZoneId; - -/** - * Automatic filling for set values - */ -@Component -public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { - - /** - * Automatic filling when inserting into the database. - * @param metaObject - */ - @Override - public void insertFill(MetaObject metaObject) { - this.strictInsertFill(metaObject, "createTime", Long.class, - LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); - this.strictInsertFill(metaObject, "updateTime", Long.class, - LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); - } - - /** - * Automatic filling when updating the data. - * @param metaObject - */ - @Override - public void updateFill(MetaObject metaObject) { - this.strictUpdateFill(metaObject, "updateTime", Long.class, - LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/model/OssConfiguration.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/model/OssConfiguration.java deleted file mode 100644 index 496c16a..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/model/OssConfiguration.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.dji.sample.component.oss.model; - -import com.dji.sdk.cloudapi.storage.OssTypeEnum; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author sean - * @version 0.2 - * @date 2021/12/9 - */ -@ConfigurationProperties(prefix = "oss") -@Component -public class OssConfiguration { - - /** - * @see OssTypeEnum - */ - public static OssTypeEnum provider; - - /** - * Whether to use the object storage service. - */ - public static boolean enable; - - /** - * The protocol needs to be included at the beginning of the address. - */ - public static String endpoint; - - public static String accessKey; - - public static String secretKey; - - public static String region; - - public static Long expire; - - public static String roleSessionName; - - public static String roleArn; - - public static String bucket; - - public static String objectDirPrefix; - - public void setProvider(OssTypeEnum provider) { - OssConfiguration.provider = provider; - } - - public void setEnable(boolean enable) { - OssConfiguration.enable = enable; - } - - public void setEndpoint(String endpoint) { - OssConfiguration.endpoint = endpoint; - } - - public void setAccessKey(String accessKey) { - OssConfiguration.accessKey = accessKey; - } - - public void setSecretKey(String secretKey) { - OssConfiguration.secretKey = secretKey; - } - - public void setRegion(String region) { - OssConfiguration.region = region; - } - - public void setExpire(Long expire) { - OssConfiguration.expire = expire; - } - - public void setRoleSessionName(String roleSessionName) { - OssConfiguration.roleSessionName = roleSessionName; - } - - public void setRoleArn(String roleArn) { - OssConfiguration.roleArn = roleArn; - } - - public void setBucket(String bucket) { - OssConfiguration.bucket = bucket; - } - - public void setObjectDirPrefix(String objectDirPrefix) { - OssConfiguration.objectDirPrefix = objectDirPrefix; - } -} - - - diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/IOssService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/IOssService.java deleted file mode 100644 index 3b26050..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/IOssService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.dji.sample.component.oss.service; - -import com.dji.sdk.cloudapi.storage.CredentialsToken; -import com.dji.sdk.cloudapi.storage.OssTypeEnum; - -import java.io.InputStream; -import java.net.URL; - -/** - * @author sean - * @version 0.3 - * @date 2021/12/23 - */ -public interface IOssService { - - OssTypeEnum getOssType(); - - /** - * Get temporary credentials. - * @return - */ - CredentialsToken getCredentials(); - - /** - * Get the address of the object based on the bucket name and the object name. - * @param bucket bucket name - * @param objectKey object name - * @return download link - */ - URL getObjectUrl(String bucket, String objectKey); - - /** - * Deletes the object in the storage bucket. - * @param bucket - * @param objectKey - * @return - */ - Boolean deleteObject(String bucket, String objectKey); - - /** - * Get the contents of an object. - * @param bucket - * @param objectKey - * @return - */ - InputStream getObject(String bucket, String objectKey); - - void putObject(String bucket, String objectKey, InputStream input); - - void createClient(); -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AliyunOssServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AliyunOssServiceImpl.java deleted file mode 100644 index ff4c59f..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AliyunOssServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.dji.sample.component.oss.service.impl; - -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.OSSException; -import com.aliyun.oss.model.ObjectMetadata; -import com.aliyun.oss.model.PutObjectRequest; -import com.aliyun.oss.model.PutObjectResult; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; -import com.aliyuncs.profile.IClientProfile; -import com.aliyuncs.sts.model.v20150401.AssumeRoleRequest; -import com.aliyuncs.sts.model.v20150401.AssumeRoleResponse; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.IOssService; -import com.dji.sdk.cloudapi.storage.CredentialsToken; -import com.dji.sdk.cloudapi.storage.OssTypeEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.io.InputStream; -import java.net.URL; -import java.util.Date; -import java.util.Objects; - -/** - * @author sean - * @version 0.3 - * @date 2021/12/23 - */ -@Service -@Slf4j -public class AliyunOssServiceImpl implements IOssService { - - private OSS ossClient; - - @Override - public OssTypeEnum getOssType() { - return OssTypeEnum.ALIYUN; - } - - @Override - public CredentialsToken getCredentials() { - - try { - - - String regionId = ""; - // 添加endpoint。适用于Java SDK 3.12.0及以上版本。 - DefaultProfile.addEndpoint(regionId, "Sts", "sts.cn-hangzhou.aliyuncs.com"); - // 添加endpoint。适用于Java SDK 3.12.0以下版本。 - // DefaultProfile.addEndpoint("",regionId, "Sts", endpoint); - // 构造default profile。 - IClientProfile profile = DefaultProfile.getProfile(regionId, OssConfiguration.accessKey, OssConfiguration.secretKey); - // 构造client。 - DefaultAcsClient client = new DefaultAcsClient(profile); - AssumeRoleRequest request = new AssumeRoleRequest(); - // 适用于Java SDK 3.12.0及以上版本。 - request.setSysMethod(MethodType.POST); - // 适用于Java SDK 3.12.0以下版本。 - //request.setMethod(MethodType.POST); - request.setRoleArn(OssConfiguration.roleArn); - request.setRoleSessionName(OssConfiguration.roleSessionName); - request.setDurationSeconds(OssConfiguration.expire); - AssumeRoleResponse response = client.getAcsResponse(request); - - return new CredentialsToken(response.getCredentials().getAccessKeyId(), response.getCredentials().getAccessKeySecret(), response.getCredentials().getSecurityToken(), OssConfiguration.expire); - } catch (ClientException e) { - log.debug("Failed to obtain sts."); - e.printStackTrace(); - } - return null; - } - - @Override - public URL getObjectUrl(String bucket, String objectKey) { - // First check if the object can be fetched. - boolean isExist = ossClient.doesObjectExist(bucket, objectKey); - if (!isExist) { - throw new OSSException("The object does not exist."); - } - - return ossClient.generatePresignedUrl(bucket, objectKey, - new Date(System.currentTimeMillis() + OssConfiguration.expire * 1000)); - } - - @Override - public Boolean deleteObject(String bucket, String objectKey) { - if (!ossClient.doesObjectExist(bucket, objectKey)) { - return true; - } - ossClient.deleteObject(bucket, objectKey); - return true; - } - - @Override - public InputStream getObject(String bucket, String objectKey) { - return ossClient.getObject(bucket, objectKey).getObjectContent(); - } - - @Override - public void putObject(String bucket, String objectKey, InputStream input) { - if (ossClient.doesObjectExist(bucket, objectKey)) { - throw new RuntimeException("The filename already exists."); - } - PutObjectResult objectResult = ossClient.putObject(new PutObjectRequest(bucket, objectKey, input, new ObjectMetadata())); - log.info("Upload FlighttaskCreateFile: {}", objectResult.getETag()); - } - - public void createClient() { - if (Objects.nonNull(this.ossClient)) { - return; - } - this.ossClient = new OSSClientBuilder() - .build(OssConfiguration.endpoint, OssConfiguration.accessKey, OssConfiguration.secretKey); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AmazonS3ServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AmazonS3ServiceImpl.java deleted file mode 100644 index dabc0bd..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/AmazonS3ServiceImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.dji.sample.component.oss.service.impl; - -import com.amazonaws.HttpMethod; -import com.amazonaws.auth.AWSStaticCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.*; -import com.amazonaws.services.securitytoken.AWSSecurityTokenService; -import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder; -import com.amazonaws.services.securitytoken.model.AssumeRoleRequest; -import com.amazonaws.services.securitytoken.model.AssumeRoleResult; -import com.amazonaws.services.securitytoken.model.Credentials; -import com.dji.sample.component.AuthInterceptor; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.IOssService; -import com.dji.sdk.cloudapi.storage.CredentialsToken; -import com.dji.sdk.cloudapi.storage.OssTypeEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author sean - * @version 1.0 - * @date 2022/4/27 - */ -@Slf4j -@Service -public class AmazonS3ServiceImpl implements IOssService { - - private AmazonS3 client; - - @Override - public OssTypeEnum getOssType() { - return OssTypeEnum.AWS; - } - - @Override - public CredentialsToken getCredentials() { - AWSSecurityTokenService stsClient = AWSSecurityTokenServiceClientBuilder.standard() - .withCredentials(new AWSStaticCredentialsProvider( - new BasicAWSCredentials(OssConfiguration.accessKey, OssConfiguration.secretKey))) - .withRegion(OssConfiguration.region).build(); - - AssumeRoleRequest request = new AssumeRoleRequest() - .withRoleArn(OssConfiguration.roleArn) - .withRoleSessionName(OssConfiguration.roleSessionName) - .withDurationSeconds(Math.toIntExact(OssConfiguration.expire)); - AssumeRoleResult result = stsClient.assumeRole(request); - Credentials credentials = result.getCredentials(); - return new CredentialsToken(credentials.getAccessKeyId(), credentials.getSecretAccessKey(), - credentials.getSessionToken(), (credentials.getExpiration().getTime() - System.currentTimeMillis()) / 1000); - } - - @Override - public URL getObjectUrl(String bucket, String objectKey) { - return client.generatePresignedUrl(bucket, objectKey, - new Date(System.currentTimeMillis() + OssConfiguration.expire * 1000), HttpMethod.GET); - } - - @Override - public Boolean deleteObject(String bucket, String objectKey) { - if (!client.doesObjectExist(bucket, objectKey)) { - return true; - } - client.deleteObject(bucket, objectKey); - return true; - } - - public InputStream getObject(String bucket, String objectKey) { - return client.getObject(bucket, objectKey).getObjectContent().getDelegateStream(); - } - - @Override - public void putObject(String bucket, String objectKey, InputStream input) { - if (client.doesObjectExist(bucket, objectKey)) { - throw new RuntimeException("The filename already exists."); - } - PutObjectResult objectResult = client.putObject(new PutObjectRequest(bucket, objectKey, input, new ObjectMetadata())); - log.info("Upload FlighttaskCreateFile: {}", objectResult.toString()); - } - - public void createClient() { - if (Objects.nonNull(this.client)) { - return; - } - this.client = AmazonS3ClientBuilder.standard() - .withCredentials( - new AWSStaticCredentialsProvider( - new BasicAWSCredentials(OssConfiguration.accessKey, OssConfiguration.secretKey))) - .withRegion(OssConfiguration.region) - .build(); - } - - /** - * Configuring cross-origin resource sharing - */ - @PostConstruct - private void configCORS() { - if (!OssConfiguration.enable || !OssTypeEnum.AWS.getType().equals(OssConfiguration.provider)) { - return; - } - List allowedMethods = new ArrayList<>(); - allowedMethods.add(CORSRule.AllowedMethods.GET); - allowedMethods.add(CORSRule.AllowedMethods.POST); - allowedMethods.add(CORSRule.AllowedMethods.DELETE); - - CORSRule rule = new CORSRule() - .withId("CORSAccessRule") - .withAllowedOrigins(List.of("*")) - .withAllowedHeaders(List.of(AuthInterceptor.PARAM_TOKEN)) - .withAllowedMethods(allowedMethods); - - client.setBucketCrossOriginConfiguration(OssConfiguration.bucket, - new BucketCrossOriginConfiguration().withRules(rule)); - - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/MinIOServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/MinIOServiceImpl.java deleted file mode 100644 index 2f7c04a..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/MinIOServiceImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.dji.sample.component.oss.service.impl; - -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.AWSStaticCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.auth.BasicSessionCredentials; -import com.amazonaws.client.builder.AwsClientBuilder; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.S3Object; -import com.amazonaws.services.securitytoken.AWSSecurityTokenService; -import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder; -import com.amazonaws.services.securitytoken.model.AssumeRoleRequest; -import com.amazonaws.services.securitytoken.model.AssumeRoleResult; -import com.amazonaws.services.securitytoken.model.Credentials; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.IOssService; -import com.dji.sdk.cloudapi.storage.CredentialsToken; -import com.dji.sdk.cloudapi.storage.OssTypeEnum; -import io.minio.*; -import io.minio.credentials.AssumeRoleProvider; -import io.minio.errors.*; -import io.minio.http.Method; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Objects; - -import static com.dji.sample.component.oss.model.OssConfiguration.*; - -/** - * @author sean - * @version 0.3 - * @date 2021/12/23 - */ -@Service -@Slf4j -public class MinIOServiceImpl implements IOssService { - - private MinioClient client; - - @Override - public OssTypeEnum getOssType() { - return OssTypeEnum.MINIO; - } - - @Override - public CredentialsToken getCredentials() { - try { - AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration(endpoint, region); - BasicAWSCredentials basicAWSCredentials = new BasicAWSCredentials(accessKey, secretKey); - AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(basicAWSCredentials); - AWSSecurityTokenService stsClient = AWSSecurityTokenServiceClientBuilder.standard() - .withEndpointConfiguration(endpointConfiguration) - .withCredentials(credentialsProvider).build(); - Credentials credentials = stsClient.getSessionToken().getCredentials(); - return new CredentialsToken(credentials.getAccessKeyId(), credentials.getSecretAccessKey(), credentials.getSessionToken(), OssConfiguration.expire); - } catch (Exception e) { - log.debug("Failed to obtain sts."); - e.printStackTrace(); - } - return null; - } - - @Override - public URL getObjectUrl(String bucket, String objectKey) { - try { - return new URL( - client.getPresignedObjectUrl( - GetPresignedObjectUrlArgs.builder() - .method(Method.GET) - .bucket(bucket) - .object(objectKey) - .expiry(Math.toIntExact(OssConfiguration.expire)) - .build())); - } catch (ErrorResponseException | InsufficientDataException | InternalException | - InvalidKeyException | InvalidResponseException | IOException | - NoSuchAlgorithmException | XmlParserException | ServerException e) { - throw new RuntimeException("The file does not exist on the OssConfiguration."); - } - } - - @Override - public Boolean deleteObject(String bucket, String objectKey) { - try { - client.removeObject(RemoveObjectArgs.builder().bucket(bucket).object(objectKey).build()); - } catch (MinioException | NoSuchAlgorithmException | IOException | InvalidKeyException e) { - log.error("Failed to delete file."); - e.printStackTrace(); - return false; - } - return true; - } - - @Override - public InputStream getObject(String bucket, String objectKey) { - try { - GetObjectResponse object = client.getObject(GetObjectArgs.builder().bucket(bucket).object(objectKey).build()); - return new ByteArrayInputStream(object.readAllBytes()); - } catch (ErrorResponseException | InsufficientDataException | InternalException | InvalidKeyException | InvalidResponseException | IOException | NoSuchAlgorithmException | ServerException | XmlParserException e) { - e.printStackTrace(); - } - return InputStream.nullInputStream(); - } - - @Override - public void putObject(String bucket, String objectKey, InputStream input) { - try { - client.statObject(StatObjectArgs.builder().bucket(bucket).object(objectKey).build()); - throw new RuntimeException("The filename already exists."); - } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { - log.info("The file does not exist, start uploading."); - try { - ObjectWriteResponse response = client.putObject( - PutObjectArgs.builder().bucket(bucket).object(objectKey).stream(input, input.available(), 0).build()); - log.info("Upload FlighttaskCreateFile: {}", response.etag()); - } catch (MinioException | IOException | InvalidKeyException | NoSuchAlgorithmException ex) { - log.error("Failed to upload FlighttaskCreateFile {}.", objectKey); - ex.printStackTrace(); - } - } - } - - public void createClient() { - if (Objects.nonNull(this.client)) { - return; - } - this.client = MinioClient.builder() - .endpoint(OssConfiguration.endpoint) - .credentials(accessKey, secretKey) - .region(region) - .build(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssAspectHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssAspectHandler.java deleted file mode 100644 index 633c5a8..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssAspectHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.dji.sample.component.oss.service.impl; - -import com.dji.sample.component.oss.model.OssConfiguration; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * @author sean - * @version 1.1 - * @date 2022/6/20 - */ -@Component -@Aspect -public class OssAspectHandler { - - @Autowired - private OssServiceContext ossServiceContext; - - @Before("execution(public * com.dji.sample.component.oss.service.impl.OssServiceContext.*(..))") - public void before() { - if (!OssConfiguration.enable) { - throw new IllegalArgumentException("请启用OSS配置。"); - } - if (this.ossServiceContext.getOssService() == null) { - throw new IllegalArgumentException("请检查OSS配置配置。"); - } - this.ossServiceContext.createClient(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssServiceContext.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssServiceContext.java deleted file mode 100644 index b8aa1d0..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/oss/service/impl/OssServiceContext.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.dji.sample.component.oss.service.impl; - -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.IOssService; -import com.dji.sdk.cloudapi.storage.CredentialsToken; -import com.dji.sdk.cloudapi.storage.OssTypeEnum; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.io.InputStream; -import java.net.URL; -import java.util.Arrays; -import java.util.List; - -/** - * @author sean - * @version 1.0 - * @date 2022/5/30 - */ -@Service -public class OssServiceContext { - - private IOssService ossService; - - @Autowired - public OssServiceContext(List ossServices, OssConfiguration configuration) { - if (!OssConfiguration.enable) { - return; - } - this.ossService = ossServices.stream() - .filter(ossService -> ossService.getOssType() == OssConfiguration.provider) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("Oss提供程序非法。可选: " + - Arrays.toString(Arrays.stream(OssTypeEnum.values()).map(OssTypeEnum::getType).toArray()))); - } - - IOssService getOssService() { - return this.ossService; - } - - public CredentialsToken getCredentials() { - return this.ossService.getCredentials(); - } - - public URL getObjectUrl(String bucket, String objectKey) { - if (!StringUtils.hasText(bucket) || !StringUtils.hasText(objectKey)) { - throw new IllegalArgumentException(); - } - return this.ossService.getObjectUrl(bucket, objectKey); - } - - public Boolean deleteObject(String bucket, String objectKey) { - return this.ossService.deleteObject(bucket, objectKey); - } - - public InputStream getObject(String bucket, String objectKey) { - return this.ossService.getObject(bucket, objectKey); - } - - public void putObject(String bucket, String objectKey, InputStream stream) { - this.ossService.putObject(bucket, objectKey, stream); - } - - void createClient() { - this.ossService.createClient(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConfiguration.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConfiguration.java deleted file mode 100644 index f73261e..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/redis/RedisConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.dji.sample.component.redis; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; -import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -/** - * @author sean - * @version 1.0 - * @date 2022/4/19 - */ -@Configuration -@EnableRedisRepositories -public class RedisConfiguration { - - @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory factory) { - RedisTemplate redisTemplate = new RedisTemplate<>(); - redisTemplate.setConnectionFactory(factory); - - ObjectMapper objectMapper = new ObjectMapper(); - JavaTimeModule timeModule = new JavaTimeModule(); - timeModule.addDeserializer(LocalDateTime.class, - new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - timeModule.addSerializer(LocalDateTime.class, - new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - objectMapper.disable(MapperFeature.IGNORE_DUPLICATE_MODULE_REGISTRATIONS); - objectMapper.registerModules(timeModule); - objectMapper.activateDefaultTyping(objectMapper.getPolymorphicTypeValidator(), - ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); - - objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - - - StringRedisSerializer serializer = new StringRedisSerializer(); - redisTemplate.setKeySerializer(serializer); - redisTemplate.setHashKeySerializer(serializer); - - GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper); - redisTemplate.setValueSerializer(jsonRedisSerializer); - redisTemplate.setHashValueSerializer(jsonRedisSerializer); - redisTemplate.afterPropertiesSet(); - return redisTemplate; - - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/AuthPrincipalHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/AuthPrincipalHandler.java deleted file mode 100644 index 05fbd2d..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/AuthPrincipalHandler.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.dji.sample.component.websocket.config; - -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.common.util.JwtUtil; -import com.dji.sample.component.AuthInterceptor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServletServerHttpRequest; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.support.DefaultHandshakeHandler; - -import javax.servlet.http.HttpServletRequest; -import java.security.Principal; -import java.util.Map; -import java.util.Optional; - -/** - * @author sean.zhou - * @date 2021/11/16 - * @version 0.1 - */ -@Slf4j -@Component -public class AuthPrincipalHandler extends DefaultHandshakeHandler { - - @Override - protected boolean isValidOrigin(ServerHttpRequest request) { - - if (request instanceof ServletServerHttpRequest) { - HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest(); - String token = servletRequest.getParameter(AuthInterceptor.PARAM_TOKEN); - - if (!StringUtils.hasText(token)) { - return false; - } - log.debug("token:" + token); - Optional customClaim = JwtUtil.parseToken(token); - if (customClaim.isEmpty()) { - return false; - } - - servletRequest.setAttribute(AuthInterceptor.TOKEN_CLAIM, customClaim.get()); - return true; - } - return false; - - } - - /** - * The principal's name: {workspaceId}/{userType}/{userId} - * @param request - * @param wsHandler - * @param attributes - * @return - */ - @Override - protected Principal determineUser(ServerHttpRequest request, WebSocketHandler wsHandler, Map attributes) { - if (request instanceof ServletServerHttpRequest) { - - // get the custom claim - CustomClaim claim = (CustomClaim) ((ServletServerHttpRequest) request).getServletRequest() - .getAttribute(AuthInterceptor.TOKEN_CLAIM); - - return () -> claim.getWorkspaceId() + "/" + claim.getUserType() + "/" + claim.getId(); - } - return () -> null; - } -} \ No newline at end of file diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketFactory.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketFactory.java deleted file mode 100644 index 22fb995..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketFactory.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.dji.sample.component.websocket.config; - -import com.dji.sample.component.websocket.service.IWebSocketManageService; -import com.dji.sdk.websocket.WebSocketDefaultFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; -import org.springframework.web.socket.WebSocketHandler; - -/** - * - * @author sean.zhou - * @date 2021/11/16 - * @version 0.1 - */ -@Component -@Primary -public class MyWebSocketFactory extends WebSocketDefaultFactory { - - @Autowired - private IWebSocketManageService webSocketManageService; - - @Override - public WebSocketHandler decorate(WebSocketHandler handler) { - return new MyWebSocketHandler(handler, webSocketManageService); - } -} \ No newline at end of file diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketHandler.java deleted file mode 100644 index d6016b0..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/config/MyWebSocketHandler.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.dji.sample.component.websocket.config; - -import com.dji.sample.component.websocket.service.IWebSocketManageService; -import com.dji.sdk.websocket.WebSocketDefaultHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; -import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.WebSocketMessage; -import org.springframework.web.socket.WebSocketSession; - -import java.security.Principal; - -/** - * - * @author sean.zhou - * @date 2021/11/16 - * @version 0.1 - */ -@Slf4j -public class MyWebSocketHandler extends WebSocketDefaultHandler { - - private IWebSocketManageService webSocketManageService; - - MyWebSocketHandler(WebSocketHandler delegate, IWebSocketManageService webSocketManageService) { - super(delegate); - this.webSocketManageService = webSocketManageService; - } - - @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { - Principal principal = session.getPrincipal(); - if (StringUtils.hasText(principal.getName())) { - webSocketManageService.put(principal.getName(), new MyConcurrentWebSocketSession(session)); - log.debug("{} is connected. ID: {}. WebSocketSession[current count: {}]", - principal.getName(), session.getId(), webSocketManageService.getConnectedCount()); - return; - } - session.close(); - } - - @Override - public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception { - Principal principal = session.getPrincipal(); - if (StringUtils.hasText(principal.getName())) { - webSocketManageService.remove(principal.getName(), session.getId()); - log.debug("{} is disconnected. ID: {}. WebSocketSession[current count: {}]", - principal.getName(), session.getId(), webSocketManageService.getConnectedCount()); - } - - } - - @Override - public void handleMessage(WebSocketSession session, WebSocketMessage message) throws Exception { - log.debug("received message: {}", message.getPayload()); - } - -} \ No newline at end of file diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/model/BizCodeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/model/BizCodeEnum.java deleted file mode 100644 index 2e5c630..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/model/BizCodeEnum.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.dji.sample.component.websocket.model; - -/** - * @author sean - * @version 0.1 - * @date 2021/11/26 - */ -public enum BizCodeEnum { - - DEVICE_ONLINE("device_online"), - - DEVICE_OFFLINE("device_offline"), - - DEVICE_UPDATE_TOPO("device_update_topo"), - - DEVICE_OSD("device_osd"), - - RC_OSD("gateway_osd"), - - DOCK_OSD("dock_osd"), - - MAP_ELEMENT_CREATE("map_element_create"), - - MAP_ELEMENT_UPDATE("map_element_update"), - - MAP_ELEMENT_DELETE("map_element_delete"), - - MAP_GROUP_REFRESH("map_group_refresh"), - - FLIGHT_TASK_PROGRESS("flighttask_progress"), - - DEVICE_HMS("device_hms"), - - DEVICE_REBOOT("device_reboot"), - - DRONE_OPEN("drone_open"), - - DRONE_CLOSE("drone_close"), - - DEVICE_CHECK("device_check"), - - DRONE_FORMAT("drone_format"), - - DEVICE_FORMAT("device_format"), - - COVER_OPEN("cover_open"), - - COVER_CLOSE("cover_close"), - - PUTTER_OPEN("putter_open"), - - PUTTER_CLOSE("putter_close"), - - CHARGE_OPEN("charge_open"), - - CHARGE_CLOSE("charge_close"), - - FILE_UPLOAD_CALLBACK("file_upload_callback"), - - FILE_UPLOAD_PROGRESS("fileupload_progress"), - - OTA_PROGRESS("ota_progress"), - - HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA("highest_priority_upload_flighttask_media"), - - CONTROL_SOURCE_CHANGE("control_source_change"), - - FLY_TO_POINT_PROGRESS("fly_to_point_progress"), - - TAKE_OFF_TO_POINT_PROGRESS("takeoff_to_point_progress"), - - DRC_STATUS_NOTIFY("drc_status_notify"), - - JOYSTICK_INVALID_NOTIFY("joystick_invalid_notify"), - - FLIGHT_AREAS_SYNC_PROGRESS("flight_areas_sync_progress"), - - FLIGHT_AREAS_DRONE_LOCATION("flight_areas_drone_location"), - - FLIGHT_AREAS_UPDATE("flight_areas_update"), - - ; - - private String code; - - BizCodeEnum(String code) { - this.code = code; - } - - public String getCode() { - return code; - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketManageService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketManageService.java deleted file mode 100644 index 21d3009..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketManageService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.dji.sample.component.websocket.service; - -import com.dji.sample.component.websocket.config.MyConcurrentWebSocketSession; - -import java.util.Collection; - -/** - * @author sean - * @version 1.0 - * @date 2022/4/25 - */ -public interface IWebSocketManageService { - - void put(String key, MyConcurrentWebSocketSession val); - - void remove(String key, String sessionId); - - Collection getValueWithWorkspace(String workspaceId); - - Collection getValueWithWorkspaceAndUserType(String workspaceId, Integer userType); - - Long getConnectedCount(); -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketMessageService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketMessageService.java deleted file mode 100644 index ee51adb..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/IWebSocketMessageService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.dji.sample.component.websocket.service; - -import com.dji.sample.component.websocket.config.MyConcurrentWebSocketSession; -import com.dji.sdk.websocket.WebSocketMessageResponse; - -import java.util.Collection; - -/** - * @author sean.zhou - * @date 2021/11/24 - * @version 0.1 - */ -public interface IWebSocketMessageService { - - /** - * Send a message to the specific connection. - * @param session A WebSocket connection object - * @param message message - */ - void sendMessage(MyConcurrentWebSocketSession session, WebSocketMessageResponse message); - - /** - * Send the same message to specific connection. - * @param sessions A collection of WebSocket connection objects. - * @param message message - */ - void sendBatch(Collection sessions, WebSocketMessageResponse message); - - void sendBatch(String workspaceId, Integer userType, String bizCode, Object data); - - void sendBatch(String workspaceId, String bizCode, Object data); -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketManageServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketManageServiceImpl.java deleted file mode 100644 index 755e78d..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketManageServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.dji.sample.component.websocket.service.impl; - -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.component.websocket.config.MyConcurrentWebSocketSession; -import com.dji.sample.component.websocket.service.IWebSocketManageService; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -/** - * @author sean - * @version 1.0 - * @date 2022/4/25 - */ -@Slf4j -@Service -public class WebSocketManageServiceImpl implements IWebSocketManageService { - - private static final ConcurrentHashMap SESSIONS = new ConcurrentHashMap<>(16); - - @Override - public void put(String key, MyConcurrentWebSocketSession val) { - String[] name = key.split("/"); - if (name.length != 3) { - log.debug("The key is out of format. [{workspaceId}/{userType}/{userId}]"); - return; - } - String sessionId = val.getId(); - String workspaceKey = RedisConst.WEBSOCKET_PREFIX + name[0]; - String userTypeKey = RedisConst.WEBSOCKET_PREFIX + UserTypeEnum.find(Integer.parseInt(name[1])).getDesc(); - RedisOpsUtils.hashSet(workspaceKey, sessionId, name[2]); - RedisOpsUtils.hashSet(userTypeKey, sessionId, name[2]); - SESSIONS.put(sessionId, val); - RedisOpsUtils.expireKey(workspaceKey, RedisConst.WEBSOCKET_ALIVE_SECOND); - RedisOpsUtils.expireKey(userTypeKey, RedisConst.WEBSOCKET_ALIVE_SECOND); - } - - @Override - public void remove(String key, String sessionId) { - String[] name = key.split("/"); - if (name.length != 3) { - log.debug("The key is out of format. [{workspaceId}/{userType}/{userId}]"); - return; - } - RedisOpsUtils.hashDel(RedisConst.WEBSOCKET_PREFIX + name[0], new String[] {sessionId}); - RedisOpsUtils.hashDel(RedisConst.WEBSOCKET_PREFIX + UserTypeEnum.find(Integer.parseInt(name[1])).getDesc(), new String[] {sessionId}); - SESSIONS.remove(sessionId); - } - - @Override - public Collection getValueWithWorkspace(String workspaceId) { - if (!StringUtils.hasText(workspaceId)) { - return Collections.emptySet(); - } - String key = RedisConst.WEBSOCKET_PREFIX + workspaceId; - - return RedisOpsUtils.hashKeys(key) - .stream() - .map(SESSIONS::get) - .filter(Objects::nonNull) - .collect(Collectors.toSet()); - } - - @Override - public Collection getValueWithWorkspaceAndUserType(String workspaceId, Integer userType) { - String key = RedisConst.WEBSOCKET_PREFIX + UserTypeEnum.find(userType).getDesc(); - return RedisOpsUtils.hashKeys(key) - .stream() - .map(SESSIONS::get) - .filter(getValueWithWorkspace(workspaceId)::contains) - .collect(Collectors.toSet()); - } - - @Override - public Long getConnectedCount() { - return SESSIONS.mappingCount(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketMessageServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketMessageServiceImpl.java deleted file mode 100644 index 3667af1..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/websocket/service/impl/WebSocketMessageServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.dji.sample.component.websocket.service.impl; - -import com.dji.sample.component.websocket.config.MyConcurrentWebSocketSession; -import com.dji.sample.component.websocket.service.IWebSocketManageService; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sdk.websocket.WebSocketMessageResponse; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; -import org.springframework.web.socket.TextMessage; - -import java.io.IOException; -import java.util.Collection; -import java.util.Objects; - -/** - * @author sean.zhou - * @version 0.1 - * @date 2021/11/24 - */ -@Service -@Slf4j -public class WebSocketMessageServiceImpl implements IWebSocketMessageService { - - @Autowired - private ObjectMapper mapper; - - @Autowired - private IWebSocketManageService webSocketManageService; - - @Override - public void sendMessage(MyConcurrentWebSocketSession session, WebSocketMessageResponse message) { - if (session == null) { - return; - } - - try { - if (!session.isOpen()) { - session.close(); - log.debug("This session is closed."); - return; - } - - - session.sendMessage(new TextMessage(mapper.writeValueAsBytes(message))); - } catch (IOException e) { - log.info("Failed to publish the message. {}", message.toString()); - e.printStackTrace(); - } - } - - @Override - public void sendBatch(Collection sessions, WebSocketMessageResponse message) { - if (sessions.isEmpty()) { - return; - } - - try { - - TextMessage data = new TextMessage(mapper.writeValueAsBytes(message)); - - for (MyConcurrentWebSocketSession session : sessions) { - if (!session.isOpen()) { - session.close(); - log.debug("This session is closed."); - return; - } - session.sendMessage(data); - } - - } catch (IOException e) { - log.info("Failed to publish the message. {}", message.toString()); - - e.printStackTrace(); - } - } - - @Override - public void sendBatch(String workspaceId, Integer userType, String bizCode, Object data) { - if (!StringUtils.hasText(workspaceId)) { - throw new RuntimeException("工作区ID不存在。"); - } - Collection sessions = Objects.isNull(userType) ? - webSocketManageService.getValueWithWorkspace(workspaceId) : - webSocketManageService.getValueWithWorkspaceAndUserType(workspaceId, userType); - - this.sendBatch(sessions, new WebSocketMessageResponse() - .setData(Objects.requireNonNullElse(data, "")) - .setTimestamp(System.currentTimeMillis()) - .setBizCode(bizCode)); - } - - @Override - public void sendBatch(String workspaceId, String bizCode, Object data) { - this.sendBatch(workspaceId, null, bizCode, data); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/configuration/GlobalThreadPoolConfiguration.java b/dk-modules/sample/src/main/java/org/dromara/sample/configuration/GlobalThreadPoolConfiguration.java index af7a92d..d40db01 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/configuration/GlobalThreadPoolConfiguration.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/configuration/GlobalThreadPoolConfiguration.java @@ -1,4 +1,4 @@ -package com.dji.sample.configuration; +package org.dromara.sample.configuration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/configuration/SpringBeanConfiguration.java b/dk-modules/sample/src/main/java/org/dromara/sample/configuration/SpringBeanConfiguration.java index 9bfd8ce..f9047b1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/configuration/SpringBeanConfiguration.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/configuration/SpringBeanConfiguration.java @@ -1,4 +1,4 @@ -package com.dji.sample.configuration; +package org.dromara.sample.configuration; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/configuration/mvc/GlobalMVCConfigurer.java b/dk-modules/sample/src/main/java/org/dromara/sample/configuration/mvc/GlobalMVCConfigurer.java deleted file mode 100644 index bb03a1d..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/configuration/mvc/GlobalMVCConfigurer.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.dji.sample.configuration.mvc; - -import com.dji.sample.component.AuthInterceptor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.ArrayList; -import java.util.List; - -@Configuration -public class GlobalMVCConfigurer implements WebMvcConfigurer { - - @Autowired - private AuthInterceptor authInterceptor; - - private static List excludePaths = new ArrayList<>(); - - @Value("${url.manage.prefix}") - private String managePrefix; - - @Value("${url.manage.version}") - private String manageVersion; - - - @Override - public void addInterceptors(InterceptorRegistry registry) { - // Exclude the login interface. - excludePaths.add("/" + managePrefix + manageVersion + "/login"); - excludePaths.add("/" + managePrefix + manageVersion + "/token/refresh"); - excludePaths.add("/swagger-ui.html"); - excludePaths.add("/swagger-ui/**"); - excludePaths.add("/v3/**"); - excludePaths.add("/ui/**"); - // Intercept for all request interfaces. - registry.addInterceptor(authInterceptor).addPathPatterns("/**").excludePathPatterns(excludePaths); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DockController.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DockController.java index dd55cbe..283fbed 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DockController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DockController.java @@ -1,17 +1,15 @@ -package com.dji.sample.control.controller; +package org.dromara.sample.control.controller; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sample.control.model.enums.RemoteDebugMethodEnum; -import com.dji.sample.control.model.param.*; -import com.dji.sample.control.service.IControlService; -import com.dji.sdk.common.HttpResultResponse; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; +import org.dromara.sample.control.model.enums.RemoteDebugMethodEnum; +import org.dromara.sample.control.model.param.*; +import org.dromara.sample.control.service.IControlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; /** * @author sean @@ -26,6 +24,13 @@ public class DockController { @Autowired private IControlService controlService; + /** + * 远程控制 + * @param sn + * @param serviceIdentifier + * @param param + * @return + */ @PostMapping("/{sn}/jobs/{service_identifier}") public HttpResultResponse createControlJob(@PathVariable String sn, @PathVariable("service_identifier") String serviceIdentifier, diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java index f40670c..a8a85ad 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/controller/DrcController.java @@ -1,20 +1,20 @@ -package com.dji.sample.control.controller; - -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.control.model.dto.JwtAclDTO; -import com.dji.sample.control.model.param.DrcConnectParam; -import com.dji.sample.control.model.param.DrcModeParam; -import com.dji.sample.control.service.IDrcService; -import com.dji.sdk.cloudapi.control.DrcModeMqttBroker; -import com.dji.sdk.common.HttpResultResponse; +package org.dromara.sample.control.controller; + +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.sample.control.model.dto.JwtAclDTO; +import org.dromara.sample.control.model.param.DrcConnectParam; +import org.dromara.sample.control.model.param.DrcModeParam; +import org.dromara.sample.control.service.IDrcService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.control.DrcModeMqttBroker; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -29,24 +29,26 @@ public class DrcController { @Autowired private IDrcService drcService; - @PostMapping("/workspaces/{workspace_id}/drc/connect") - public HttpResultResponse drcConnect(@PathVariable("workspace_id") String workspaceId, HttpServletRequest request, @Valid @RequestBody DrcConnectParam param) { - CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM); + @PostMapping("/workspaces/drc/connect") + public HttpResultResponse drcConnect(HttpServletRequest request, @Valid @RequestBody DrcConnectParam param) { + LoginUser loginUser = LoginHelper.getLoginUser(); - DrcModeMqttBroker brokerDTO = drcService.userDrcAuth(workspaceId, claims.getId(), claims.getUsername(), param); + DrcModeMqttBroker brokerDTO = drcService.userDrcAuth(loginUser.getTenantId(), loginUser.getLoginId(), loginUser.getUsername(), param); return HttpResultResponse.success(brokerDTO); } - @PostMapping("/workspaces/{workspace_id}/drc/enter") - public HttpResultResponse drcEnter(@PathVariable("workspace_id") String workspaceId, @Valid @RequestBody DrcModeParam param) { - JwtAclDTO acl = drcService.deviceDrcEnter(workspaceId, param); + @PostMapping("/workspaces/drc/enter") + public HttpResultResponse drcEnter(@Valid @RequestBody DrcModeParam param) { + LoginUser loginUser = LoginHelper.getLoginUser(); + JwtAclDTO acl = drcService.deviceDrcEnter(loginUser.getTenantId(), param); return HttpResultResponse.success(acl); } - @PostMapping("/workspaces/{workspace_id}/drc/exit") - public HttpResultResponse drcExit(@PathVariable("workspace_id") String workspaceId, @Valid @RequestBody DrcModeParam param) { - drcService.deviceDrcExit(workspaceId, param); + @PostMapping("/workspaces/drc/exit") + public HttpResultResponse drcExit( @Valid @RequestBody DrcModeParam param) { + LoginUser loginUser = LoginHelper.getLoginUser(); + drcService.deviceDrcExit(loginUser.getTenantId(), param); return HttpResultResponse.success(); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AirConditionerMode.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AirConditionerMode.java index 901cccd..4ad2e55 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AirConditionerMode.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AirConditionerMode.java @@ -1,11 +1,11 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sdk.cloudapi.device.AirConditionerStateEnum; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.AirConditionerStateEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AlarmState.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AlarmState.java index 62cf797..4396187 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AlarmState.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/AlarmState.java @@ -1,11 +1,11 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sdk.cloudapi.device.SwitchActionEnum; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.SwitchActionEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/BatteryStoreMode.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/BatteryStoreMode.java index 871d29c..67708b6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/BatteryStoreMode.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/BatteryStoreMode.java @@ -1,11 +1,11 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sdk.cloudapi.device.BatteryStoreModeEnum; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.BatteryStoreModeEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/JwtAclDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/JwtAclDTO.java index 9bc6959..149eb41 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/JwtAclDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/JwtAclDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/LinkWorkMode.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/LinkWorkMode.java index 599e5d6..d57254d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/LinkWorkMode.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/LinkWorkMode.java @@ -1,13 +1,13 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sdk.cloudapi.device.LinkWorkModeEnum; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.LinkWorkModeEnum; import java.util.Map; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/RemoteDebugOpenState.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/RemoteDebugOpenState.java index 3e67a3e..6485c0b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/RemoteDebugOpenState.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/RemoteDebugOpenState.java @@ -1,11 +1,11 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.common.util.SpringBeanUtilsTest; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; +import org.dromara.sample.manage.service.IDeviceService; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.sample.common.util.SpringBeanUtilsTest; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ResultNotifyDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ResultNotifyDTO.java index 0de9461..3ae824d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ResultNotifyDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ResultNotifyDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeCancelState.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeCancelState.java index 73b203f..37aabaf 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeCancelState.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeCancelState.java @@ -1,11 +1,11 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.common.util.SpringBeanUtilsTest; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.device.DroneModeCodeEnum; -import com.dji.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.common.sdk.cloudapi.device.DroneModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.sample.common.util.SpringBeanUtilsTest; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeState.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeState.java index a30f125..4980a7a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeState.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/dto/ReturnHomeState.java @@ -1,11 +1,11 @@ -package com.dji.sample.control.model.dto; +package org.dromara.sample.control.model.dto; -import com.dji.sample.common.util.SpringBeanUtilsTest; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.device.DroneModeCodeEnum; -import com.dji.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.common.sdk.cloudapi.device.DroneModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.sample.common.util.SpringBeanUtilsTest; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/CameraModeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/CameraModeEnum.java index a6dfe3c..7a6e0ae 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/CameraModeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/CameraModeEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DrcMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DrcMethodEnum.java index 93697d7..bb84afe 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DrcMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DrcMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneAuthorityEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneAuthorityEnum.java index e751f7e..9276463 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneAuthorityEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneAuthorityEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneControlMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneControlMethodEnum.java index dcb6a21..2ce72a4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneControlMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/DroneControlMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/GimbalResetModeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/GimbalResetModeEnum.java index 2c7e9dd..866524b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/GimbalResetModeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/GimbalResetModeEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/MqttAclAccessEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/MqttAclAccessEnum.java index 771e4dc..9201842 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/MqttAclAccessEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/MqttAclAccessEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/PayloadCommandsEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/PayloadCommandsEnum.java index 6629f8c..0b25499 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/PayloadCommandsEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/PayloadCommandsEnum.java @@ -1,9 +1,8 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; -import com.dji.sample.control.service.impl.*; -import com.dji.sdk.cloudapi.control.PayloadControlMethodEnum; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import org.dromara.common.sdk.cloudapi.control.PayloadControlMethodEnum; import java.util.Arrays; @@ -14,25 +13,25 @@ import java.util.Arrays; */ public enum PayloadCommandsEnum { - CAMERA_MODE_SWitCH(PayloadControlMethodEnum.CAMERA_MODE_SWITCH, CameraModeSwitchImpl.class), + CAMERA_MODE_SWitCH(PayloadControlMethodEnum.CAMERA_MODE_SWITCH, org.dromara.sample.control.service.impl.CameraModeSwitchImpl.class), - CAMERA_PHOTO_TAKE(PayloadControlMethodEnum.CAMERA_PHOTO_TAKE, CameraPhotoTakeImpl.class), + CAMERA_PHOTO_TAKE(PayloadControlMethodEnum.CAMERA_PHOTO_TAKE, org.dromara.sample.control.service.impl.CameraPhotoTakeImpl.class), - CAMERA_RECORDING_START(PayloadControlMethodEnum.CAMERA_RECORDING_START, CameraRecordingStartImpl.class), + CAMERA_RECORDING_START(PayloadControlMethodEnum.CAMERA_RECORDING_START, org.dromara.sample.control.service.impl.CameraRecordingStartImpl.class), - CAMERA_RECORDING_STOP(PayloadControlMethodEnum.CAMERA_RECORDING_STOP, CameraRecordingStopImpl.class), + CAMERA_RECORDING_STOP(PayloadControlMethodEnum.CAMERA_RECORDING_STOP, org.dromara.sample.control.service.impl.CameraRecordingStopImpl.class), - CAMERA_AIM(PayloadControlMethodEnum.CAMERA_AIM, CameraAimImpl.class), + CAMERA_AIM(PayloadControlMethodEnum.CAMERA_AIM, org.dromara.sample.control.service.impl.CameraAimImpl.class), - CAMERA_FOCAL_LENGTH_SET(PayloadControlMethodEnum.CAMERA_FOCAL_LENGTH_SET, CameraFocalLengthSetImpl.class), + CAMERA_FOCAL_LENGTH_SET(PayloadControlMethodEnum.CAMERA_FOCAL_LENGTH_SET, org.dromara.sample.control.service.impl.CameraFocalLengthSetImpl.class), - GIMBAL_RESET(PayloadControlMethodEnum.GIMBAL_RESET, GimbalResetImpl.class); + GIMBAL_RESET(PayloadControlMethodEnum.GIMBAL_RESET, org.dromara.sample.control.service.impl.GimbalResetImpl.class); PayloadControlMethodEnum cmd; - Class clazz; + Class clazz; - PayloadCommandsEnum(PayloadControlMethodEnum cmd, Class clazz) { + PayloadCommandsEnum(PayloadControlMethodEnum cmd, Class clazz) { this.cmd = cmd; this.clazz = clazz; } @@ -42,7 +41,7 @@ public enum PayloadCommandsEnum { return cmd.getPayloadMethod().getMethod(); } - public Class getClazz() { + public Class getClazz() { return clazz; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/RemoteDebugMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/RemoteDebugMethodEnum.java index b4b63f1..bc794e0 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/RemoteDebugMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/enums/RemoteDebugMethodEnum.java @@ -1,10 +1,10 @@ -package com.dji.sample.control.model.enums; +package org.dromara.sample.control.model.enums; -import com.dji.sample.control.model.dto.*; -import com.dji.sample.control.service.impl.RemoteDebugHandler; -import com.dji.sdk.cloudapi.debug.DebugMethodEnum; +import org.dromara.sample.control.service.impl.RemoteDebugHandler; import com.fasterxml.jackson.annotation.JsonCreator; import lombok.Getter; +import org.dromara.common.sdk.cloudapi.debug.DebugMethodEnum; +import org.dromara.sample.control.model.dto.*; import java.util.Arrays; import java.util.Objects; @@ -54,7 +54,7 @@ public enum RemoteDebugMethodEnum { BATTERY_MAINTENANCE_SWITCH(DebugMethodEnum.BATTERY_MAINTENANCE_SWITCH, false, AlarmState.class), ALARM_STATE_SWITCH(DebugMethodEnum.ALARM_STATE_SWITCH, false, AlarmState.class), - + BATTERY_STORE_MODE_SWITCH(DebugMethodEnum.BATTERY_STORE_MODE_SWITCH, false, BatteryStoreMode.class), SDR_WORK_MODE_SWITCH(DebugMethodEnum.SDR_WORKMODE_SWITCH, false, LinkWorkMode.class), @@ -66,7 +66,7 @@ public enum RemoteDebugMethodEnum { private String method; private boolean progress; - + private Class clazz; RemoteDebugMethodEnum(DebugMethodEnum debugMethodEnum, boolean progress, Class clazz) { diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DeviceDrcInfoParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DeviceDrcInfoParam.java index 05930f0..a964f0d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DeviceDrcInfoParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DeviceDrcInfoParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcConnectParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcConnectParam.java index 3aa7926..6633c4d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcConnectParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcConnectParam.java @@ -1,7 +1,7 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; -import com.dji.sample.component.redis.RedisConst; import lombok.Data; +import org.dromara.common.redis.config.RedisConst; import org.hibernate.validator.constraints.Range; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcModeParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcModeParam.java index d483da1..d06740b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcModeParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DrcModeParam.java @@ -1,14 +1,14 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; -import com.dji.sample.component.redis.RedisConst; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Range; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DronePayloadParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DronePayloadParam.java index de9aa21..5738863 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DronePayloadParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/DronePayloadParam.java @@ -1,13 +1,14 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; -import com.dji.sdk.cloudapi.control.CameraTypeEnum; -import com.dji.sdk.cloudapi.control.GimbalResetModeEnum; -import com.dji.sdk.cloudapi.device.CameraModeEnum; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Data; +import org.dromara.common.sdk.cloudapi.control.CameraTypeEnum; +import org.dromara.common.sdk.cloudapi.device.CameraModeEnum; +import org.dromara.sample.control.model.enums.GimbalResetModeEnum; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/FlyToPointParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/FlyToPointParam.java index 4c96423..b3c01c3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/FlyToPointParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/FlyToPointParam.java @@ -1,14 +1,15 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; -import com.dji.sdk.cloudapi.control.Point; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.control.Point; import org.hibernate.validator.constraints.Range; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/PayloadCommandsParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/PayloadCommandsParam.java index f5c4a6e..7e6d611 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/PayloadCommandsParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/PayloadCommandsParam.java @@ -1,10 +1,10 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; -import com.dji.sample.control.model.enums.PayloadCommandsEnum; -import lombok.Data; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.sample.control.model.enums.PayloadCommandsEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/RemoteDebugParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/RemoteDebugParam.java index 8678d3a..0b967b9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/RemoteDebugParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/RemoteDebugParam.java @@ -1,8 +1,8 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/TakeoffToPointParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/TakeoffToPointParam.java index d2e79fc..bcf3fdb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/TakeoffToPointParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/model/param/TakeoffToPointParam.java @@ -1,17 +1,16 @@ -package com.dji.sample.control.model.param; +package org.dromara.sample.control.model.param; -import com.dji.sdk.cloudapi.control.CommanderFlightModeEnum; -import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum; -import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; -import com.dji.sdk.cloudapi.device.RcLostActionEnum; -import com.dji.sdk.cloudapi.wayline.RthModeEnum; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.Data; +import org.dromara.common.sdk.cloudapi.control.CommanderFlightModeEnum; +import org.dromara.common.sdk.cloudapi.control.CommanderModeLostActionEnum; +import org.dromara.common.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; +import org.dromara.common.sdk.cloudapi.device.RcLostActionEnum; +import org.dromara.common.sdk.cloudapi.wayline.RthModeEnum; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - /** * @author sean * @version 1.4 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IControlService.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IControlService.java index d0a34ce..0f8e962 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IControlService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IControlService.java @@ -1,9 +1,10 @@ -package com.dji.sample.control.service; +package org.dromara.sample.control.service; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sample.control.model.enums.RemoteDebugMethodEnum; -import com.dji.sample.control.model.param.*; -import com.dji.sdk.common.HttpResultResponse; + +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; +import org.dromara.sample.control.model.enums.RemoteDebugMethodEnum; +import org.dromara.sample.control.model.param.*; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IDrcService.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IDrcService.java index 55d0b75..57462a8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IDrcService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/IDrcService.java @@ -1,9 +1,10 @@ -package com.dji.sample.control.service; +package org.dromara.sample.control.service; -import com.dji.sample.control.model.dto.JwtAclDTO; -import com.dji.sample.control.model.param.DrcConnectParam; -import com.dji.sample.control.model.param.DrcModeParam; -import com.dji.sdk.cloudapi.control.DrcModeMqttBroker; + +import org.dromara.common.sdk.cloudapi.control.DrcModeMqttBroker; +import org.dromara.sample.control.model.dto.JwtAclDTO; +import org.dromara.sample.control.model.param.DrcConnectParam; +import org.dromara.sample.control.model.param.DrcModeParam; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraAimImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraAimImpl.java index 4afb448..5b9d191 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraAimImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraAimImpl.java @@ -1,6 +1,7 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; + +import org.dromara.sample.control.model.param.DronePayloadParam; import java.util.Objects; @@ -9,7 +10,7 @@ import java.util.Objects; * @version 1.4 * @date 2023/4/23 */ -public class CameraAimImpl extends PayloadCommandsHandler { +public class CameraAimImpl extends org.dromara.sample.control.service.impl.PayloadCommandsHandler { public CameraAimImpl(DronePayloadParam param) { super(param); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraFocalLengthSetImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraFocalLengthSetImpl.java index e37f8a3..99e7e3e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraFocalLengthSetImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraFocalLengthSetImpl.java @@ -1,8 +1,9 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; -import com.dji.sdk.cloudapi.control.CameraTypeEnum; -import com.dji.sdk.cloudapi.device.CameraStateEnum; + +import org.dromara.common.sdk.cloudapi.control.CameraTypeEnum; +import org.dromara.common.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.sample.control.model.param.DronePayloadParam; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraModeSwitchImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraModeSwitchImpl.java index 9d2db66..e7da6f4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraModeSwitchImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraModeSwitchImpl.java @@ -1,7 +1,7 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; -import com.dji.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.common.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.sample.control.model.param.DronePayloadParam; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraPhotoTakeImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraPhotoTakeImpl.java index d9f6bcc..967b76a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraPhotoTakeImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraPhotoTakeImpl.java @@ -1,7 +1,8 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; -import com.dji.sdk.cloudapi.device.CameraStateEnum; + +import org.dromara.common.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.sample.control.model.param.DronePayloadParam; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStartImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStartImpl.java index 0a9960b..bb74019 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStartImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStartImpl.java @@ -1,8 +1,9 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; -import com.dji.sdk.cloudapi.device.CameraModeEnum; -import com.dji.sdk.cloudapi.device.CameraStateEnum; + +import org.dromara.common.sdk.cloudapi.device.CameraModeEnum; +import org.dromara.common.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.sample.control.model.param.DronePayloadParam; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStopImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStopImpl.java index 22e59af..408da88 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStopImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/CameraRecordingStopImpl.java @@ -1,7 +1,8 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; -import com.dji.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.common.sdk.cloudapi.device.CameraStateEnum; +import org.dromara.sample.control.model.param.DronePayloadParam; +import org.dromara.sample.control.service.impl.PayloadCommandsHandler; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java index 186b415..54ef9ae 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java @@ -1,31 +1,31 @@ -package com.dji.sample.control.service.impl; - -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sample.control.model.enums.RemoteDebugMethodEnum; -import com.dji.sample.control.model.param.*; -import com.dji.sample.control.service.IControlService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDevicePayloadService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.cloudapi.control.FlyToPointRequest; -import com.dji.sdk.cloudapi.control.PayloadAuthorityGrabRequest; -import com.dji.sdk.cloudapi.control.TakeoffToPointRequest; -import com.dji.sdk.cloudapi.control.api.AbstractControlService; -import com.dji.sdk.cloudapi.debug.DebugMethodEnum; -import com.dji.sdk.cloudapi.debug.api.AbstractDebugService; -import com.dji.sdk.cloudapi.device.DockModeCodeEnum; -import com.dji.sdk.cloudapi.device.DroneModeCodeEnum; -import com.dji.sdk.cloudapi.device.PayloadIndex; -import com.dji.sdk.cloudapi.wayline.api.AbstractWaylineService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.exception.CloudSDKErrorEnum; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.TopicServicesResponse; +package org.dromara.sample.control.service.impl; + + +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDevicePayloadService; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.control.FlyToPointRequest; +import org.dromara.common.sdk.cloudapi.control.PayloadAuthorityGrabRequest; +import org.dromara.common.sdk.cloudapi.control.TakeoffToPointRequest; +import org.dromara.common.sdk.cloudapi.control.api.AbstractControlService; +import org.dromara.common.sdk.cloudapi.debug.DebugMethodEnum; +import org.dromara.common.sdk.cloudapi.debug.api.AbstractDebugService; +import org.dromara.common.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.DroneModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.PayloadIndex; +import org.dromara.common.sdk.cloudapi.wayline.api.AbstractWaylineService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.exception.CloudSDKErrorEnum; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; +import org.dromara.sample.control.model.enums.RemoteDebugMethodEnum; +import org.dromara.sample.control.model.param.*; +import org.dromara.sample.control.service.IControlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -43,8 +43,6 @@ import java.util.UUID; @Slf4j public class ControlServiceImpl implements IControlService { - @Autowired - private IWebSocketMessageService webSocketMessageService; @Autowired private IDeviceService deviceService; @@ -71,7 +69,7 @@ public class ControlServiceImpl implements IControlService { private RemoteDebugHandler checkDebugCondition(String sn, RemoteDebugParam param, RemoteDebugMethodEnum controlMethodEnum) { RemoteDebugHandler handler = Objects.nonNull(controlMethodEnum.getClazz()) ? mapper.convertValue(Objects.nonNull(param) ? param : new Object(), controlMethodEnum.getClazz()) - : new RemoteDebugHandler(); + : new org.dromara.sample.control.service.impl.RemoteDebugHandler(); if (!handler.canPublish(sn)) { throw new RuntimeException("The current state of the dock does not support this function."); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/DrcServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/DrcServiceImpl.java index ef65aa8..f5a2fb6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/DrcServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/DrcServiceImpl.java @@ -1,41 +1,41 @@ -package com.dji.sample.control.service.impl; - -import com.dji.sample.component.mqtt.config.MqttPropertyConfiguration; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.mqtt.model.MapKeyConst; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.control.model.dto.JwtAclDTO; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sample.control.model.enums.MqttAclAccessEnum; -import com.dji.sample.control.model.param.DrcConnectParam; -import com.dji.sample.control.model.param.DrcModeParam; -import com.dji.sample.control.service.IControlService; -import com.dji.sample.control.service.IDrcService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum; -import com.dji.sample.wayline.model.enums.WaylineTaskStatusEnum; -import com.dji.sample.wayline.model.param.UpdateJobParam; -import com.dji.sample.wayline.service.IFlightTaskService; -import com.dji.sample.wayline.service.IWaylineJobService; -import com.dji.sample.wayline.service.IWaylineRedisService; -import com.dji.sdk.cloudapi.control.DrcModeEnterRequest; -import com.dji.sdk.cloudapi.control.DrcModeMqttBroker; -import com.dji.sdk.cloudapi.control.api.AbstractControlService; -import com.dji.sdk.cloudapi.device.DockModeCodeEnum; -import com.dji.sdk.cloudapi.device.OsdDockDrone; -import com.dji.sdk.cloudapi.wayline.FlighttaskProgress; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.mqtt.TopicConst; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.TopicServicesResponse; +package org.dromara.sample.control.service.impl; + + +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum; +import org.dromara.sample.wayline.model.enums.WaylineTaskStatusEnum; +import org.dromara.sample.wayline.model.param.UpdateJobParam; +import org.dromara.sample.wayline.service.IFlightTaskService; +import org.dromara.sample.wayline.service.IWaylineJobService; +import org.dromara.sample.wayline.service.IWaylineRedisService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.control.DrcModeEnterRequest; +import org.dromara.common.sdk.cloudapi.control.DrcModeMqttBroker; +import org.dromara.common.sdk.cloudapi.control.api.AbstractControlService; +import org.dromara.common.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.common.sdk.cloudapi.wayline.FlighttaskProgress; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.mqtt.TopicConst; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.sample.component.mqtt.config.MqttPropertyConfiguration; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.component.mqtt.model.MapKeyConst; +import org.dromara.sample.control.model.dto.JwtAclDTO; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; +import org.dromara.sample.control.model.enums.MqttAclAccessEnum; +import org.dromara.sample.control.model.param.DrcConnectParam; +import org.dromara.sample.control.model.param.DrcModeParam; +import org.dromara.sample.control.service.IControlService; +import org.dromara.sample.control.service.IDrcService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -66,11 +66,6 @@ public class DrcServiceImpl implements IDrcService { @Autowired private IDeviceService deviceService; - @Autowired - private ObjectMapper mapper; - - @Autowired - private IWebSocketMessageService webSocketMessageService; @Autowired private IControlService controlService; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/GimbalResetImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/GimbalResetImpl.java index 4e7a310..747fbd2 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/GimbalResetImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/GimbalResetImpl.java @@ -1,6 +1,7 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.control.model.param.DronePayloadParam; + +import org.dromara.sample.control.model.param.DronePayloadParam; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java index 53097be..4618fed 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/PayloadCommandsHandler.java @@ -1,12 +1,13 @@ -package com.dji.sample.control.service.impl; - -import com.dji.sample.common.util.SpringBeanUtilsTest; -import com.dji.sample.control.model.param.DronePayloadParam; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDevicePayloadService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.device.OsdCamera; -import com.dji.sdk.cloudapi.device.OsdDockDrone; +package org.dromara.sample.control.service.impl; + + +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDevicePayloadService; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.common.sdk.cloudapi.device.OsdCamera; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.sample.common.util.SpringBeanUtilsTest; +import org.dromara.sample.control.model.param.DronePayloadParam; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/RemoteDebugHandler.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/RemoteDebugHandler.java index 5da1688..d4d3a4f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/RemoteDebugHandler.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/RemoteDebugHandler.java @@ -1,8 +1,8 @@ -package com.dji.sample.control.service.impl; +package org.dromara.sample.control.service.impl; -import com.dji.sample.common.util.SpringBeanUtilsTest; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.common.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.sample.common.util.SpringBeanUtilsTest; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKControlService.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKControlService.java index 7401675..8c8f38d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKControlService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKControlService.java @@ -1,18 +1,19 @@ -package com.dji.sample.control.service.impl; - -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.control.model.dto.ResultNotifyDTO; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.control.*; -import com.dji.sdk.cloudapi.control.api.AbstractControlService; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; +package org.dromara.sample.control.service.impl; + + +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.service.IDeviceRedisService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.control.*; +import org.dromara.common.sdk.cloudapi.control.api.AbstractControlService; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.sample.control.model.dto.ResultNotifyDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; @@ -28,8 +29,6 @@ import java.util.Optional; @Slf4j public class SDKControlService extends AbstractControlService { - @Autowired - private IWebSocketMessageService webSocketMessageService; @Autowired private IDeviceRedisService deviceRedisService; @@ -48,7 +47,7 @@ public class SDKControlService extends AbstractControlService { } FlyToPointProgress eventsReceiver = request.getData(); - webSocketMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll( UserTypeEnum.WEB.getVal(), BizCodeEnum.FLY_TO_POINT_PROGRESS.getCode(), ResultNotifyDTO.builder().sn(dockSn) .message(eventsReceiver.getResult().toString()) @@ -68,7 +67,7 @@ public class SDKControlService extends AbstractControlService { } TakeoffToPointProgress eventsReceiver = request.getData(); - webSocketMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.TAKE_OFF_TO_POINT_PROGRESS.getCode(), ResultNotifyDTO.builder().sn(dockSn) .message(eventsReceiver.getResult().toString()) @@ -89,8 +88,8 @@ public class SDKControlService extends AbstractControlService { DrcStatusNotify eventsReceiver = request.getData(); if (DrcStatusErrorEnum.SUCCESS != eventsReceiver.getResult()) { - webSocketMessageService.sendBatch( - deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), BizCodeEnum.DRC_STATUS_NOTIFY.getCode(), + WebSocketUtils.publishAll( + UserTypeEnum.WEB.getVal(), BizCodeEnum.DRC_STATUS_NOTIFY.getCode(), ResultNotifyDTO.builder().sn(dockSn) .message(eventsReceiver.getResult().getMessage()) .result(eventsReceiver.getResult().getCode()).build()); @@ -108,8 +107,8 @@ public class SDKControlService extends AbstractControlService { } JoystickInvalidNotify eventsReceiver = request.getData(); - webSocketMessageService.sendBatch( - deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), BizCodeEnum.JOYSTICK_INVALID_NOTIFY.getCode(), + WebSocketUtils.publishAll( + UserTypeEnum.WEB.getVal(), BizCodeEnum.JOYSTICK_INVALID_NOTIFY.getCode(), ResultNotifyDTO.builder().sn(dockSn) .message(eventsReceiver.getReason().getMessage()) .result(eventsReceiver.getReason().getVal()).build()); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKRemoteDebug.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKRemoteDebug.java index b858454..d173628 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKRemoteDebug.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/SDKRemoteDebug.java @@ -1,17 +1,17 @@ -package com.dji.sample.control.service.impl; - -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.debug.RemoteDebugProgress; -import com.dji.sdk.cloudapi.debug.api.AbstractDebugService; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.EventsDataRequest; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; +package org.dromara.sample.control.service.impl; + +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.service.IDeviceRedisService; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.cloudapi.debug.RemoteDebugProgress; +import org.dromara.common.sdk.cloudapi.debug.api.AbstractDebugService; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.EventsDataRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.sample.component.mqtt.model.EventsReceiver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; @@ -27,8 +27,6 @@ import java.util.Optional; @Slf4j public class SDKRemoteDebug extends AbstractDebugService { - @Autowired - private IWebSocketMessageService webSocketMessageService; @Autowired private IDeviceRedisService deviceRedisService; @@ -55,7 +53,7 @@ public class SDKRemoteDebug extends AbstractDebugService { } DeviceDTO device = deviceOpt.get(); - webSocketMessageService.sendBatch(device.getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll( UserTypeEnum.WEB.getVal(), request.getMethod(), eventsReceiver); return new TopicEventsResponse().setData(MqttReply.success()); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java index 7a0a7ed..478b308 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java @@ -1,14 +1,16 @@ -package com.dji.sample.manage.controller; +package org.dromara.sample.manage.controller; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.DeviceFirmwareUpgradeDTO; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; -import com.dji.sdk.exception.CloudSDKErrorEnum; -import com.dji.sdk.mqtt.property.PropertySetReplyResultEnum; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.DeviceFirmwareUpgradeDTO; +import org.dromara.sample.manage.service.IDeviceService; import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.common.sdk.exception.CloudSDKErrorEnum; +import org.dromara.common.sdk.mqtt.property.PropertySetReplyResultEnum; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,18 +31,20 @@ public class DeviceController { private IDeviceService deviceService; /** + * 获取一个工作区中所有在线设备的列表。 * Get the topology list of all online devices in one workspace. - * @param workspaceId * @return */ - @GetMapping("/{workspace_id}/devices") - public HttpResultResponse> getDevices(@PathVariable("workspace_id") String workspaceId) { - List devicesList = deviceService.getDevicesTopoForWeb(workspaceId); + @GetMapping("/devices") + public HttpResultResponse> getDevices() { + LoginUser loginUser = LoginHelper.getLoginUser(); + List devicesList = deviceService.getDevicesTopoForWeb(loginUser.getTenantId()); return HttpResultResponse.success(devicesList); } /** + * 绑定设备 * After binding the device to the workspace, the device data can only be seen on the web. * @param device * @param deviceSn @@ -54,36 +58,38 @@ public class DeviceController { } /** + * 根据设备sn获取设备信息。 * Obtain device information according to device sn. - * @param workspaceId * @param deviceSn * @return */ - @GetMapping("/{workspace_id}/devices/{device_sn}") - public HttpResultResponse getDevice(@PathVariable("workspace_id") String workspaceId, + @GetMapping("/devices/{device_sn}") + public HttpResultResponse getDevice( @PathVariable("device_sn") String deviceSn) { Optional deviceOpt = deviceService.getDeviceBySn(deviceSn); return deviceOpt.isEmpty() ? HttpResultResponse.error("device not found.") : HttpResultResponse.success(deviceOpt.get()); } /** + * 在工作区中获取绑定设备列表。 * Get the binding devices list in one workspace. - * @param workspaceId * @param page * @param pageSize * @return */ - @GetMapping("/{workspace_id}/devices/bound") + @GetMapping("/devices/bound") public HttpResultResponse> getBoundDevicesWithDomain( - @PathVariable("workspace_id") String workspaceId, Integer domain, + Integer domain, @RequestParam(defaultValue = "1") Long page, @RequestParam(value = "page_size", defaultValue = "50") Long pageSize) { - PaginationData devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain); + LoginUser loginUser = LoginHelper.getLoginUser(); + PaginationData devices = deviceService.getBoundDevicesWithDomain(loginUser.getTenantId(), page, pageSize, domain); return HttpResultResponse.success(devices); } /** + * 正在删除设备的绑定状态。 * Removing the binding state of the device. * @param deviceSn * @return @@ -95,15 +101,14 @@ public class DeviceController { } /** + * 更新设备信息。 * Update device information. * @param device - * @param workspaceId * @param deviceSn * @return */ - @PutMapping("/{workspace_id}/devices/{device_sn}") + @PutMapping("/devices/{device_sn}") public HttpResultResponse updateDevice(@RequestBody DeviceDTO device, - @PathVariable("workspace_id") String workspaceId, @PathVariable("device_sn") String deviceSn) { device.setDeviceSn(deviceSn); boolean isUpd = deviceService.updateDevice(device); @@ -111,34 +116,35 @@ public class DeviceController { } /** + * 设备离线固件升级任务。 * Delivers offline firmware upgrade tasks. - * @param workspaceId * @param upgradeDTOS * @return */ - @PostMapping("/{workspace_id}/devices/ota") - public HttpResultResponse createOtaJob(@PathVariable("workspace_id") String workspaceId, + @PostMapping("/devices/ota") + public HttpResultResponse createOtaJob( @RequestBody List upgradeDTOS) { - return deviceService.createDeviceOtaJob(workspaceId, upgradeDTOS); + LoginUser loginUser = LoginHelper.getLoginUser(); + return deviceService.createDeviceOtaJob(loginUser.getTenantId(), upgradeDTOS); } /** + * 设置无人机的属性参数。 * Set the property parameters of the drone. - * @param workspaceId * @param dockSn * @param param * @return */ - @PutMapping("/{workspace_id}/devices/{device_sn}/property") - public HttpResultResponse devicePropertySet(@PathVariable("workspace_id") String workspaceId, - @PathVariable("device_sn") String dockSn, + @PutMapping("/devices/{device_sn}/property") + public HttpResultResponse devicePropertySet(@PathVariable("device_sn") String dockSn, @RequestBody JsonNode param) { + LoginUser loginUser = LoginHelper.getLoginUser(); if (param.size() != 1) { return HttpResultResponse.error(CloudSDKErrorEnum.INVALID_PARAMETER); } - int result = deviceService.devicePropertySet(workspaceId, dockSn, param); + int result = deviceService.devicePropertySet(loginUser.getTenantId(), dockSn, param); return PropertySetReplyResultEnum.SUCCESS.getResult() == result ? HttpResultResponse.success() : HttpResultResponse.error(result, String.valueOf(result)); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFirmwareController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFirmwareController.java index 6425bbb..0630344 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFirmwareController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFirmwareController.java @@ -1,28 +1,28 @@ -package com.dji.sample.manage.controller; - -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.manage.model.dto.DeviceFirmwareDTO; -import com.dji.sample.manage.model.dto.DeviceFirmwareNoteDTO; -import com.dji.sample.manage.model.dto.FirmwareFileProperties; -import com.dji.sample.manage.model.param.DeviceFirmwareQueryParam; -import com.dji.sample.manage.model.param.DeviceFirmwareUpdateParam; -import com.dji.sample.manage.model.param.DeviceFirmwareUploadParam; -import com.dji.sample.manage.service.IDeviceFirmwareService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; +package org.dromara.sample.manage.controller; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceFirmwareDTO; +import org.dromara.sample.manage.model.dto.DeviceFirmwareNoteDTO; +import org.dromara.sample.manage.model.dto.FirmwareFileProperties; +import org.dromara.sample.manage.model.param.DeviceFirmwareQueryParam; +import org.dromara.sample.manage.model.param.DeviceFirmwareUpdateParam; +import org.dromara.sample.manage.model.param.DeviceFirmwareUploadParam; +import org.dromara.sample.manage.service.IDeviceFirmwareService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -38,6 +38,7 @@ public class DeviceFirmwareController { private IDeviceFirmwareService service; /** + * 获取此设备型号的最新固件版本信息。 * Get the latest firmware version information for this device model. * @param deviceNames * @return @@ -55,55 +56,52 @@ public class DeviceFirmwareController { } /** + * 根据参数查询固件信息。 * Query firmware information based on parameters. - * @param workspaceId * @param param * @return */ - @GetMapping("/{workspace_id}/firmwares") + @GetMapping("/firmwares") public HttpResultResponse> getAllFirmwarePagination( - @PathVariable("workspace_id") String workspaceId, @Valid DeviceFirmwareQueryParam param) { - - PaginationData data = service.getAllFirmwarePagination(workspaceId, param); + @Valid DeviceFirmwareQueryParam param) { + LoginUser loginUser = LoginHelper.getLoginUser(); + PaginationData data = service.getAllFirmwarePagination(loginUser.getTenantId(), param); return HttpResultResponse.success(data); } /** + * 导入固件文件以进行设备升级。 * Import firmware file for device upgrades. * @param request - * @param workspaceId * @param file * @param param * @return */ - @PostMapping("/{workspace_id}/firmwares/file/upload") - public HttpResultResponse importFirmwareFile(HttpServletRequest request, @PathVariable("workspace_id") String workspaceId, + @PostMapping("/firmwares/file/upload") + public HttpResultResponse importFirmwareFile(HttpServletRequest request, @NotNull(message = "No file received.") MultipartFile file, @Valid DeviceFirmwareUploadParam param) { - if (!file.getOriginalFilename().endsWith(FirmwareFileProperties.FIRMWARE_FILE_SUFFIX)) { return HttpResultResponse.error("The file format is incorrect."); } + LoginUser loginUser = LoginHelper.getLoginUser(); + String creator = loginUser.getUsername(); - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - String creator = customClaim.getUsername(); - - service.importFirmwareFile(workspaceId, creator, param, file); + service.importFirmwareFile(loginUser.getTenantId(), creator, param, file); return HttpResultResponse.success(); } /** + * 更改固件一致性状态。 * Change the firmware availability status. - * @param workspaceId * @param firmwareId * @param param * @return */ - @PutMapping("/{workspace_id}/firmwares/{firmware_id}") - public HttpResultResponse changeFirmwareStatus(@PathVariable("workspace_id") String workspaceId, + @PutMapping("/firmwares/{firmware_id}") + public HttpResultResponse changeFirmwareStatus( @PathVariable("firmware_id") String firmwareId, @Valid @RequestBody DeviceFirmwareUpdateParam param) { - service.updateFirmwareInfo(DeviceFirmwareDTO.builder() .firmwareId(firmwareId).firmwareStatus(param.getStatus()).build()); return HttpResultResponse.success(); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceHmsController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceHmsController.java index 7ded209..f601674 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceHmsController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceHmsController.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.controller; +package org.dromara.sample.manage.controller; -import com.dji.sample.manage.model.dto.DeviceHmsDTO; -import com.dji.sample.manage.model.param.DeviceHmsQueryParam; -import com.dji.sample.manage.service.IDeviceHmsService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceHmsDTO; +import org.dromara.sample.manage.model.param.DeviceHmsQueryParam; +import org.dromara.sample.manage.service.IDeviceHmsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,36 +28,36 @@ public class DeviceHmsController { private IDeviceHmsService deviceHmsService; /** - * Page to query the hms information of the device. + * 分页查询设备hms信息的页面 * @param param - * @param workspaceId * @return */ - @GetMapping("/{workspace_id}/devices/hms") - public HttpResultResponse> getHmsInformation(DeviceHmsQueryParam param, - @PathVariable("workspace_id") String workspaceId) { + @GetMapping("/devices/hms") + public HttpResultResponse> getHmsInformation(DeviceHmsQueryParam param) { PaginationData devices = deviceHmsService.getDeviceHmsByParam(param); return HttpResultResponse.success(devices); } /** + * 将未读hms消息更新为已读状态。 * Update unread hms messages to read status. * @param deviceSn * @return */ - @PutMapping("/{workspace_id}/devices/hms/{device_sn}") + @PutMapping("/devices/hms/{device_sn}") public HttpResultResponse updateReadHmsByDeviceSn(@PathVariable("device_sn") String deviceSn) { deviceHmsService.updateUnreadHms(deviceSn); return HttpResultResponse.success(); } /** + * 获取单个设备的hms消息。 * Get hms messages for a single device. * @param deviceSn * @return */ - @GetMapping("/{workspace_id}/devices/hms/{device_sn}") + @GetMapping("/devices/hms/{device_sn}") public HttpResultResponse> getUnreadHmsByDeviceSn(@PathVariable("device_sn") String deviceSn) { PaginationData paginationData = deviceHmsService.getDeviceHmsByParam( DeviceHmsQueryParam.builder() diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceLogsController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceLogsController.java index 3e08d53..b66e920 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceLogsController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceLogsController.java @@ -1,23 +1,25 @@ -package com.dji.sample.manage.controller; +package org.dromara.sample.manage.controller; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.log.FileUploadUpdateRequest; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceLogsDTO; +import org.dromara.sample.manage.model.param.DeviceLogsCreateParam; +import org.dromara.sample.manage.model.param.DeviceLogsGetParam; +import org.dromara.sample.manage.model.param.DeviceLogsQueryParam; +import org.dromara.sample.manage.service.IDeviceLogsService; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.manage.model.dto.DeviceLogsDTO; -import com.dji.sample.manage.model.param.DeviceLogsCreateParam; -import com.dji.sample.manage.model.param.DeviceLogsGetParam; -import com.dji.sample.manage.model.param.DeviceLogsQueryParam; -import com.dji.sample.manage.service.IDeviceLogsService; -import com.dji.sdk.cloudapi.log.FileUploadUpdateRequest; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; import lombok.extern.slf4j.Slf4j; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import java.net.URL; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -33,90 +35,88 @@ public class DeviceLogsController { private IDeviceLogsService deviceLogsService; /** + * 根据查询参数分页获取设备上传日志列表。 * Obtain the device upload log list by paging according to the query parameters. - * @param workspaceId * @param deviceSn * @param param * @return */ - @GetMapping("/{workspace_id}/devices/{device_sn}/logs-uploaded") - public HttpResultResponse getUploadedLogs(DeviceLogsQueryParam param, @PathVariable("workspace_id") String workspaceId, + @GetMapping("/devices/{device_sn}/logs-uploaded") + public HttpResultResponse getUploadedLogs(DeviceLogsQueryParam param, @PathVariable("device_sn") String deviceSn) { PaginationData data = deviceLogsService.getUploadedLogs(deviceSn, param); return HttpResultResponse.success(data); } /** + * 获取可以实时上传的日志文件列表。 * Get a list of log files that can be uploaded in real time. - * @param workspaceId * @param deviceSn * @param param * @return */ - @GetMapping("/{workspace_id}/devices/{device_sn}/logs") - public HttpResultResponse getLogsBySn(@PathVariable("workspace_id") String workspaceId, + @GetMapping("/devices/{device_sn}/logs") + public HttpResultResponse getLogsBySn( @PathVariable("device_sn") String deviceSn, DeviceLogsGetParam param) { return deviceLogsService.getRealTimeLogs(deviceSn, param.getDomainList()); } /** + * 向网关发起日志上传请求。 * Initiate a log upload request to the gateway. * @return */ @PostMapping("/{workspace_id}/devices/{device_sn}/logs") - public HttpResultResponse uploadLogs(@PathVariable("workspace_id") String workspaceId, - @PathVariable("device_sn") String deviceSn, + public HttpResultResponse uploadLogs(@PathVariable("device_sn") String deviceSn, HttpServletRequest request, @RequestBody DeviceLogsCreateParam param) { - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - - return deviceLogsService.pushFileUpload(customClaim.getUsername(), deviceSn, param); + LoginUser loginUser = LoginHelper.getLoginUser(); + return deviceLogsService.pushFileUpload(loginUser.getUsername(), deviceSn, param); } /** + * 取消日志文件上传。 * Cancel logs file upload. * @return */ - @DeleteMapping("/{workspace_id}/devices/{device_sn}/logs") - public HttpResultResponse cancelUploadedLogs(@PathVariable("workspace_id") String workspaceId, - @PathVariable("device_sn") String deviceSn, + @DeleteMapping("/devices/{device_sn}/logs") + public HttpResultResponse cancelUploadedLogs(@PathVariable("device_sn") String deviceSn, @RequestBody FileUploadUpdateRequest param) { return deviceLogsService.pushUpdateFile(deviceSn, param); } /** - * Delete upload history. + * 删除上传历史记录。 * @return */ - @DeleteMapping("/{workspace_id}/devices/{device_sn}/logs/{logs_id}") - public HttpResultResponse deleteUploadedLogs(@PathVariable("workspace_id") String workspaceId, - @PathVariable("device_sn") String deviceSn, + @DeleteMapping("/devices/{device_sn}/logs/{logs_id}") + public HttpResultResponse deleteUploadedLogs(@PathVariable("device_sn") String deviceSn, @PathVariable("logs_id") String logsId) { deviceLogsService.deleteLogs(deviceSn, logsId); return HttpResultResponse.success(); } /** + * 根据路线文件id查询文件的下载地址， + * 并直接重定向到此地址进行下载。 * Query the download address of the file according to the wayline file id, * and redirect to this address directly for download. - * @param workspaceId * @param fileId * @param logsId * @param response */ - @GetMapping("/{workspace_id}/logs/{logs_id}/url/{file_id}") - public HttpResultResponse getFileUrl(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "file_id") String fileId, + @GetMapping("/logs/{logs_id}/url/{file_id}") + public HttpResultResponse getFileUrl(@PathVariable(name = "file_id") String fileId, @PathVariable(name = "logs_id") String logsId, HttpServletResponse response) { try { URL url = deviceLogsService.getLogsFileUrl(logsId, fileId); return HttpResultResponse.success(url.toString()); } catch (Exception e) { - log.error("Failed to get the logs file download address."); + log.error("无法获取日志文件下载地址。"); e.printStackTrace(); } - return HttpResultResponse.error("Failed to get the logs file download address."); + return HttpResultResponse.error("无法获取日志文件下载地址。"); } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LiveStreamController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LiveStreamController.java index 27f1a64..9a3f903 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LiveStreamController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LiveStreamController.java @@ -1,20 +1,19 @@ -package com.dji.sample.manage.controller; +package org.dromara.sample.manage.controller; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.manage.model.dto.CapacityDeviceDTO; -import com.dji.sample.manage.model.dto.LiveTypeDTO; -import com.dji.sample.manage.service.ILiveStreamService; -import com.dji.sdk.common.HttpResultResponse; +import jakarta.servlet.http.HttpServletRequest; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.manage.model.dto.CapacityDeviceDTO; +import org.dromara.sample.manage.model.dto.LiveTypeDTO; +import org.dromara.sample.manage.service.ILiveStreamService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import java.util.List; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; - /** * @author sean.zhou * @version 0.1 @@ -33,23 +32,24 @@ public class LiveStreamController { private ObjectMapper mapper; /** + * 从数据库中获取当前用户工作区中所有无人机的实时能力数据。 * Get live capability data of all drones in the current user's workspace from the database. * @param request - * @return live capability + * @return live capability 实时 */ @GetMapping("/capacity") public HttpResultResponse> getLiveCapacity(HttpServletRequest request) { // Get information about the current user. - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - - List liveCapacity = liveStreamService.getLiveCapacity(customClaim.getWorkspaceId()); + LoginUser loginUser = LoginHelper.getLoginUser(); + List liveCapacity = liveStreamService.getLiveCapacity(loginUser.getTenantId()); return HttpResultResponse.success(liveCapacity); } /** + * 启用直播。 * Live streaming according to the parameters passed in from the web side. - * @param liveParam Live streaming parameters. + * @param liveParam Live streaming parameters. 直播参数。 * @return */ @PostMapping("/streams/start") @@ -58,6 +58,7 @@ public class LiveStreamController { } /** + * 停止直播。 * Stop live streaming according to the parameters passed in from the web side. * @param liveParam Live streaming parameters. * @return @@ -68,6 +69,7 @@ public class LiveStreamController { } /** + * 设置直播流的质量。 * Set the quality of the live streaming according to the parameters passed in from the web side. * @param liveParam Live streaming parameters. * @return @@ -82,4 +84,4 @@ public class LiveStreamController { return liveStreamService.liveLensChange(liveParam); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LoginController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LoginController.java deleted file mode 100644 index 9572dbb..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/LoginController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.dji.sample.manage.controller; - -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.manage.model.dto.UserDTO; -import com.dji.sample.manage.model.dto.UserLoginDTO; -import com.dji.sample.manage.service.IUserService; -import com.dji.sdk.common.HttpResultResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Optional; - -import static com.dji.sample.component.AuthInterceptor.PARAM_TOKEN; - -@RestController -@RequestMapping("${url.manage.prefix}${url.manage.version}") -public class LoginController { - - @Autowired - private IUserService userService; - - @PostMapping("/login") - public HttpResultResponse login(@RequestBody UserLoginDTO loginDTO) { - - String username = loginDTO.getUsername(); - String password = loginDTO.getPassword(); - return userService.userLogin(username, password, loginDTO.getFlag()); - } - - @PostMapping("/token/refresh") - public HttpResultResponse refreshToken(HttpServletRequest request, HttpServletResponse response) { - String token = request.getHeader(PARAM_TOKEN); - Optional user = userService.refreshToken(token); - - if (user.isEmpty()) { - response.setStatus(HttpStatus.UNAUTHORIZED.value()); - return HttpResultResponse.error(CommonErrorEnum.NO_TOKEN.getMessage()); - } - - return HttpResultResponse.success(user.get()); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/TopologyController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/TopologyController.java index 10908d2..ada2049 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/TopologyController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/TopologyController.java @@ -1,17 +1,21 @@ -package com.dji.sample.manage.controller; +package org.dromara.sample.manage.controller; -import com.dji.sample.manage.service.ITopologyService; -import com.dji.sdk.cloudapi.tsa.TopologyList; -import com.dji.sdk.cloudapi.tsa.TopologyResponse; -import com.dji.sdk.cloudapi.tsa.api.IHttpTsaService; -import com.dji.sdk.common.HttpResultResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.tsa.TopologyList; +import org.dromara.common.sdk.cloudapi.tsa.TopologyResponse; +import org.dromara.common.sdk.cloudapi.tsa.api.IHttpTsaService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.manage.service.ITopologyService; + +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.List; + /** * @author sean * @version 0.2 @@ -25,13 +29,14 @@ public class TopologyController implements IHttpTsaService { /** + * 获取当前用户工作区中所有设备的拓扑列表，以供飞行员显示。 * Get the topology list of all devices in the current user workspace for pilot display. - * @param workspaceId * @return */ @Override - public HttpResultResponse obtainDeviceTopologyList(String workspaceId, HttpServletRequest req, HttpServletResponse rsp) { - List topologyList = topologyService.getDeviceTopology(workspaceId); + public HttpResultResponse obtainDeviceTopologyList(HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + List topologyList = topologyService.getDeviceTopology(loginUser.getTenantId()); return HttpResultResponse.success(new TopologyResponse().setList(topologyList)); } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/UserController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/UserController.java deleted file mode 100644 index 5536948..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/UserController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.dji.sample.manage.controller; - -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.manage.model.dto.UserListDTO; -import com.dji.sample.manage.service.IUserService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; - -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; - - -@RestController -@RequestMapping("${url.manage.prefix}${url.manage.version}/users") -public class UserController { - - @Autowired - private IUserService userService; - - /** - * Query the information of the current user. - * @param request - * @return - */ - @GetMapping("/current") - public HttpResultResponse getCurrentUserInfo(HttpServletRequest request) { - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - return userService.getUserByUsername(customClaim.getUsername(), customClaim.getWorkspaceId()); - } - - /** - * Paging to query all users in a workspace. - * @param page current page - * @param pageSize - * @param workspaceId - * @return - */ - @GetMapping("/{workspace_id}/users") - public HttpResultResponse> getUsers(@RequestParam(defaultValue = "1") Long page, - @RequestParam(value = "page_size", defaultValue = "50") Long pageSize, - @PathVariable("workspace_id") String workspaceId) { - PaginationData paginationData = userService.getUsersByWorkspaceId(page, pageSize, workspaceId); - return HttpResultResponse.success(paginationData); - } - - /** - * Modify user information. Only mqtt account information is included, nothing else can be modified. - * @param user - * @param workspaceId - * @param userId - * @return - */ - @PutMapping("/{workspace_id}/users/{user_id}") - public HttpResultResponse updateUser(@RequestBody UserListDTO user, - @PathVariable("workspace_id") String workspaceId, - @PathVariable("user_id") String userId) { - - userService.updateUser(workspaceId, userId, user); - return HttpResultResponse.success(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/WorkspaceController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/WorkspaceController.java index 80110ac..bffffbd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/WorkspaceController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/WorkspaceController.java @@ -1,18 +1,18 @@ -package com.dji.sample.manage.controller; +package org.dromara.sample.manage.controller; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.manage.model.dto.WorkspaceDTO; -import com.dji.sample.manage.service.IWorkspaceService; -import com.dji.sdk.common.HttpResultResponse; +import jakarta.servlet.http.HttpServletRequest; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.manage.model.dto.WorkspaceDTO; +import org.dromara.sample.manage.service.IWorkspaceService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; import java.util.Optional; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean.zhou @@ -27,15 +27,16 @@ public class WorkspaceController { private IWorkspaceService workspaceService; /** + * 获取当前用户所在工作区的相关信息。 * Gets information about the workspace that the current user is in. * @param request * @return */ @GetMapping("/current") public HttpResultResponse getCurrentWorkspace(HttpServletRequest request) { - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - Optional workspaceOpt = workspaceService.getWorkspaceByWorkspaceId(customClaim.getWorkspaceId()); - + LoginUser loginUser = LoginHelper.getLoginUser(); + String tenantId = loginUser.getTenantId(); + Optional workspaceOpt = workspaceService.getWorkspaceByTenantId(tenantId); return workspaceOpt.isEmpty() ? HttpResultResponse.error() : HttpResultResponse.success(workspaceOpt.get()); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java index cce8f7e..ab303cd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.DeviceDictionaryEntity; +import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity; /** * diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java index bc4c4a2..87a055e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.manage.model.entity.DeviceFirmwareEntity; +import org.dromara.sample.manage.model.entity.DeviceFirmwareEntity; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java index c7eb8bb..3043a86 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.DeviceHmsEntity; +import org.dromara.sample.manage.model.entity.DeviceHmsEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java index ae9290b..ea74504 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.DeviceLogsEntity; +import org.dromara.sample.manage.model.entity.DeviceLogsEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java index 758d8e5..0cb3338 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.DeviceEntity; +import org.dromara.sample.manage.model.entity.DeviceEntity; /** * @@ -11,4 +11,4 @@ import com.dji.sample.manage.model.entity.DeviceEntity; */ public interface IDeviceMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java index f90231c..a2b5c16 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.DevicePayloadEntity; +import org.dromara.sample.manage.model.entity.DevicePayloadEntity; /** * @author sean.zhou diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java index 9cb8ee3..28d0ce9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.FirmwareModelEntity; +import org.dromara.sample.manage.model.entity.FirmwareModelEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java index e0b3f3b..ff0db4c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.LogsFileIndexEntity; +import org.dromara.sample.manage.model.entity.LogsFileIndexEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java index 4acfb6c..869d1c3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.LogsFileEntity; +import org.dromara.sample.manage.model.entity.LogsFileEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java index a6179ae..42ceb00 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.UserEntity; +import org.dromara.sample.manage.model.entity.UserEntity; public interface IUserMapper extends BaseMapper { diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java index 79bc240..aa5c221 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.dao; +package org.dromara.sample.manage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.manage.model.entity.WorkspaceEntity; +import org.dromara.sample.manage.model.entity.WorkspaceEntity; public interface IWorkspaceMapper extends BaseMapper { diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/AppLicenseProperties.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/AppLicenseProperties.java index cc15023..9696bf0 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/AppLicenseProperties.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/AppLicenseProperties.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.common; +package org.dromara.sample.manage.model.common; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsJsonUtil.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsJsonUtil.java index 12919d6..2bfeb38 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsJsonUtil.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsJsonUtil.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.common; +package org.dromara.sample.manage.model.common; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsMessage.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsMessage.java index 328b45e..c0aeddc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsMessage.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/HmsMessage.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.common; +package org.dromara.sample.manage.model.common; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/NtpServerProperties.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/NtpServerProperties.java index 7e562f3..fa9f575 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/NtpServerProperties.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/common/NtpServerProperties.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.common; +package org.dromara.sample.manage.model.common; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityCameraDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityCameraDTO.java index d44fddd..05aaac8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityCameraDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityCameraDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -29,4 +29,4 @@ public class CapacityCameraDTO { private String type; private List videosList; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityDeviceDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityDeviceDTO.java index efa0bcc..51a5f68 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityDeviceDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityDeviceDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,4 +23,4 @@ public class CapacityDeviceDTO { private String name; private List camerasList; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityVideoDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityVideoDTO.java index 531e7ec..eaed3ff 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityVideoDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/CapacityVideoDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -25,4 +25,4 @@ public class CapacityVideoDTO { private String type; private List switchVideoTypes; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceAuthorityDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceAuthorityDTO.java index c72680f..afc5c97 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceAuthorityDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceAuthorityDTO.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sdk.cloudapi.device.ControlSourceEnum; +import org.dromara.common.sdk.cloudapi.device.ControlSourceEnum; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java index 3d89a92..d8ccc7c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java @@ -1,11 +1,12 @@ -package com.dji.sample.manage.model.dto; - -import com.dji.sample.manage.model.enums.DeviceFirmwareStatusEnum; -import com.dji.sdk.cloudapi.device.ControlSourceEnum; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.device.DeviceSubTypeEnum; -import com.dji.sdk.cloudapi.device.DeviceTypeEnum; -import com.dji.sdk.cloudapi.tsa.DeviceIconUrl; +package org.dromara.sample.manage.model.dto; + +import org.dromara.common.sdk.cloudapi.device.ControlSourceEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceSubTypeEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceTypeEnum; +import org.dromara.common.sdk.cloudapi.tsa.DeviceIconUrl; +import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -72,4 +73,4 @@ public class DeviceDTO { private String parentSn; private String thingVersion; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDictionaryDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDictionaryDTO.java index 9c0170d..75bf6fb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDictionaryDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDictionaryDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -25,4 +25,4 @@ public class DeviceDictionaryDTO { private String deviceName; private String deviceDesc; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareDTO.java index b59f289..b4e6234 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareNoteDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareNoteDTO.java index 8899518..8669805 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareNoteDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareNoteDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareUpgradeDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareUpgradeDTO.java index 79e559b..930f892 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareUpgradeDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceFirmwareUpgradeDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceHmsDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceHmsDTO.java index 7dc1c1a..f718d5c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceHmsDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceHmsDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceLogsDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceLogsDTO.java index 0f5e210..1913ec1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceLogsDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceLogsDTO.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.tsa.TopologyList; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.tsa.TopologyList; import java.time.LocalDateTime; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadDTO.java index abcfb45..7df3b37 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadDTO.java @@ -1,11 +1,11 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.device.ControlSourceEnum; -import com.dji.sdk.cloudapi.device.PayloadIndex; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.ControlSourceEnum; +import org.dromara.common.sdk.cloudapi.device.PayloadIndex; /** * @author sean.zhou @@ -29,4 +29,4 @@ public class DevicePayloadDTO { private ControlSourceEnum controlSource; private PayloadIndex payloadIndex; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadReceiver.java index 85ecfd9..f856a51 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DevicePayloadReceiver.java @@ -1,11 +1,11 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.device.ControlSourceEnum; -import com.dji.sdk.cloudapi.device.PayloadIndex; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.ControlSourceEnum; +import org.dromara.common.sdk.cloudapi.device.PayloadIndex; /** * @author sean.zhou @@ -26,4 +26,4 @@ public class DevicePayloadReceiver { private String sn; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareFileProperties.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareFileProperties.java index 3e4e8f3..bb2f3d4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareFileProperties.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareFileProperties.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareModelDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareModelDTO.java index d9f10f5..d6c7511 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareModelDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/FirmwareModelDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveDTO.java index 29841c2..f5ecc1e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; @@ -17,4 +17,4 @@ public class LiveDTO { private String username; private String password; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveStreamProperty.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveStreamProperty.java index 4f68500..a2d2b13 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveStreamProperty.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveStreamProperty.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sdk.cloudapi.livestream.*; +import org.dromara.common.sdk.cloudapi.livestream.*; +import org.dromara.sample.common.error.CommonErrorEnum; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveTypeDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveTypeDTO.java index f0a41b2..45af6ae 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveTypeDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveTypeDTO.java @@ -1,11 +1,12 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; + -import com.dji.sdk.cloudapi.device.VideoId; -import com.dji.sdk.cloudapi.livestream.LensChangeVideoTypeEnum; -import com.dji.sdk.cloudapi.livestream.UrlTypeEnum; -import com.dji.sdk.cloudapi.livestream.VideoQualityEnum; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import org.dromara.common.sdk.cloudapi.device.VideoId; +import org.dromara.common.sdk.cloudapi.livestream.LensChangeVideoTypeEnum; +import org.dromara.common.sdk.cloudapi.livestream.UrlTypeEnum; +import org.dromara.common.sdk.cloudapi.livestream.VideoQualityEnum; /** * Receive live parameters. @@ -27,4 +28,4 @@ public class LiveTypeDTO { private LensChangeVideoTypeEnum videoType; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlAgoraDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlAgoraDTO.java index 1f9f781..41a0f43 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlAgoraDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlAgoraDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.Data; @@ -17,4 +17,4 @@ public class LiveUrlAgoraDTO { private String token; private Integer uid; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlGB28181DTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlGB28181DTO.java index d57f06a..ddd5d35 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlGB28181DTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlGB28181DTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.Data; @@ -24,4 +24,4 @@ public class LiveUrlGB28181DTO { private String channel; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlRTSPDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlRTSPDTO.java index 8e57734..a1e2f71 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlRTSPDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LiveUrlRTSPDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.Data; @@ -15,4 +15,4 @@ public class LiveUrlRTSPDTO { private String password; private Integer port; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileDTO.java index be09491..1d3f5ba 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadDTO.java index 1780b7f..41c88ef 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadDTO.java @@ -1,12 +1,12 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.log.LogFileIndex; -import com.dji.sdk.cloudapi.log.LogModuleEnum; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.log.LogFileIndex; +import org.dromara.common.sdk.cloudapi.log.LogModuleEnum; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadListDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadListDTO.java index be470f8..4859aaf 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadListDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsFileUploadListDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsOutputProgressDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsOutputProgressDTO.java index e0b1ad8..c1bcf06 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsOutputProgressDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsOutputProgressDTO.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.log.FileUploadStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.log.FileUploadStatusEnum; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsProgressDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsProgressDTO.java index 1e4e6bb..a73928b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsProgressDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsProgressDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsUploadCredentialsDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsUploadCredentialsDTO.java index a58041e..e070e55 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsUploadCredentialsDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/LogsUploadCredentialsDTO.java @@ -1,14 +1,14 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.log.FileUploadStartParam; -import com.dji.sdk.cloudapi.storage.CredentialsToken; -import com.dji.sdk.cloudapi.storage.OssTypeEnum; -import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.log.FileUploadStartParam; +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; +import org.dromara.common.sdk.cloudapi.storage.OssTypeEnum; +import org.dromara.common.sdk.cloudapi.storage.StsCredentialsResponse; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/ProductConfigDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/ProductConfigDTO.java index 577ba54..cd9d4c6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/ProductConfigDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/ProductConfigDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TelemetryDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TelemetryDTO.java index 26fe624..24937ee 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TelemetryDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TelemetryDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TopologyDeviceDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TopologyDeviceDTO.java index 627615d..4709b51 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TopologyDeviceDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/TopologyDeviceDTO.java @@ -1,9 +1,10 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.tsa.DeviceIconUrl; -import com.dji.sdk.cloudapi.tsa.DeviceTopology; -import com.dji.sdk.cloudapi.tsa.TopologyDeviceModel; + +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.tsa.DeviceIconUrl; +import org.dromara.common.sdk.cloudapi.tsa.DeviceTopology; +import org.dromara.common.sdk.cloudapi.tsa.TopologyDeviceModel; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java index 1e67c72..c34d27e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java index 7bfb3a6..05095a3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java index 1865ac9..4d2ae57 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/WorkspaceDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/WorkspaceDTO.java index de9083b..fa8736b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/WorkspaceDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/WorkspaceDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.dto; +package org.dromara.sample.manage.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -27,4 +27,4 @@ public class WorkspaceDTO { private String platformName; private String bindCode; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceDictionaryEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceDictionaryEntity.java index c01ec6f..669f875 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceDictionaryEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceDictionaryEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -42,4 +42,4 @@ public class DeviceDictionaryEntity implements Serializable { @TableField(value = "device_desc") private String deviceDesc; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java index ae26ed1..8836edf 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; @@ -88,4 +88,4 @@ public class DeviceEntity implements Serializable { @TableField(value = "login_time") private Long loginTime; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java index ced8e39..8cebea2 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFirmwareEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceHmsEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceHmsEntity.java index 27c2040..de05c78 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceHmsEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceHmsEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceLogsEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceLogsEntity.java index 6510004..fef081c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceLogsEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceLogsEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java index c50db1e..8794f19 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DevicePayloadEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; @@ -56,4 +56,4 @@ public class DevicePayloadEntity implements Serializable { @TableField(value = "control_source") private String controlSource; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java index 5c8707d..167d674 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/FirmwareModelEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileEntity.java index 636689a..b8dfc3f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileIndexEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileIndexEntity.java index d4999e8..e814726 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileIndexEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/LogsFileIndexEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/UserEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/UserEntity.java index 6c095b9..5c8c991 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/UserEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/UserEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java index 90a5348..1e8e60f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/WorkspaceEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.entity; +package org.dromara.sample.manage.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -32,4 +32,8 @@ public class WorkspaceEntity implements Serializable { @TableField(value = "bind_code") private String bindCode; + + @TableField(value = "tenant_id") + private String tenantId; + } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/CustomizeConfigScopeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/CustomizeConfigScopeEnum.java index 4634264..cc9e8aa 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/CustomizeConfigScopeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/CustomizeConfigScopeEnum.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; -import com.dji.sample.manage.service.IRequestsConfigService; -import com.dji.sample.manage.service.impl.ConfigProductServiceImpl; -import com.dji.sdk.cloudapi.config.ConfigScopeEnum; +import org.dromara.common.sdk.cloudapi.config.ConfigScopeEnum; +import org.dromara.sample.manage.service.IRequestsConfigService; +import org.dromara.sample.manage.service.impl.ConfigProductServiceImpl; import lombok.Getter; import java.util.Arrays; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceFirmwareStatusEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceFirmwareStatusEnum.java index 01beda2..64a2a72 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceFirmwareStatusEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceFirmwareStatusEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceLogsStatusEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceLogsStatusEnum.java index 0fcbdd8..435f067 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceLogsStatusEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/DeviceLogsStatusEnum.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; -import com.dji.sdk.cloudapi.log.FileUploadStatusEnum; import lombok.Getter; +import org.dromara.common.sdk.cloudapi.log.FileUploadStatusEnum; import java.util.Arrays; import java.util.Collections; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/ExitWaylineWhenRcLostActionEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/ExitWaylineWhenRcLostActionEnum.java index aff6504..331db1a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/ExitWaylineWhenRcLostActionEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/ExitWaylineWhenRcLostActionEnum.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; -import com.dji.sdk.exception.CloudSDKException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import org.dromara.common.sdk.exception.CloudSDKException; import java.util.Arrays; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/FirmwareMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/FirmwareMethodEnum.java index b185546..eff899e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/FirmwareMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/FirmwareMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveStreamMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveStreamMethodEnum.java index b49cdc1..ce40947 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveStreamMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveStreamMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveUrlTypeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveUrlTypeEnum.java index 163b520..dbaad46 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveUrlTypeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveUrlTypeEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; /** * @author sean.zhou diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveVideoQualityEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveVideoQualityEnum.java index 3ad42d3..09f7d46 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveVideoQualityEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LiveVideoQualityEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LogsFileUpdateMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LogsFileUpdateMethodEnum.java index 2e4e718..ab048de 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LogsFileUpdateMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/LogsFileUpdateMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PayloadModelEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PayloadModelEnum.java index 5633b03..f256523 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PayloadModelEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PayloadModelEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; import java.util.Arrays; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PropertySetFieldEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PropertySetFieldEnum.java index a80f0f9..94dab47 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PropertySetFieldEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/PropertySetFieldEnum.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; -import com.dji.sample.manage.model.receiver.*; -import com.dji.sdk.cloudapi.property.PropertySetEnum; +import org.dromara.common.sdk.cloudapi.property.PropertySetEnum; +import org.dromara.sample.manage.model.receiver.*; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/StateSwitchEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/StateSwitchEnum.java index b7989cf..60fcafc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/StateSwitchEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/StateSwitchEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; import java.util.Arrays; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/UserTypeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/UserTypeEnum.java index a90e526..47845d6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/UserTypeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/enums/UserTypeEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.enums; +package org.dromara.sample.manage.model.enums; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareQueryParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareQueryParam.java index ffcc8fb..40ebebe 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareQueryParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareQueryParam.java @@ -1,12 +1,12 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUpdateParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUpdateParam.java index 45c357d..d615ddd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUpdateParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUpdateParam.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUploadParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUploadParam.java index deeb67f..86d4dd1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUploadParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceFirmwareUploadParam.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -17,7 +17,7 @@ public class DeviceFirmwareUploadParam { @NotNull @JsonProperty("release_note") private String releaseNote; - + @NotNull private Boolean status; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceHmsQueryParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceHmsQueryParam.java index 35eaca8..fec1930 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceHmsQueryParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceHmsQueryParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsCreateParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsCreateParam.java index 7870d79..c00ae62 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsCreateParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsCreateParam.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; -import com.dji.sdk.cloudapi.log.FileUploadStartFile; import lombok.Data; +import org.dromara.common.sdk.cloudapi.log.FileUploadStartFile; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsGetParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsGetParam.java index 54325a9..91d05c3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsGetParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsGetParam.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; -import com.dji.sdk.cloudapi.log.LogModuleEnum; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import org.dromara.common.sdk.cloudapi.log.LogModuleEnum; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsQueryParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsQueryParam.java index 5674bb8..3a9ad1a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsQueryParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceLogsQueryParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java index b9fc67e..0b169f8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; import lombok.Builder; import lombok.Data; @@ -33,4 +33,4 @@ public class DeviceQueryParam { private boolean orderBy; private boolean isAsc; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/LogsFileUpdateParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/LogsFileUpdateParam.java index fe7f183..976bc68 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/LogsFileUpdateParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/LogsFileUpdateParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.param; +package org.dromara.sample.manage.model.param; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/BasicDeviceProperty.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/BasicDeviceProperty.java index c02b546..ce11666 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/BasicDeviceProperty.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/BasicDeviceProperty.java @@ -1,6 +1,7 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.OsdDockDrone; + +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityCameraReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityCameraReceiver.java index 9747533..905fd9a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityCameraReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityCameraReceiver.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.PayloadIndex; import lombok.Data; +import org.dromara.common.sdk.cloudapi.device.PayloadIndex; import java.util.List; @@ -21,4 +21,4 @@ public class CapacityCameraReceiver { private List videoList; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityDeviceReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityDeviceReceiver.java index 63edf06..b6f21de 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityDeviceReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityDeviceReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import lombok.Data; @@ -20,4 +20,4 @@ public class CapacityDeviceReceiver { private List cameraList; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityVideoReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityVideoReceiver.java index 1939641..e496990 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityVideoReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/CapacityVideoReceiver.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.livestream.VideoTypeEnum; import lombok.Data; +import org.dromara.common.sdk.cloudapi.livestream.VideoTypeEnum; import java.util.List; @@ -18,4 +18,4 @@ public class CapacityVideoReceiver { private VideoTypeEnum videoType; private List switchableVideoTypes; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceBasicReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceBasicReceiver.java index 423624c..549deeb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceBasicReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceBasicReceiver.java @@ -1,6 +1,6 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sample.manage.model.dto.DevicePayloadReceiver; +import org.dromara.sample.manage.model.dto.DevicePayloadReceiver; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; @@ -28,4 +28,4 @@ public class DeviceBasicReceiver { private Integer seriousLowBatteryWarningThreshold; private List payloads; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java index 05e3ed4..82aa5e6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DeviceMaintainStatusReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DistanceLimitStatusReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DistanceLimitStatusReceiver.java index 42c9004..40f5edb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DistanceLimitStatusReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DistanceLimitStatusReceiver.java @@ -1,12 +1,12 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.DockDistanceLimitStatus; -import com.dji.sdk.cloudapi.device.OsdDockDrone; -import com.dji.sdk.cloudapi.device.SwitchActionEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.DockDistanceLimitStatus; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.common.sdk.cloudapi.device.SwitchActionEnum; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DockSdrReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DockSdrReceiver.java index 4067717..7b0186c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DockSdrReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/DockSdrReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/FirmwareVersionReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/FirmwareVersionReceiver.java index 94ed706..950b42a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/FirmwareVersionReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/FirmwareVersionReceiver.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/HeightLimitReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/HeightLimitReceiver.java index a8b8e4f..84a98b5 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/HeightLimitReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/HeightLimitReceiver.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.OsdDockDrone; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/LiveCapacityReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/LiveCapacityReceiver.java index af471b7..b5528ba 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/LiveCapacityReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/LiveCapacityReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/MaintainStatusReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/MaintainStatusReceiver.java index 7896f31..9794ee8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/MaintainStatusReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/MaintainStatusReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/NightLightsStateReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/NightLightsStateReceiver.java index c966b26..303014f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/NightLightsStateReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/NightLightsStateReceiver.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.OsdDockDrone; -import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.fasterxml.jackson.annotation.JsonCreator; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.common.sdk.cloudapi.device.SwitchActionEnum; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java index cc10413..67dc65f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/ObstacleAvoidanceReceiver.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.ObstacleAvoidance; -import com.dji.sdk.cloudapi.device.OsdDockDrone; -import com.dji.sdk.cloudapi.device.SwitchActionEnum; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.sdk.cloudapi.device.ObstacleAvoidance; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.common.sdk.cloudapi.device.SwitchActionEnum; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutOfControlActionReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutOfControlActionReceiver.java index 7b00d69..06a57f7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutOfControlActionReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutOfControlActionReceiver.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.OsdDockDrone; -import com.dji.sdk.cloudapi.device.RcLostActionEnum; import com.fasterxml.jackson.annotation.JsonCreator; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.common.sdk.cloudapi.device.RcLostActionEnum; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutputLogsProgressReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutputLogsProgressReceiver.java index 9f5a0a6..f2a5066 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutputLogsProgressReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/OutputLogsProgressReceiver.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.log.FileUploadProgressExt; import lombok.Data; +import org.dromara.common.sdk.cloudapi.log.FileUploadProgressExt; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/RthAltitudeReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/RthAltitudeReceiver.java index 0d3bd54..06a8cbd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/RthAltitudeReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/RthAltitudeReceiver.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; -import com.dji.sdk.cloudapi.device.OsdDockDrone; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusGatewayReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusGatewayReceiver.java index 0cee5ed..1a8bec7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusGatewayReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusGatewayReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,4 +40,4 @@ public class StatusGatewayReceiver { @JsonProperty(value = "sub_devices") private List subDevices; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusSubDeviceReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusSubDeviceReceiver.java index 428f16c..8e1d844 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusSubDeviceReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/StatusSubDeviceReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -31,4 +31,4 @@ public class StatusSubDeviceReceiver { private String nonce; private Integer version; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/WirelessLinkStateReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/WirelessLinkStateReceiver.java index 797d351..ced9784 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/WirelessLinkStateReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/receiver/WirelessLinkStateReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.model.receiver; +package org.dromara.sample.manage.model.receiver; import lombok.Data; @@ -16,4 +16,4 @@ public class WirelessLinkStateReceiver { private Integer upwardQuality; -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICameraVideoService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICameraVideoService.java index df2f1ec..055632f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICameraVideoService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICameraVideoService.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.CapacityVideoDTO; -import com.dji.sample.manage.model.receiver.CapacityVideoReceiver; +import org.dromara.sample.manage.model.dto.CapacityVideoDTO; +import org.dromara.sample.manage.model.receiver.CapacityVideoReceiver; /** * @author sean.zhou diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICapacityCameraService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICapacityCameraService.java index df4d3ee..41a738e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICapacityCameraService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ICapacityCameraService.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.CapacityCameraDTO; -import com.dji.sample.manage.model.receiver.CapacityCameraReceiver; +import org.dromara.sample.manage.model.dto.CapacityCameraDTO; +import org.dromara.sample.manage.model.receiver.CapacityCameraReceiver; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceDictionaryService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceDictionaryService.java index 97b901b..8a50e81 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceDictionaryService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceDictionaryService.java @@ -1,6 +1,6 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.DeviceDictionaryDTO; +import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFirmwareService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFirmwareService.java index aab0992..c9f6eec 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFirmwareService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFirmwareService.java @@ -1,12 +1,12 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.DeviceFirmwareDTO; -import com.dji.sample.manage.model.dto.DeviceFirmwareNoteDTO; -import com.dji.sample.manage.model.dto.DeviceFirmwareUpgradeDTO; -import com.dji.sample.manage.model.param.DeviceFirmwareQueryParam; -import com.dji.sample.manage.model.param.DeviceFirmwareUploadParam; -import com.dji.sdk.cloudapi.firmware.OtaCreateDevice; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.sdk.cloudapi.firmware.OtaCreateDevice; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceFirmwareDTO; +import org.dromara.sample.manage.model.dto.DeviceFirmwareNoteDTO; +import org.dromara.sample.manage.model.dto.DeviceFirmwareUpgradeDTO; +import org.dromara.sample.manage.model.param.DeviceFirmwareQueryParam; +import org.dromara.sample.manage.model.param.DeviceFirmwareUploadParam; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceHmsService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceHmsService.java index afbd681..5d18f59 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceHmsService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceHmsService.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.DeviceHmsDTO; -import com.dji.sample.manage.model.param.DeviceHmsQueryParam; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceHmsDTO; +import org.dromara.sample.manage.model.param.DeviceHmsQueryParam; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceLogsService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceLogsService.java index b4f6800..70bd087 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceLogsService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceLogsService.java @@ -1,12 +1,13 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; + +import org.dromara.common.sdk.cloudapi.log.FileUploadUpdateRequest; +import org.dromara.common.sdk.cloudapi.log.LogModuleEnum; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceLogsDTO; +import org.dromara.sample.manage.model.param.DeviceLogsCreateParam; +import org.dromara.sample.manage.model.param.DeviceLogsQueryParam; -import com.dji.sample.manage.model.dto.DeviceLogsDTO; -import com.dji.sample.manage.model.param.DeviceLogsCreateParam; -import com.dji.sample.manage.model.param.DeviceLogsQueryParam; -import com.dji.sdk.cloudapi.log.FileUploadUpdateRequest; -import com.dji.sdk.cloudapi.log.LogModuleEnum; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; import java.net.URL; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDevicePayloadService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDevicePayloadService.java index d6abfec..516d163 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDevicePayloadService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDevicePayloadService.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.DevicePayloadDTO; -import com.dji.sample.manage.model.dto.DevicePayloadReceiver; -import com.dji.sdk.cloudapi.device.PayloadFirmwareVersion; +import org.dromara.common.sdk.cloudapi.device.PayloadFirmwareVersion; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.DevicePayloadDTO; +import org.dromara.sample.manage.model.dto.DevicePayloadReceiver; import java.util.Collection; import java.util.List; @@ -70,4 +70,4 @@ public interface IDevicePayloadService { Boolean checkAuthorityPayload(String deviceSn, String payloadIndex); void updatePayloadControl(DeviceDTO drone, List payloads); -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceRedisService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceRedisService.java index cd1afc2..d9c4ccd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceRedisService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceRedisService.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sdk.cloudapi.firmware.OtaProgress; +import org.dromara.common.sdk.cloudapi.firmware.OtaProgress; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.manage.model.dto.DeviceDTO; import java.util.Optional; import java.util.Set; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java index df0efa2..036c77d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java @@ -1,17 +1,17 @@ -package com.dji.sample.manage.service; - -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.DeviceFirmwareUpgradeDTO; -import com.dji.sample.manage.model.dto.TopologyDeviceDTO; -import com.dji.sample.manage.model.param.DeviceQueryParam; -import com.dji.sdk.cloudapi.device.ControlSourceEnum; -import com.dji.sdk.cloudapi.device.DeviceOsdHost; -import com.dji.sdk.cloudapi.device.DockModeCodeEnum; -import com.dji.sdk.cloudapi.device.DroneModeCodeEnum; -import com.dji.sdk.config.version.GatewayManager; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; +package org.dromara.sample.manage.service; + +import org.dromara.common.sdk.cloudapi.device.ControlSourceEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceOsdHost; +import org.dromara.common.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.DroneModeCodeEnum; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.common.sdk.config.version.GatewayManager; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.DeviceFirmwareUpgradeDTO; +import org.dromara.sample.manage.model.dto.TopologyDeviceDTO; +import org.dromara.sample.manage.model.param.DeviceQueryParam; import com.fasterxml.jackson.databind.JsonNode; import java.util.List; @@ -197,4 +197,4 @@ public interface IDeviceService { void pushOsdDataToWeb(String workspaceId, BizCodeEnum codeEnum, String sn, Object data); void updateFlightControl(DeviceDTO gateway, ControlSourceEnum controlSource); -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IFirmwareModelService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IFirmwareModelService.java index 4aaaa81..91241d6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IFirmwareModelService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IFirmwareModelService.java @@ -1,6 +1,6 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.FirmwareModelDTO; +import org.dromara.sample.manage.model.dto.FirmwareModelDTO; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILiveStreamService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILiveStreamService.java index e18eaac..16b0873 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILiveStreamService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILiveStreamService.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.CapacityDeviceDTO; -import com.dji.sample.manage.model.dto.LiveTypeDTO; -import com.dji.sdk.cloudapi.device.VideoId; -import com.dji.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.cloudapi.device.VideoId; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.manage.model.dto.CapacityDeviceDTO; +import org.dromara.sample.manage.model.dto.LiveTypeDTO; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileIndexService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileIndexService.java index 9d7da29..a743fcc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileIndexService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileIndexService.java @@ -1,8 +1,8 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.LogsFileDTO; -import com.dji.sample.manage.model.dto.LogsFileUploadDTO; -import com.dji.sdk.cloudapi.log.LogFileIndex; +import org.dromara.common.sdk.cloudapi.log.LogFileIndex; +import org.dromara.sample.manage.model.dto.LogsFileDTO; +import org.dromara.sample.manage.model.dto.LogsFileUploadDTO; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileService.java index 0384ac1..00deeba 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ILogsFileService.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.LogsFileDTO; -import com.dji.sample.manage.model.dto.LogsFileUploadDTO; -import com.dji.sdk.cloudapi.log.FileUploadProgressFile; -import com.dji.sdk.cloudapi.log.FileUploadStartFile; +import org.dromara.common.sdk.cloudapi.log.FileUploadProgressFile; +import org.dromara.common.sdk.cloudapi.log.FileUploadStartFile; +import org.dromara.sample.manage.model.dto.LogsFileDTO; +import org.dromara.sample.manage.model.dto.LogsFileUploadDTO; import java.net.URL; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IRequestsConfigService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IRequestsConfigService.java index 9f0222b..59c983c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IRequestsConfigService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IRequestsConfigService.java @@ -1,4 +1,4 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ITopologyService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ITopologyService.java index 012d9c6..c187e2e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ITopologyService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/ITopologyService.java @@ -1,6 +1,7 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sdk.cloudapi.tsa.TopologyList; + +import org.dromara.common.sdk.cloudapi.tsa.TopologyList; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IUserService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IUserService.java deleted file mode 100644 index 7100565..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IUserService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.dji.sample.manage.service; - -import com.dji.sample.manage.model.dto.UserDTO; -import com.dji.sample.manage.model.dto.UserListDTO; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; - -import java.util.Optional; - -public interface IUserService { - - /** - * Query user's details based on username. - * @param username - * @param workspaceId - * @return - */ - HttpResultResponse getUserByUsername(String username, String workspaceId); - - /** - * Verify the username and password to log in. - * @param username - * @param password - * @param flag - * @return - */ - HttpResultResponse userLogin(String username, String password, Integer flag); - - /** - * Create a user object containing a new token. - * @param token - * @return - */ - Optional refreshToken(String token); - - /** - * Query information about all users in a workspace. - * @param workspaceId uuid - * @return - */ - PaginationData getUsersByWorkspaceId(long page, long pageSize, String workspaceId); - - Boolean updateUser(String workspaceId, String userId, UserListDTO user); -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IWorkspaceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IWorkspaceService.java index eb3bcf5..e2446ed 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IWorkspaceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IWorkspaceService.java @@ -1,7 +1,7 @@ -package com.dji.sample.manage.service; +package org.dromara.sample.manage.service; -import com.dji.sample.manage.model.dto.WorkspaceDTO; +import org.dromara.sample.manage.model.dto.WorkspaceDTO; import java.util.Optional; @@ -14,6 +14,8 @@ public interface IWorkspaceService { */ Optional getWorkspaceByWorkspaceId(String workspaceId); + Optional getWorkspaceByTenantId(String tenantId); + /** * Query the workspace of a workspace based on bind code. * @param bindCode diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CameraVideoServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CameraVideoServiceImpl.java index 23a061a..2610480 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CameraVideoServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CameraVideoServiceImpl.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sample.manage.model.dto.CapacityVideoDTO; -import com.dji.sample.manage.model.receiver.CapacityVideoReceiver; -import com.dji.sample.manage.service.ICameraVideoService; -import com.dji.sdk.cloudapi.livestream.VideoTypeEnum; +import org.dromara.common.sdk.cloudapi.livestream.VideoTypeEnum; +import org.dromara.sample.manage.model.dto.CapacityVideoDTO; +import org.dromara.sample.manage.model.receiver.CapacityVideoReceiver; +import org.dromara.sample.manage.service.ICameraVideoService; import org.springframework.stereotype.Service; import java.util.UUID; @@ -32,4 +32,4 @@ public class CameraVideoServiceImpl implements ICameraVideoService { } return builder.build(); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CapacityCameraServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CapacityCameraServiceImpl.java index 3a4d087..71ef36c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CapacityCameraServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/CapacityCameraServiceImpl.java @@ -1,15 +1,15 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.manage.model.dto.CapacityCameraDTO; -import com.dji.sample.manage.model.dto.DeviceDictionaryDTO; -import com.dji.sample.manage.model.receiver.CapacityCameraReceiver; -import com.dji.sample.manage.service.ICameraVideoService; -import com.dji.sample.manage.service.ICapacityCameraService; -import com.dji.sample.manage.service.IDeviceDictionaryService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.device.PayloadIndex; +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.device.PayloadIndex; +import org.dromara.sample.manage.model.dto.CapacityCameraDTO; +import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO; +import org.dromara.sample.manage.model.receiver.CapacityCameraReceiver; +import org.dromara.sample.manage.service.ICameraVideoService; +import org.dromara.sample.manage.service.ICapacityCameraService; +import org.dromara.sample.manage.service.IDeviceDictionaryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/ConfigProductServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/ConfigProductServiceImpl.java index 2b2f59f..9127337 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/ConfigProductServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/ConfigProductServiceImpl.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sample.manage.model.common.AppLicenseProperties; -import com.dji.sample.manage.model.common.NtpServerProperties; -import com.dji.sample.manage.model.dto.ProductConfigDTO; -import com.dji.sample.manage.service.IRequestsConfigService; +import org.dromara.sample.manage.model.common.AppLicenseProperties; +import org.dromara.sample.manage.model.common.NtpServerProperties; +import org.dromara.sample.manage.model.dto.ProductConfigDTO; +import org.dromara.sample.manage.service.IRequestsConfigService; import org.springframework.stereotype.Service; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java index a4574b7..bbed940 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.dji.sample.manage.dao.IDeviceDictionaryMapper; -import com.dji.sample.manage.model.dto.DeviceDictionaryDTO; -import com.dji.sample.manage.model.entity.DeviceDictionaryEntity; -import com.dji.sample.manage.service.IDeviceDictionaryService; +import org.dromara.sample.manage.dao.IDeviceDictionaryMapper; +import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO; +import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity; +import org.dromara.sample.manage.service.IDeviceDictionaryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -56,4 +56,4 @@ public class DeviceDictionaryServiceImpl implements IDeviceDictionaryService { } return builder.build(); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java index 03c95f5..fc0a247 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java @@ -1,36 +1,37 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.dao.IDeviceFirmwareMapper; -import com.dji.sample.manage.model.dto.*; -import com.dji.sample.manage.model.entity.DeviceFirmwareEntity; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.model.param.DeviceFirmwareQueryParam; -import com.dji.sample.manage.model.param.DeviceFirmwareUploadParam; -import com.dji.sample.manage.service.IDeviceFirmwareService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IFirmwareModelService; -import com.dji.sdk.cloudapi.firmware.FirmwareUpgradeTypeEnum; -import com.dji.sdk.cloudapi.firmware.OtaCreateDevice; -import com.dji.sdk.cloudapi.firmware.OtaProgress; -import com.dji.sdk.cloudapi.firmware.OtaProgressStatusEnum; -import com.dji.sdk.cloudapi.firmware.api.AbstractFirmwareService; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.EventsDataRequest; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.sdk.cloudapi.firmware.FirmwareUpgradeTypeEnum; +import org.dromara.common.sdk.cloudapi.firmware.OtaCreateDevice; +import org.dromara.common.sdk.cloudapi.firmware.OtaProgress; +import org.dromara.common.sdk.cloudapi.firmware.OtaProgressStatusEnum; +import org.dromara.common.sdk.cloudapi.firmware.api.AbstractFirmwareService; +import org.dromara.common.sdk.common.Pagination; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.EventsDataRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.manage.dao.IDeviceFirmwareMapper; +import org.dromara.sample.manage.model.dto.*; +import org.dromara.sample.manage.model.entity.DeviceFirmwareEntity; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.model.param.DeviceFirmwareQueryParam; +import org.dromara.sample.manage.model.param.DeviceFirmwareUploadParam; +import org.dromara.sample.manage.service.IDeviceFirmwareService; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IFirmwareModelService; + import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -68,12 +69,6 @@ public class DeviceFirmwareServiceImpl extends AbstractFirmwareService implement @Autowired private ObjectMapper objectMapper; - @Autowired - private IWebSocketMessageService webSocketMessageService; - - @Autowired - private OssServiceContext ossServiceContext; - @Autowired private IFirmwareModelService firmwareModelService; @@ -163,7 +158,7 @@ public class DeviceFirmwareServiceImpl extends AbstractFirmwareService implement deviceRedisService.setFirmwareUpgrading(sn, events); } events.setSn(sn); - webSocketMessageService.sendBatch(workspaceId, UserTypeEnum.WEB.getVal(), BizCodeEnum.OTA_PROGRESS.getCode(), events); + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.OTA_PROGRESS.getCode(), events); } @Override @@ -210,11 +205,12 @@ public class DeviceFirmwareServiceImpl extends AbstractFirmwareService implement if (firmwareOpt.isEmpty()) { throw new RuntimeException("文件格式不正确。"); } - + OssClient storage = OssFactory.instance("firmware"); String firmwareId = UUID.randomUUID().toString(); - String objectKey = OssConfiguration.objectDirPrefix + File.separator + firmwareId + FirmwareFileProperties.FIRMWARE_FILE_SUFFIX; + storage.uploadSuffix(file.getBytes(), File.separator + firmwareId + FirmwareFileProperties.FIRMWARE_FILE_SUFFIX,file.getContentType()); + String objectKey = "firmware" + File.separator + firmwareId + FirmwareFileProperties.FIRMWARE_FILE_SUFFIX; + - ossServiceContext.putObject(OssConfiguration.bucket, objectKey, file.getInputStream()); log.info("上传成功。 {}", file.getOriginalFilename()); DeviceFirmwareDTO firmware = DeviceFirmwareDTO.builder() .releaseNote(param.getReleaseNote()) @@ -344,9 +340,10 @@ public class DeviceFirmwareServiceImpl extends AbstractFirmwareService implement if (dto == null) { return null; } + OssClient storage = OssFactory.instance("firmware"); return new OtaCreateDevice() .setFileSize(dto.getFileSize()) - .setFileUrl(ossServiceContext.getObjectUrl(OssConfiguration.bucket, dto.getObjectKey()).toString()) + .setFileUrl(storage.getPrivateUrl( dto.getObjectKey(),3600).toString()) .setFileName(dto.getFileName()) .setMd5(dto.getFileMd5()) .setProductVersion(dto.getProductVersion()); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java index 3f3f169..83675f3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java @@ -1,27 +1,27 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.dao.IDeviceHmsMapper; -import com.dji.sample.manage.model.common.HmsJsonUtil; -import com.dji.sample.manage.model.common.HmsMessage; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.DeviceHmsDTO; -import com.dji.sample.manage.model.dto.TelemetryDTO; -import com.dji.sample.manage.model.entity.DeviceHmsEntity; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.model.param.DeviceHmsQueryParam; -import com.dji.sample.manage.service.IDeviceHmsService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.hms.*; -import com.dji.sdk.cloudapi.hms.api.AbstractHmsService; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; -import com.dji.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.hms.*; +import org.dromara.common.sdk.cloudapi.hms.api.AbstractHmsService; +import org.dromara.common.sdk.common.Pagination; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.manage.dao.IDeviceHmsMapper; +import org.dromara.sample.manage.model.common.HmsJsonUtil; +import org.dromara.sample.manage.model.common.HmsMessage; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.DeviceHmsDTO; +import org.dromara.sample.manage.model.dto.TelemetryDTO; +import org.dromara.sample.manage.model.entity.DeviceHmsEntity; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.model.param.DeviceHmsQueryParam; +import org.dromara.sample.manage.service.IDeviceHmsService; +import org.dromara.sample.manage.service.IDeviceRedisService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -55,9 +55,6 @@ public class DeviceHmsServiceImpl extends AbstractHmsService implements IDeviceH @Autowired private ObjectMapper objectMapper; - @Autowired - private IWebSocketMessageService sendMessageService; - @Autowired private IDeviceRedisService deviceRedisService; @@ -104,7 +101,7 @@ public class DeviceHmsServiceImpl extends AbstractHmsService implements IDeviceH if (deviceOpt.isEmpty()) { return; } - sendMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.DEVICE_HMS.getCode(), TelemetryDTO.>builder().sn(sn).host(unReadList).build()); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java index 071c9ca..1ecd957 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java @@ -1,38 +1,39 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.dao.IDeviceLogsMapper; -import com.dji.sample.manage.model.dto.*; -import com.dji.sample.manage.model.entity.DeviceLogsEntity; -import com.dji.sample.manage.model.enums.DeviceLogsStatusEnum; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.model.param.DeviceLogsCreateParam; -import com.dji.sample.manage.model.param.DeviceLogsQueryParam; -import com.dji.sample.manage.service.IDeviceLogsService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.ILogsFileService; -import com.dji.sample.manage.service.ITopologyService; -import com.dji.sample.storage.service.IStorageService; -import com.dji.sdk.cloudapi.log.*; -import com.dji.sdk.cloudapi.log.api.AbstractLogService; -import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.EventsDataRequest; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.sdk.cloudapi.log.*; +import org.dromara.common.sdk.cloudapi.log.api.AbstractLogService; +import org.dromara.common.sdk.cloudapi.storage.StsCredentialsResponse; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.Pagination; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.EventsDataRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.component.mqtt.model.EventsReceiver; + +import org.dromara.sample.manage.dao.IDeviceLogsMapper; +import org.dromara.sample.manage.model.dto.*; +import org.dromara.sample.manage.model.entity.DeviceLogsEntity; +import org.dromara.sample.manage.model.enums.DeviceLogsStatusEnum; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.model.param.DeviceLogsCreateParam; +import org.dromara.sample.manage.model.param.DeviceLogsQueryParam; +import org.dromara.sample.manage.service.IDeviceLogsService; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.ILogsFileService; +import org.dromara.sample.manage.service.ITopologyService; +import org.dromara.sample.storage.service.IStorageService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -76,9 +77,6 @@ public class DeviceLogsServiceImpl extends AbstractLogService implements IDevice @Autowired private ObjectMapper objectMapper; - @Autowired - private IWebSocketMessageService webSocketMessageService; - @Autowired private IDeviceRedisService deviceRedisService; @@ -267,7 +265,7 @@ public class DeviceLogsServiceImpl extends AbstractLogService implements IDevice RedisOpsUtils.del(key); } - webSocketMessageService.sendBatch(device.getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.FILE_UPLOAD_PROGRESS.getCode(), webSocketData); return new TopicEventsResponse().setData(MqttReply.success()); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java index d86e042..b07a0b4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java @@ -1,19 +1,20 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sample.manage.dao.IDevicePayloadMapper; -import com.dji.sample.manage.model.dto.*; -import com.dji.sample.manage.model.entity.DevicePayloadEntity; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.service.ICapacityCameraService; -import com.dji.sample.manage.service.IDeviceDictionaryService; -import com.dji.sample.manage.service.IDevicePayloadService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.device.*; + +import org.dromara.common.sdk.cloudapi.device.*; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; +import org.dromara.sample.manage.dao.IDevicePayloadMapper; +import org.dromara.sample.manage.model.dto.*; +import org.dromara.sample.manage.model.entity.DevicePayloadEntity; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.service.ICapacityCameraService; +import org.dromara.sample.manage.service.IDeviceDictionaryService; +import org.dromara.sample.manage.service.IDevicePayloadService; +import org.dromara.sample.manage.service.IDeviceRedisService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,9 +43,6 @@ public class DevicePayloadServiceImpl implements IDevicePayloadService { @Autowired private ICapacityCameraService capacityCameraService; - @Autowired - private IWebSocketMessageService sendMessageService; - @Autowired private IDeviceRedisService deviceRedisService; @@ -82,7 +80,7 @@ public class DevicePayloadServiceImpl implements IDevicePayloadService { return false; } if (controlMap.get(payloadReceiver.getSn()) != payloadReceiver.getControlSource()) { - sendMessageService.sendBatch(device.getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll( UserTypeEnum.WEB.getVal(), BizCodeEnum.CONTROL_SOURCE_CHANGE.getCode(), DeviceAuthorityDTO.builder() .controlSource(payloadReceiver.getControlSource()) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceRedisServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceRedisServiceImpl.java index 4d01f56..ddbb044 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceRedisServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceRedisServiceImpl.java @@ -1,12 +1,12 @@ -package com.dji.sample.manage.service.impl; - -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.ICapacityCameraService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sdk.cloudapi.firmware.OtaProgress; +package org.dromara.sample.manage.service.impl; + +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.sdk.cloudapi.firmware.OtaProgress; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.ICapacityCameraService; +import org.dromara.sample.manage.service.IDeviceRedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java index b4d0ec3..453f291 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java @@ -1,43 +1,43 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.control.model.enums.DroneAuthorityEnum; -import com.dji.sample.manage.dao.IDeviceMapper; -import com.dji.sample.manage.model.dto.*; -import com.dji.sample.manage.model.entity.DeviceEntity; -import com.dji.sample.manage.model.enums.DeviceFirmwareStatusEnum; -import com.dji.sample.manage.model.enums.PropertySetFieldEnum; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.model.param.DeviceQueryParam; -import com.dji.sample.manage.model.receiver.BasicDeviceProperty; -import com.dji.sample.manage.service.*; -import com.dji.sdk.cloudapi.device.*; -import com.dji.sdk.cloudapi.firmware.*; -import com.dji.sdk.cloudapi.firmware.api.AbstractFirmwareService; -import com.dji.sdk.cloudapi.property.api.AbstractPropertyService; -import com.dji.sdk.cloudapi.tsa.DeviceIconUrl; -import com.dji.sdk.cloudapi.tsa.TopologyDeviceModel; -import com.dji.sdk.common.*; -import com.dji.sdk.config.version.GatewayManager; -import com.dji.sdk.exception.CloudSDKException; -import com.dji.sdk.mqtt.IMqttTopicService; -import com.dji.sdk.mqtt.MqttGatewayPublish; -import com.dji.sdk.mqtt.events.EventsSubscribe; -import com.dji.sdk.mqtt.osd.OsdSubscribe; -import com.dji.sdk.mqtt.property.PropertySetReplyResultEnum; -import com.dji.sdk.mqtt.property.PropertySetSubscribe; -import com.dji.sdk.mqtt.requests.RequestsSubscribe; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.ServicesSubscribe; -import com.dji.sdk.mqtt.services.TopicServicesResponse; -import com.dji.sdk.mqtt.state.StateSubscribe; -import com.dji.sdk.mqtt.status.StatusSubscribe; +import org.dromara.common.sdk.cloudapi.device.*; +import org.dromara.common.sdk.cloudapi.firmware.*; +import org.dromara.common.sdk.cloudapi.firmware.api.AbstractFirmwareService; +import org.dromara.common.sdk.cloudapi.property.api.AbstractPropertyService; +import org.dromara.common.sdk.cloudapi.tsa.DeviceIconUrl; +import org.dromara.common.sdk.cloudapi.tsa.TopologyDeviceModel; +import org.dromara.common.sdk.common.*; +import org.dromara.common.sdk.config.version.GatewayManager; +import org.dromara.common.sdk.exception.CloudSDKException; +import org.dromara.common.sdk.mqtt.IMqttTopicService; +import org.dromara.common.sdk.mqtt.MqttGatewayPublish; +import org.dromara.common.sdk.mqtt.events.EventsSubscribe; +import org.dromara.common.sdk.mqtt.osd.OsdSubscribe; +import org.dromara.common.sdk.mqtt.property.PropertySetReplyResultEnum; +import org.dromara.common.sdk.mqtt.property.PropertySetSubscribe; +import org.dromara.common.sdk.mqtt.requests.RequestsSubscribe; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.ServicesSubscribe; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.common.sdk.mqtt.state.StateSubscribe; +import org.dromara.common.sdk.mqtt.status.StatusSubscribe; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.control.model.enums.DroneAuthorityEnum; +import org.dromara.sample.manage.dao.IDeviceMapper; +import org.dromara.sample.manage.model.dto.*; +import org.dromara.sample.manage.model.entity.DeviceEntity; +import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum; +import org.dromara.sample.manage.model.enums.PropertySetFieldEnum; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.model.param.DeviceQueryParam; +import org.dromara.sample.manage.model.receiver.BasicDeviceProperty; +import org.dromara.sample.manage.service.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; @@ -83,9 +83,6 @@ public class DeviceServiceImpl implements IDeviceService { @Autowired private IDevicePayloadService payloadService; - @Autowired - private IWebSocketMessageService webSocketMessageService; - @Autowired private ObjectMapper objectMapper; @@ -298,22 +295,20 @@ public class DeviceServiceImpl implements IDeviceService { @Override public void pushDeviceOfflineTopo(String workspaceId, String deviceSn) { - webSocketMessageService.sendBatch( - workspaceId, null, com.dji.sdk.websocket.BizCodeEnum.DEVICE_OFFLINE.getCode(), + WebSocketUtils.publishAll( + null,BizCodeEnum.DEVICE_OFFLINE.getCode(), new TopologyDeviceDTO().setSn(deviceSn).setOnlineStatus(false)); } @Override public void pushDeviceOnlineTopo(String workspaceId, String gatewaySn, String deviceSn) { - webSocketMessageService.sendBatch( - workspaceId, null, com.dji.sdk.websocket.BizCodeEnum.DEVICE_ONLINE.getCode(), + WebSocketUtils.publishAll(null,BizCodeEnum.DEVICE_ONLINE.getCode(), getDeviceTopoForPilot(deviceSn).orElseGet(TopologyDeviceDTO::new).setGatewaySn(gatewaySn)); } @Override public void pushOsdDataToPilot(String workspaceId, String sn, DeviceOsdHost data) { - webSocketMessageService.sendBatch( - workspaceId, UserTypeEnum.PILOT.getVal(), com.dji.sdk.websocket.BizCodeEnum.DEVICE_OSD.getCode(), + WebSocketUtils.publishAll( UserTypeEnum.PILOT.getVal(), BizCodeEnum.DEVICE_OSD.getCode(), new DeviceOsdWsResponse() .setSn(sn) .setHost(data)); @@ -321,8 +316,7 @@ public class DeviceServiceImpl implements IDeviceService { @Override public void pushOsdDataToWeb(String workspaceId, BizCodeEnum codeEnum, String sn, Object data) { - webSocketMessageService.sendBatch( - workspaceId, UserTypeEnum.WEB.getVal(), codeEnum.getCode(), TelemetryDTO.builder().sn(sn).host(data).build()); + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), codeEnum.getCode(), TelemetryDTO.builder().sn(sn).host(data).build()); } /** @@ -331,7 +325,7 @@ public class DeviceServiceImpl implements IDeviceService { * @return */ public Boolean saveOrUpdateDevice(DeviceDTO device) { - int count = mapper.selectCount( + Long count = mapper.selectCount( new LambdaQueryWrapper() .eq(DeviceEntity::getDeviceSn, device.getDeviceSn())); return count > 0 ? updateDevice(device) : saveDevice(device) > 0; @@ -638,7 +632,7 @@ public class DeviceServiceImpl implements IDeviceService { gateway.setControlSource(controlSource); deviceRedisService.setDeviceOnline(gateway); - webSocketMessageService.sendBatch(gateway.getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.CONTROL_SOURCE_CHANGE.getCode(), DeviceAuthorityDTO.builder() .controlSource(gateway.getControlSource()) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java index 6256527..0e4ce5d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java @@ -1,9 +1,9 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sample.manage.dao.IFirmwareModelMapper; -import com.dji.sample.manage.model.dto.FirmwareModelDTO; -import com.dji.sample.manage.model.entity.FirmwareModelEntity; -import com.dji.sample.manage.service.IFirmwareModelService; +import org.dromara.sample.manage.dao.IFirmwareModelMapper; +import org.dromara.sample.manage.model.dto.FirmwareModelDTO; +import org.dromara.sample.manage.model.entity.FirmwareModelEntity; +import org.dromara.sample.manage.service.IFirmwareModelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java index 300c88a..0cde748 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LiveStreamServiceImpl.java @@ -1,16 +1,16 @@ -package com.dji.sample.manage.service.impl; - -import com.dji.sample.manage.model.dto.*; -import com.dji.sample.manage.model.param.DeviceQueryParam; -import com.dji.sample.manage.service.*; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.device.VideoId; -import com.dji.sdk.cloudapi.livestream.*; -import com.dji.sdk.cloudapi.livestream.api.AbstractLivestreamService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.TopicServicesResponse; +package org.dromara.sample.manage.service.impl; + +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.device.VideoId; +import org.dromara.common.sdk.cloudapi.livestream.*; +import org.dromara.common.sdk.cloudapi.livestream.api.AbstractLivestreamService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.sample.manage.model.dto.*; +import org.dromara.sample.manage.model.param.DeviceQueryParam; +import org.dromara.sample.manage.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -230,4 +230,4 @@ public class LiveStreamServiceImpl implements ILiveStreamService { } return url; } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java index 22673f3..46ac64a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java @@ -1,14 +1,14 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.dji.sample.manage.dao.ILogsFileIndexMapper; -import com.dji.sample.manage.model.dto.LogsFileDTO; -import com.dji.sample.manage.model.dto.LogsFileUploadDTO; -import com.dji.sample.manage.model.entity.LogsFileIndexEntity; -import com.dji.sample.manage.service.ILogsFileIndexService; -import com.dji.sdk.cloudapi.log.LogFileIndex; -import com.dji.sdk.cloudapi.log.LogModuleEnum; +import org.dromara.common.sdk.cloudapi.log.LogFileIndex; +import org.dromara.common.sdk.cloudapi.log.LogModuleEnum; +import org.dromara.sample.manage.dao.ILogsFileIndexMapper; +import org.dromara.sample.manage.model.dto.LogsFileDTO; +import org.dromara.sample.manage.model.dto.LogsFileUploadDTO; +import org.dromara.sample.manage.model.entity.LogsFileIndexEntity; +import org.dromara.sample.manage.service.ILogsFileIndexService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java index 4a839b9..4e250f7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java @@ -1,19 +1,20 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.manage.dao.ILogsFileMapper; -import com.dji.sample.manage.model.dto.LogsFileDTO; -import com.dji.sample.manage.model.dto.LogsFileUploadDTO; -import com.dji.sample.manage.model.entity.LogsFileEntity; -import com.dji.sample.manage.service.ILogsFileIndexService; -import com.dji.sample.manage.service.ILogsFileService; -import com.dji.sdk.cloudapi.log.FileUploadProgressFile; -import com.dji.sdk.cloudapi.log.FileUploadStartFile; -import com.dji.sdk.cloudapi.log.FileUploadStatusEnum; -import com.dji.sdk.cloudapi.log.LogFileIndex; + +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.sdk.cloudapi.log.FileUploadProgressFile; +import org.dromara.common.sdk.cloudapi.log.FileUploadStartFile; +import org.dromara.common.sdk.cloudapi.log.FileUploadStatusEnum; +import org.dromara.common.sdk.cloudapi.log.LogFileIndex; +import org.dromara.sample.manage.dao.ILogsFileMapper; +import org.dromara.sample.manage.model.dto.LogsFileDTO; +import org.dromara.sample.manage.model.dto.LogsFileUploadDTO; +import org.dromara.sample.manage.model.entity.LogsFileEntity; +import org.dromara.sample.manage.service.ILogsFileIndexService; +import org.dromara.sample.manage.service.ILogsFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,12 +42,6 @@ public class LogsFileServiceImpl implements ILogsFileService { @Autowired private ILogsFileIndexService logsFileIndexService; - @Autowired - private OssServiceContext ossService; - - @Autowired - private OssServiceContext ossServiceContext; - @Override public List getLogsFileInfoByLogsId(String logsId) { return mapper.selectList( @@ -110,9 +105,10 @@ public class LogsFileServiceImpl implements ILogsFileService { } mapper.delete(new LambdaUpdateWrapper().eq(LogsFileEntity::getLogsId, logsId)); List fileIds = new ArrayList<>(); + OssClient storage = OssFactory.instance("logs"); logsFiles.forEach(file -> { if (file.getStatus()) { - ossService.deleteObject(OssConfiguration.bucket, file.getObjectKey()); + storage.delete(file.getObjectKey()); } fileIds.add(file.getFileId()); }); @@ -144,7 +140,8 @@ public class LogsFileServiceImpl implements ILogsFileService { if (Objects.isNull(logsFile)) { return null; } - return ossService.getObjectUrl(OssConfiguration.bucket, logsFile.getObjectKey()); + OssClient storage = OssFactory.instance("logs"); + return storage.getPrivateUrlURL(logsFile.getObjectKey(),3600); } private LogsFileEntity receiver2Entity(FileUploadProgressFile receiver) { @@ -158,4 +155,4 @@ public class LogsFileServiceImpl implements ILogsFileService { && FileUploadStatusEnum.OK == receiver.getProgress().getStatus()) .name(receiver.getKey().substring(receiver.getKey().lastIndexOf("/") + 1)).build(); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/RequestConfigContext.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/RequestConfigContext.java index 85c448e..3d35d69 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/RequestConfigContext.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/RequestConfigContext.java @@ -1,15 +1,15 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.common.util.SpringBeanUtilsTest; -import com.dji.sample.manage.model.dto.ProductConfigDTO; -import com.dji.sample.manage.model.enums.CustomizeConfigScopeEnum; -import com.dji.sdk.cloudapi.config.ProductConfigResponse; -import com.dji.sdk.cloudapi.config.RequestsConfigRequest; -import com.dji.sdk.cloudapi.config.api.AbstractConfigService; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.requests.TopicRequestsRequest; -import com.dji.sdk.mqtt.requests.TopicRequestsResponse; +import org.dromara.common.sdk.cloudapi.config.ProductConfigResponse; +import org.dromara.common.sdk.cloudapi.config.RequestsConfigRequest; +import org.dromara.common.sdk.cloudapi.config.api.AbstractConfigService; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsRequest; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsResponse; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.common.util.SpringBeanUtilsTest; +import org.dromara.sample.manage.model.dto.ProductConfigDTO; +import org.dromara.sample.manage.model.enums.CustomizeConfigScopeEnum; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java index 66f4a8c..38f62fa 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java @@ -1,26 +1,25 @@ -package com.dji.sample.manage.service.impl; - -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.DevicePayloadReceiver; -import com.dji.sample.manage.model.enums.DeviceFirmwareStatusEnum; -import com.dji.sample.manage.model.param.DeviceQueryParam; -import com.dji.sample.manage.service.IDeviceDictionaryService; -import com.dji.sample.manage.service.IDevicePayloadService; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sdk.cloudapi.device.*; -import com.dji.sdk.cloudapi.device.api.AbstractDeviceService; -import com.dji.sdk.cloudapi.tsa.DeviceIconUrl; -import com.dji.sdk.cloudapi.tsa.IconUrlEnum; -import com.dji.sdk.config.version.GatewayManager; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.osd.TopicOsdRequest; -import com.dji.sdk.mqtt.state.TopicStateRequest; -import com.dji.sdk.mqtt.status.TopicStatusRequest; -import com.dji.sdk.mqtt.status.TopicStatusResponse; +package org.dromara.sample.manage.service.impl; + +import org.dromara.common.sdk.cloudapi.device.*; +import org.dromara.common.sdk.cloudapi.device.api.AbstractDeviceService; +import org.dromara.common.sdk.cloudapi.tsa.DeviceIconUrl; +import org.dromara.common.sdk.cloudapi.tsa.IconUrlEnum; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.config.version.GatewayManager; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.osd.TopicOsdRequest; +import org.dromara.common.sdk.mqtt.state.TopicStateRequest; +import org.dromara.common.sdk.mqtt.status.TopicStatusRequest; +import org.dromara.common.sdk.mqtt.status.TopicStatusResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.DevicePayloadReceiver; +import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum; +import org.dromara.sample.manage.model.param.DeviceQueryParam; +import org.dromara.sample.manage.service.IDeviceDictionaryService; +import org.dromara.sample.manage.service.IDevicePayloadService; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; @@ -51,9 +50,6 @@ public class SDKDeviceService extends AbstractDeviceService { @Autowired private IDeviceDictionaryService dictionaryService; - @Autowired - private IWebSocketMessageService webSocketMessageService; - @Autowired private IDevicePayloadService devicePayloadService; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLivestreamService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLivestreamService.java index d19e61d..c5db382 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLivestreamService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLivestreamService.java @@ -1,11 +1,11 @@ -package com.dji.sample.manage.service.impl; - -import com.dji.sample.manage.model.receiver.CapacityDeviceReceiver; -import com.dji.sample.manage.service.ICapacityCameraService; -import com.dji.sdk.cloudapi.livestream.DockLivestreamAbilityUpdate; -import com.dji.sdk.cloudapi.livestream.RcLivestreamAbilityUpdate; -import com.dji.sdk.cloudapi.livestream.api.AbstractLivestreamService; -import com.dji.sdk.mqtt.state.TopicStateRequest; +package org.dromara.sample.manage.service.impl; + +import org.dromara.common.sdk.cloudapi.livestream.DockLivestreamAbilityUpdate; +import org.dromara.common.sdk.cloudapi.livestream.RcLivestreamAbilityUpdate; +import org.dromara.common.sdk.cloudapi.livestream.api.AbstractLivestreamService; +import org.dromara.common.sdk.mqtt.state.TopicStateRequest; +import org.dromara.sample.manage.model.receiver.CapacityDeviceReceiver; +import org.dromara.sample.manage.service.ICapacityCameraService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLogService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLogService.java index 7edd96e..897735f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLogService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKLogService.java @@ -1,6 +1,6 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sdk.cloudapi.log.api.AbstractLogService; +import org.dromara.common.sdk.cloudapi.log.api.AbstractLogService; import org.springframework.stereotype.Service; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java index 5d019f4..940804d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java @@ -1,21 +1,21 @@ -package com.dji.sample.manage.service.impl; - -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.DeviceDictionaryDTO; -import com.dji.sample.manage.model.dto.WorkspaceDTO; -import com.dji.sample.manage.service.IDeviceDictionaryService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sample.manage.service.IWorkspaceService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.device.DeviceEnum; -import com.dji.sdk.cloudapi.organization.*; -import com.dji.sdk.cloudapi.organization.api.AbstractOrganizationService; -import com.dji.sdk.cloudapi.tsa.DeviceIconUrl; -import com.dji.sdk.cloudapi.tsa.IconUrlEnum; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.requests.TopicRequestsRequest; -import com.dji.sdk.mqtt.requests.TopicRequestsResponse; +package org.dromara.sample.manage.service.impl; + +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceEnum; +import org.dromara.common.sdk.cloudapi.organization.*; +import org.dromara.common.sdk.cloudapi.organization.api.AbstractOrganizationService; +import org.dromara.common.sdk.cloudapi.tsa.DeviceIconUrl; +import org.dromara.common.sdk.cloudapi.tsa.IconUrlEnum; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsRequest; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsResponse; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO; +import org.dromara.sample.manage.model.dto.WorkspaceDTO; +import org.dromara.sample.manage.service.IDeviceDictionaryService; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.manage.service.IWorkspaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKPropertySetService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKPropertySetService.java index 73ce404..728a5b4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKPropertySetService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKPropertySetService.java @@ -1,6 +1,6 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sdk.cloudapi.property.api.AbstractPropertyService; +import org.dromara.common.sdk.cloudapi.property.api.AbstractPropertyService; import org.springframework.stereotype.Service; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/TopologyServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/TopologyServiceImpl.java index 2a37485..857e2b4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/TopologyServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/TopologyServiceImpl.java @@ -1,13 +1,13 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.TopologyDeviceDTO; -import com.dji.sample.manage.model.param.DeviceQueryParam; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sample.manage.service.ITopologyService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.tsa.DeviceTopology; -import com.dji.sdk.cloudapi.tsa.TopologyList; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.tsa.DeviceTopology; +import org.dromara.common.sdk.cloudapi.tsa.TopologyList; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.TopologyDeviceDTO; +import org.dromara.sample.manage.model.param.DeviceQueryParam; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.manage.service.ITopologyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/UserServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/UserServiceImpl.java deleted file mode 100644 index 76a14e6..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.dji.sample.manage.service.impl; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.exceptions.TokenExpiredException; -import com.auth0.jwt.interfaces.DecodedJWT; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.common.util.JwtUtil; -import com.dji.sample.component.mqtt.config.MqttPropertyConfiguration; -import com.dji.sample.manage.dao.IUserMapper; -import com.dji.sample.manage.model.dto.UserDTO; -import com.dji.sample.manage.model.dto.UserListDTO; -import com.dji.sample.manage.model.dto.WorkspaceDTO; -import com.dji.sample.manage.model.entity.UserEntity; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.service.IUserService; -import com.dji.sample.manage.service.IWorkspaceService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; - -@Service -@Transactional -public class UserServiceImpl implements IUserService { - - @Autowired - private IUserMapper mapper; - - @Autowired - private MqttPropertyConfiguration mqttPropertyConfiguration; - - @Autowired - private IWorkspaceService workspaceService; - - @Override - public HttpResultResponse getUserByUsername(String username, String workspaceId) { - - UserEntity userEntity = this.getUserByUsername(username); - if (userEntity == null) { - return new HttpResultResponse() - .setCode(HttpStatus.UNAUTHORIZED.value()) - .setMessage("无效的用户名"); - } - - UserDTO user = this.entityConvertToDTO(userEntity); - user.setWorkspaceId(workspaceId); - - return HttpResultResponse.success(user); - } - - @Override - public HttpResultResponse userLogin(String username, String password, Integer flag) { - // check user - UserEntity userEntity = this.getUserByUsername(username); - if (userEntity == null) { - return new HttpResultResponse() - .setCode(HttpStatus.UNAUTHORIZED.value()) - .setMessage("无效的用户名"); - } - if (flag.intValue() != userEntity.getUserType().intValue()) { - return HttpResultResponse.error("帐户类型不匹配。"); - } - if (!password.equals(userEntity.getPassword())) { - return new HttpResultResponse() - .setCode(HttpStatus.UNAUTHORIZED.value()) - .setMessage("无效的口令"); - } - - Optional workspaceOpt = workspaceService.getWorkspaceByWorkspaceId(userEntity.getWorkspaceId()); - if (workspaceOpt.isEmpty()) { - return new HttpResultResponse() - .setCode(HttpStatus.UNAUTHORIZED.value()) - .setMessage("无效的工作区id"); - } - - CustomClaim customClaim = new CustomClaim(userEntity.getUserId(), - userEntity.getUsername(), userEntity.getUserType(), - workspaceOpt.get().getWorkspaceId()); - - // create token - String token = JwtUtil.createToken(customClaim.convertToMap()); - - UserDTO userDTO = entityConvertToDTO(userEntity); - userDTO.setMqttAddr(MqttPropertyConfiguration.getBasicMqttAddress()); - userDTO.setAccessToken(token); - userDTO.setWorkspaceId(workspaceOpt.get().getWorkspaceId()); - return HttpResultResponse.success(userDTO); - } - - @Override - public Optional refreshToken(String token) { - if (!StringUtils.hasText(token)) { - return Optional.empty(); - } - CustomClaim customClaim; - try { - DecodedJWT jwt = JwtUtil.verifyToken(token); - customClaim = new CustomClaim(jwt.getClaims()); - } catch (TokenExpiredException e) { - customClaim = new CustomClaim(JWT.decode(token).getClaims()); - } catch (Exception e) { - e.printStackTrace(); - return Optional.empty(); - } - String refreshToken = JwtUtil.createToken(customClaim.convertToMap()); - - UserDTO user = entityConvertToDTO(this.getUserByUsername(customClaim.getUsername())); - if (Objects.isNull(user)) { - return Optional.empty(); - } - user.setWorkspaceId(customClaim.getWorkspaceId()); - user.setAccessToken(refreshToken); - return Optional.of(user); - } - - @Override - public PaginationData getUsersByWorkspaceId(long page, long pageSize, String workspaceId) { - Page userEntityPage = mapper.selectPage( - new Page<>(page, pageSize), - new LambdaQueryWrapper().eq(UserEntity::getWorkspaceId, workspaceId)); - - List usersList = userEntityPage.getRecords() - .stream() - .map(this::entity2UserListDTO) - .collect(Collectors.toList()); - return new PaginationData<>(usersList, new Pagination(userEntityPage.getCurrent(), userEntityPage.getSize(), userEntityPage.getTotal())); - } - - @Override - public Boolean updateUser(String workspaceId, String userId, UserListDTO user) { - UserEntity userEntity = mapper.selectOne( - new LambdaQueryWrapper() - .eq(UserEntity::getUserId, userId) - .eq(UserEntity::getWorkspaceId, workspaceId)); - if (userEntity == null) { - return false; - } - userEntity.setMqttUsername(user.getMqttUsername()); - userEntity.setMqttPassword(user.getMqttPassword()); - userEntity.setUpdateTime(System.currentTimeMillis()); - int id = mapper.update(userEntity, new LambdaUpdateWrapper() - .eq(UserEntity::getUserId, userId) - .eq(UserEntity::getWorkspaceId, workspaceId)); - - return id > 0; - } - - /** - * Convert database entity objects into user data transfer object. - * @param entity - * @return - */ - private UserListDTO entity2UserListDTO(UserEntity entity) { - UserListDTO.UserListDTOBuilder builder = UserListDTO.builder(); - if (entity != null) { - builder.userId(entity.getUserId()) - .username(entity.getUsername()) - .mqttUsername(entity.getMqttUsername()) - .mqttPassword(entity.getMqttPassword()) - .userType(UserTypeEnum.find(entity.getUserType()).getDesc()) - .createTime(LocalDateTime.ofInstant( - Instant.ofEpochMilli(entity.getCreateTime()), ZoneId.systemDefault())); - Optional workspaceOpt = workspaceService.getWorkspaceByWorkspaceId(entity.getWorkspaceId()); - workspaceOpt.ifPresent(workspace -> builder.workspaceName(workspace.getWorkspaceName())); - } - - return builder.build(); - } - - /** - * Query a user by username. - * @param username - * @return - */ - private UserEntity getUserByUsername(String username) { - return mapper.selectOne(new QueryWrapper() - .eq("username", username)); - } - - /** - * Convert database entity objects into user data transfer object. - * @param entity - * @return - */ - private UserDTO entityConvertToDTO(UserEntity entity) { - if (entity == null) { - return null; - } - return UserDTO.builder() - .userId(entity.getUserId()) - .username(entity.getUsername()) - .userType(entity.getUserType()) - .mqttUsername(entity.getMqttUsername()) - .mqttPassword(entity.getMqttPassword()) - .mqttAddr(MqttPropertyConfiguration.getBasicMqttAddress()) - .build(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java index ff492b2..253c771 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java @@ -1,10 +1,10 @@ -package com.dji.sample.manage.service.impl; +package org.dromara.sample.manage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.dji.sample.manage.dao.IWorkspaceMapper; -import com.dji.sample.manage.model.dto.WorkspaceDTO; -import com.dji.sample.manage.model.entity.WorkspaceEntity; -import com.dji.sample.manage.service.IWorkspaceService; +import org.dromara.sample.manage.dao.IWorkspaceMapper; +import org.dromara.sample.manage.model.dto.WorkspaceDTO; +import org.dromara.sample.manage.model.entity.WorkspaceEntity; +import org.dromara.sample.manage.service.IWorkspaceService; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +30,14 @@ public class WorkspaceServiceImpl implements IWorkspaceService { .eq(WorkspaceEntity::getWorkspaceId, workspaceId)))); } + @Override + public Optional getWorkspaceByTenantId(String tenantId) { + return Optional.ofNullable(entityConvertToDto( + mapper.selectOne( + new LambdaQueryWrapper() + .eq(WorkspaceEntity::getTenantId, tenantId)))); + } + @Override public Optional getWorkspaceNameByBindCode(String bindCode) { return Optional.ofNullable(entityConvertToDto( diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/DeviceDataController.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/DeviceDataController.java index d1ed19d..9b6c27a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/DeviceDataController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/DeviceDataController.java @@ -1,8 +1,10 @@ -package com.dji.sample.map.controller; +package org.dromara.sample.map.controller; -import com.dji.sample.map.model.dto.DeviceDataStatusDTO; -import com.dji.sample.map.service.IDeviceDataService; -import com.dji.sdk.common.HttpResultResponse; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.map.model.dto.DeviceDataStatusDTO; +import org.dromara.sample.map.service.IDeviceDataService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -24,8 +26,9 @@ public class DeviceDataController { @Autowired private IDeviceDataService deviceDataService; - @GetMapping("/{workspace_id}/device-status") - public HttpResultResponse> getDeviceFlightAreaStatus(@PathVariable(name = "workspace_id") String workspaceId) { - return HttpResultResponse.success(deviceDataService.getDevicesDataStatus(workspaceId)); + @GetMapping("/device-status") + public HttpResultResponse> getDeviceFlightAreaStatus() { + LoginUser loginUser = LoginHelper.getLoginUser(); + return HttpResultResponse.success(deviceDataService.getDevicesDataStatus(loginUser.getTenantId())); } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/FlightAreaController.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/FlightAreaController.java index 2bda1a7..3bc5fd2 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/FlightAreaController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/FlightAreaController.java @@ -1,20 +1,20 @@ -package com.dji.sample.map.controller; +package org.dromara.sample.map.controller; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.map.model.dto.FlightAreaDTO; -import com.dji.sample.map.model.param.PostFlightAreaParam; -import com.dji.sample.map.model.param.PutFlightAreaParam; -import com.dji.sample.map.model.param.SyncFlightAreaParam; -import com.dji.sample.map.service.IFlightAreaService; -import com.dji.sdk.common.HttpResultResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.map.model.dto.FlightAreaDTO; +import org.dromara.sample.map.model.param.PostFlightAreaParam; +import org.dromara.sample.map.model.param.PutFlightAreaParam; +import org.dromara.sample.map.model.param.SyncFlightAreaParam; +import org.dromara.sample.map.service.IFlightAreaService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.util.List; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -29,37 +29,37 @@ public class FlightAreaController { private IFlightAreaService flightAreaService; @GetMapping("/{workspace_id}/flight-areas") - public HttpResultResponse> getFlightAreas(@PathVariable(name = "workspace_id") String workspaceId) { - return HttpResultResponse.success(flightAreaService.getFlightAreaList(workspaceId)); + public HttpResultResponse> getFlightAreas() { + LoginUser loginUser = LoginHelper.getLoginUser(); + return HttpResultResponse.success(flightAreaService.getFlightAreaList(loginUser.getTenantId())); } - @PostMapping("/{workspace_id}/flight-area") - public HttpResultResponse createFlightArea(@PathVariable(name = "workspace_id") String workspaceId, - @Valid @RequestBody PostFlightAreaParam param, HttpServletRequest req) { - CustomClaim claims = (CustomClaim) req.getAttribute(TOKEN_CLAIM); - flightAreaService.createFlightArea(workspaceId, claims.getUsername(), param); + @PostMapping("/flight-area") + public HttpResultResponse createFlightArea(@Valid @RequestBody PostFlightAreaParam param, HttpServletRequest req) { + LoginUser loginUser = LoginHelper.getLoginUser(); + flightAreaService.createFlightArea(loginUser.getTenantId(), loginUser.getUsername(), param); return HttpResultResponse.success(); } - @DeleteMapping("/{workspace_id}/flight-area/{area_id}") - public HttpResultResponse deleteFlightArea(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "area_id") String areaId) { - flightAreaService.deleteFlightArea(workspaceId, areaId); + @DeleteMapping("/flight-area/{area_id}") + public HttpResultResponse deleteFlightArea(@PathVariable(name = "area_id") String areaId) { + LoginUser loginUser = LoginHelper.getLoginUser(); + flightAreaService.deleteFlightArea(loginUser.getTenantId(), areaId); return HttpResultResponse.success(); } - @PutMapping("/{workspace_id}/flight-area/{area_id}") - public HttpResultResponse updateFlightArea(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "area_id") String areaId, + @PutMapping("/flight-area/{area_id}") + public HttpResultResponse updateFlightArea(@PathVariable(name = "area_id") String areaId, @RequestBody PutFlightAreaParam param) { - flightAreaService.updateFlightArea(workspaceId, areaId, param); + LoginUser loginUser = LoginHelper.getLoginUser(); + flightAreaService.updateFlightArea(loginUser.getTenantId(), areaId, param); return HttpResultResponse.success(); } @PostMapping("/{workspace_id}/flight-area/sync") - public HttpResultResponse syncFlightArea(@PathVariable(name = "workspace_id") String workspaceId, - @RequestBody @Valid SyncFlightAreaParam param) { - flightAreaService.syncFlightArea(workspaceId, param.getDeviceSns()); + public HttpResultResponse syncFlightArea(@RequestBody @Valid SyncFlightAreaParam param) { + LoginUser loginUser = LoginHelper.getLoginUser(); + flightAreaService.syncFlightArea(loginUser.getTenantId(), param.getDeviceSns()); return HttpResultResponse.success(); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/WorkspaceElementController.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/WorkspaceElementController.java index 4afc12d..936f207 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/WorkspaceElementController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/controller/WorkspaceElementController.java @@ -1,25 +1,25 @@ -package com.dji.sample.map.controller; - -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.map.service.IWorkspaceElementService; -import com.dji.sdk.cloudapi.map.CreateMapElementRequest; -import com.dji.sdk.cloudapi.map.CreateMapElementResponse; -import com.dji.sdk.cloudapi.map.GetMapElementsResponse; -import com.dji.sdk.cloudapi.map.UpdateMapElementRequest; -import com.dji.sdk.cloudapi.map.api.IHttpMapService; -import com.dji.sdk.common.HttpResultResponse; +package org.dromara.sample.map.controller; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.map.CreateMapElementRequest; +import org.dromara.common.sdk.cloudapi.map.CreateMapElementResponse; +import org.dromara.common.sdk.cloudapi.map.GetMapElementsResponse; +import org.dromara.common.sdk.cloudapi.map.UpdateMapElementRequest; +import org.dromara.common.sdk.cloudapi.map.api.IHttpMapService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.map.service.IWorkspaceElementService; + +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.util.List; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -32,38 +32,40 @@ public class WorkspaceElementController implements IHttpMapService { @Autowired private IWorkspaceElementService elementService; - @Autowired - private IWebSocketMessageService sendMessageService; /** + * 根据组id删除此组中的所有元素信息。 * Delete all the element information in this group based on the group id. - * @param workspaceId * @param groupId * @return */ - @DeleteMapping("${url.map.prefix}${url.map.version}/workspaces/{workspace_id}/element-groups/{group_id}/elements") - public HttpResultResponse deleteAllElementByGroupId(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "group_id") String groupId) { - - return elementService.deleteAllElementByGroupId(workspaceId, groupId); + @DeleteMapping("${url.map.prefix}${url.map.version}/workspaces/element-groups/{group_id}/elements") + public HttpResultResponse deleteAllElementByGroupId(@PathVariable(name = "group_id") String groupId) { + LoginUser loginUser = LoginHelper.getLoginUser(); + return elementService.deleteAllElementByGroupId(loginUser.getTenantId(), groupId); } /** + * 在第一个连接中，飞行员将发送此http请求以获取组元素列表。 + * 如果导频从WebSocket接收到组刷新指令， + * 它需要相同的接口来请求组元素列表。 * In the first connection, pilot will send out this http request to obtain the group element list. * Also, if pilot receives a group refresh instruction from WebSocket, * it needs the same interface to request the group element list. - * @param workspaceId * @param groupId * @param isDistributed * @return */ @Override - public HttpResultResponse> getMapElements(String workspaceId, String groupId, Boolean isDistributed, HttpServletRequest req, HttpServletResponse rsp) { - List groupsList = elementService.getAllGroupsByWorkspaceId(workspaceId, groupId, isDistributed); + public HttpResultResponse> getMapElements( String groupId, Boolean isDistributed, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + List groupsList = elementService.getAllGroupsByWorkspaceId(loginUser.getTenantId(), groupId, isDistributed); return HttpResultResponse.>success(groupsList); } /** + * 当用户在PILOT/Web侧绘制点、线或多边形时。 + * 将元素信息保存到数据库。 * When user draws a point, line or polygon on the PILOT/Web side. * Save the element information to the database. * @param workspaceId @@ -73,10 +75,10 @@ public class WorkspaceElementController implements IHttpMapService { */ @Override public HttpResultResponse createMapElement(String workspaceId, String groupId, - @Valid CreateMapElementRequest elementCreate, HttpServletRequest req, HttpServletResponse rsp) { - CustomClaim claims = (CustomClaim) req.getAttribute(TOKEN_CLAIM); + @Valid CreateMapElementRequest elementCreate, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser user = LoginHelper.getLoginUser(); // Set the creator of the element - elementCreate.getResource().setUsername(claims.getUsername()); + elementCreate.getResource().setUsername(user.getUsername()); HttpResultResponse response = elementService.saveElement(workspaceId, groupId, elementCreate, true); if (response.getCode() != HttpResultResponse.CODE_SUCCESS) { @@ -87,6 +89,8 @@ public class WorkspaceElementController implements IHttpMapService { } /** + * 当用户在PILOT/Web侧编辑点、线或多边形时。 + * 将元素信息更新到数据库。 * When user edits a point, line or polygon on the PILOT/Web side. * Update the element information to the database. * @param workspaceId @@ -96,9 +100,10 @@ public class WorkspaceElementController implements IHttpMapService { */ @Override public HttpResultResponse updateMapElement(String workspaceId, String elementId, @Valid UpdateMapElementRequest elementUpdate, HttpServletRequest req, HttpServletResponse rsp) { - CustomClaim claims = (CustomClaim) req.getAttribute(TOKEN_CLAIM); + LoginUser user = LoginHelper.getLoginUser(); + // Set the creator of the element - HttpResultResponse response = elementService.updateElement(workspaceId, elementId, elementUpdate, claims.getUsername(), true); + HttpResultResponse response = elementService.updateElement(workspaceId, elementId, elementUpdate, user.getUsername(), true); if (response.getCode() != HttpResultResponse.CODE_SUCCESS) { return response; } @@ -107,6 +112,8 @@ public class WorkspaceElementController implements IHttpMapService { } /** + * 当用户删除PILOT/Web侧的点、线或多边形时， + * 删除数据库中的元素信息。 * When user delete a point, line or polygon on the PILOT/Web side, * Delete the element information in the database. * @param workspaceId @@ -118,4 +125,4 @@ public class WorkspaceElementController implements IHttpMapService { return elementService.deleteElement(workspaceId, elementId, true); } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java index 6d39cd9..d4e5633 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.dao; +package org.dromara.sample.map.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.map.model.entity.DeviceFlightAreaEntity; +import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java index 5073ce5..1e6b4ac 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.dao; +package org.dromara.sample.map.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.map.model.entity.ElementCoordinateEntity; +import org.dromara.sample.map.model.entity.ElementCoordinateEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java index 7091605..4ba80f6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.dao; +package org.dromara.sample.map.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.map.model.entity.FlightAreaFileEntity; +import org.dromara.sample.map.model.entity.FlightAreaFileEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java index 4085562..d425e05 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.dao; +package org.dromara.sample.map.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.map.model.entity.FlightAreaPropertyEntity; +import org.dromara.sample.map.model.entity.FlightAreaPropertyEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java index 4b572c7..0395cec 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.dao; +package org.dromara.sample.map.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.map.model.entity.GroupElementEntity; +import org.dromara.sample.map.model.entity.GroupElementEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java index 747f7fd..a33becc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.dao; +package org.dromara.sample.map.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.map.model.entity.GroupEntity; +import org.dromara.sample.map.model.entity.GroupEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceDataStatusDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceDataStatusDTO.java index 7604092..24339b9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceDataStatusDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceDataStatusDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceFlightAreaDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceFlightAreaDTO.java index 16e1ca3..c9be4b3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceFlightAreaDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/DeviceFlightAreaDTO.java @@ -1,11 +1,11 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; -import com.dji.sdk.cloudapi.flightarea.FlightAreaSyncReasonEnum; -import com.dji.sdk.cloudapi.flightarea.FlightAreaSyncStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.flightarea.FlightAreaSyncReasonEnum; +import org.dromara.common.sdk.cloudapi.flightarea.FlightAreaSyncStatusEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaContent.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaContent.java index 6c93e5f..6a075e0 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaContent.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaContent.java @@ -1,14 +1,14 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; -import com.dji.sdk.cloudapi.map.ElementGeometryType; -import com.dji.sdk.cloudapi.map.ElementProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.map.ElementGeometryType; +import org.dromara.common.sdk.cloudapi.map.ElementProperty; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaDTO.java index d5d7219..cae7c19 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaDTO.java @@ -1,10 +1,10 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; -import com.dji.sdk.cloudapi.flightarea.GeofenceTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.flightarea.GeofenceTypeEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaFileDTO.java index 4138bbd..b8c3d10 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaFileDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaNotifyDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaNotifyDTO.java index bf3023b..12035f9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaNotifyDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaNotifyDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyDTO.java index 1edcc21..25b4bbc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyDTO.java @@ -1,11 +1,11 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; -import com.dji.sdk.cloudapi.flightarea.GeofenceTypeEnum; -import com.dji.sdk.cloudapi.flightarea.GeometrySubTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.flightarea.GeofenceTypeEnum; +import org.dromara.common.sdk.cloudapi.flightarea.GeometrySubTypeEnum; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyUpdate.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyUpdate.java index 8a30d2e..bfbf377 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyUpdate.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaPropertyUpdate.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaWs.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaWs.java index 99d7cd7..d46add3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaWs.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/FlightAreaWs.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; -import com.dji.sample.map.model.enums.FlightAreaOpertaionEnum; -import com.dji.sdk.cloudapi.flightarea.GeofenceTypeEnum; +import org.dromara.common.sdk.cloudapi.flightarea.GeofenceTypeEnum; +import org.dromara.sample.map.model.enums.FlightAreaOpertaionEnum; import lombok.*; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/GroupElementDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/GroupElementDTO.java index 70ff1e4..a206da7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/GroupElementDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/dto/GroupElementDTO.java @@ -1,12 +1,12 @@ -package com.dji.sample.map.model.dto; +package org.dromara.sample.map.model.dto; -import com.dji.sdk.cloudapi.map.ElementResource; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.map.ElementResource; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/DeviceFlightAreaEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/DeviceFlightAreaEntity.java index 9d239c0..428923b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/DeviceFlightAreaEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/DeviceFlightAreaEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.entity; +package org.dromara.sample.map.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/ElementCoordinateEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/ElementCoordinateEntity.java index 26d2732..6d64992 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/ElementCoordinateEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/ElementCoordinateEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.entity; +package org.dromara.sample.map.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaFileEntity.java index 0f8c33a..1efc6ff 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaFileEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.entity; +package org.dromara.sample.map.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaPropertyEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaPropertyEntity.java index 227d403..0e621fe 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaPropertyEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/FlightAreaPropertyEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.entity; +package org.dromara.sample.map.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupElementEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupElementEntity.java index 7c6748a..0efea21 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupElementEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupElementEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.entity; +package org.dromara.sample.map.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupEntity.java index c639a9b..fcf252c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/entity/GroupEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.entity; +package org.dromara.sample.map.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaGeometryTypeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaGeometryTypeEnum.java index 4cfda0d..6139bd9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaGeometryTypeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaGeometryTypeEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.enums; +package org.dromara.sample.map.model.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -11,7 +11,7 @@ import java.util.Arrays; * @date 2023/11/24 */ public enum FlightAreaGeometryTypeEnum { - + CIRCLE("Circle"), POLYGON("Polygon"), diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaOpertaionEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaOpertaionEnum.java index 0642182..b66b28d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaOpertaionEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/enums/FlightAreaOpertaionEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.enums; +package org.dromara.sample.map.model.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PostFlightAreaParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PostFlightAreaParam.java index dbeae02..ab04e6f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PostFlightAreaParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PostFlightAreaParam.java @@ -1,11 +1,11 @@ -package com.dji.sample.map.model.param; +package org.dromara.sample.map.model.param; -import com.dji.sample.map.model.dto.FlightAreaContent; -import com.dji.sdk.cloudapi.flightarea.GeofenceTypeEnum; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.sdk.cloudapi.flightarea.GeofenceTypeEnum; +import org.dromara.sample.map.model.dto.FlightAreaContent; import lombok.Data; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PutFlightAreaParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PutFlightAreaParam.java index a1ab489..e933d8f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PutFlightAreaParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/PutFlightAreaParam.java @@ -1,6 +1,6 @@ -package com.dji.sample.map.model.param; +package org.dromara.sample.map.model.param; -import com.dji.sample.map.model.dto.FlightAreaContent; +import org.dromara.sample.map.model.dto.FlightAreaContent; import lombok.Data; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/SyncFlightAreaParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/SyncFlightAreaParam.java index c21b8fd..d814ecd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/SyncFlightAreaParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/model/param/SyncFlightAreaParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.map.model.param; +package org.dromara.sample.map.model.param; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceDataService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceDataService.java index c729ec9..c9ca596 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceDataService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceDataService.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sample.map.model.dto.DeviceDataStatusDTO; -import com.dji.sample.map.model.dto.DeviceFlightAreaDTO; +import org.dromara.sample.map.model.dto.DeviceDataStatusDTO; +import org.dromara.sample.map.model.dto.DeviceFlightAreaDTO; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceFlightAreaService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceFlightAreaService.java index 42cb625..31ece9d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceFlightAreaService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IDeviceFlightAreaService.java @@ -1,6 +1,6 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sample.map.model.dto.DeviceFlightAreaDTO; +import org.dromara.sample.map.model.dto.DeviceFlightAreaDTO; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IElementCoordinateService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IElementCoordinateService.java index 5764729..1dd2e01 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IElementCoordinateService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IElementCoordinateService.java @@ -1,6 +1,7 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sdk.cloudapi.map.ElementCoordinate; + +import org.dromara.common.sdk.cloudapi.map.ElementCoordinate; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaFileService.java index eb32a10..0c66b07 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaFileService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaFileService.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sample.map.model.dto.FlightAreaDTO; -import com.dji.sample.map.model.dto.FlightAreaFileDTO; +import org.dromara.sample.map.model.dto.FlightAreaDTO; +import org.dromara.sample.map.model.dto.FlightAreaFileDTO; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaPropertyServices.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaPropertyServices.java index 977cfdf..a6dd680 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaPropertyServices.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaPropertyServices.java @@ -1,7 +1,7 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sample.map.model.dto.FlightAreaPropertyDTO; -import com.dji.sample.map.model.dto.FlightAreaPropertyUpdate; +import org.dromara.sample.map.model.dto.FlightAreaPropertyDTO; +import org.dromara.sample.map.model.dto.FlightAreaPropertyUpdate; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaService.java index 8cd1dd8..821e978 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IFlightAreaService.java @@ -1,9 +1,9 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sample.map.model.dto.FlightAreaDTO; -import com.dji.sample.map.model.dto.FlightAreaFileDTO; -import com.dji.sample.map.model.param.PostFlightAreaParam; -import com.dji.sample.map.model.param.PutFlightAreaParam; +import org.dromara.sample.map.model.dto.FlightAreaDTO; +import org.dromara.sample.map.model.dto.FlightAreaFileDTO; +import org.dromara.sample.map.model.param.PostFlightAreaParam; +import org.dromara.sample.map.model.param.PutFlightAreaParam; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupElementService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupElementService.java index 47097aa..4d0d518 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupElementService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupElementService.java @@ -1,9 +1,9 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sample.map.model.dto.GroupElementDTO; -import com.dji.sdk.cloudapi.map.CreateMapElementRequest; -import com.dji.sdk.cloudapi.map.MapGroupElement; -import com.dji.sdk.cloudapi.map.UpdateMapElementRequest; +import org.dromara.common.sdk.cloudapi.map.CreateMapElementRequest; +import org.dromara.common.sdk.cloudapi.map.MapGroupElement; +import org.dromara.common.sdk.cloudapi.map.UpdateMapElementRequest; +import org.dromara.sample.map.model.dto.GroupElementDTO; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupService.java index 9ff1170..395bc2a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IGroupService.java @@ -1,6 +1,7 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; -import com.dji.sdk.cloudapi.map.GetMapElementsResponse; + +import org.dromara.common.sdk.cloudapi.map.GetMapElementsResponse; import java.util.List; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IWorkspaceElementService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IWorkspaceElementService.java index 58f5fe9..33a81f3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IWorkspaceElementService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/IWorkspaceElementService.java @@ -1,8 +1,9 @@ -package com.dji.sample.map.service; +package org.dromara.sample.map.service; + +import org.dromara.common.sdk.cloudapi.map.*; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.map.model.dto.GroupElementDTO; -import com.dji.sample.map.model.dto.GroupElementDTO; -import com.dji.sdk.cloudapi.map.*; -import com.dji.sdk.common.HttpResultResponse; import java.util.List; import java.util.Optional; @@ -81,4 +82,4 @@ public interface IWorkspaceElementService { MapElementCreateWsResponse element2CreateWsElement(GroupElementDTO element); MapElementUpdateWsResponse element2UpdateWsElement(GroupElementDTO element); -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceDataServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceDataServiceImpl.java index ee591b3..16b114a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceDataServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceDataServiceImpl.java @@ -1,15 +1,15 @@ -package com.dji.sample.map.service.impl; - -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.param.DeviceQueryParam; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sample.map.model.dto.DeviceDataStatusDTO; -import com.dji.sample.map.model.dto.DeviceFlightAreaDTO; -import com.dji.sample.map.service.IDeviceDataService; -import com.dji.sample.map.service.IDeviceFlightAreaService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; +package org.dromara.sample.map.service.impl; + +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.param.DeviceQueryParam; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.map.model.dto.DeviceDataStatusDTO; +import org.dromara.sample.map.model.dto.DeviceFlightAreaDTO; +import org.dromara.sample.map.service.IDeviceDataService; +import org.dromara.sample.map.service.IDeviceFlightAreaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java index 4ad5ece..d1502bb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java @@ -1,12 +1,12 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.dji.sample.map.dao.IDeviceFlightAreaMapper; -import com.dji.sample.map.model.dto.DeviceFlightAreaDTO; -import com.dji.sample.map.model.entity.DeviceFlightAreaEntity; -import com.dji.sample.map.service.IDeviceFlightAreaService; -import com.dji.sdk.cloudapi.flightarea.FlightAreaSyncReasonEnum; -import com.dji.sdk.cloudapi.flightarea.FlightAreaSyncStatusEnum; +import org.dromara.common.sdk.cloudapi.flightarea.FlightAreaSyncReasonEnum; +import org.dromara.common.sdk.cloudapi.flightarea.FlightAreaSyncStatusEnum; +import org.dromara.sample.map.dao.IDeviceFlightAreaMapper; +import org.dromara.sample.map.model.dto.DeviceFlightAreaDTO; +import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity; +import org.dromara.sample.map.service.IDeviceFlightAreaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java index beff134..7f886f5 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java @@ -1,11 +1,11 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.dji.sample.map.dao.IElementCoordinateMapper; -import com.dji.sample.map.model.entity.ElementCoordinateEntity; -import com.dji.sample.map.service.IElementCoordinateService; -import com.dji.sdk.cloudapi.map.ElementCoordinate; +import org.dromara.common.sdk.cloudapi.map.ElementCoordinate; +import org.dromara.sample.map.dao.IElementCoordinateMapper; +import org.dromara.sample.map.model.entity.ElementCoordinateEntity; +import org.dromara.sample.map.service.IElementCoordinateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java index ed918ac..6e6613c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java @@ -1,19 +1,20 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.map.dao.IFlightAreaFileMapper; -import com.dji.sample.map.model.dto.FlightAreaDTO; -import com.dji.sample.map.model.dto.FlightAreaFileDTO; -import com.dji.sample.map.model.entity.FlightAreaFileEntity; -import com.dji.sample.map.service.IFlightAreaFileService; -import com.dji.sample.map.service.IFlightAreaPropertyServices; -import com.dji.sample.map.service.IGroupService; -import com.dji.sample.map.service.IWorkspaceElementService; -import com.dji.sdk.cloudapi.flightarea.*; -import com.dji.sdk.cloudapi.map.ElementCircleGeometry; -import com.dji.sdk.cloudapi.map.ElementPointGeometry; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.sdk.cloudapi.flightarea.*; +import org.dromara.common.sdk.cloudapi.map.ElementCircleGeometry; +import org.dromara.common.sdk.cloudapi.map.ElementPointGeometry; +import org.dromara.sample.map.dao.IFlightAreaFileMapper; +import org.dromara.sample.map.model.dto.FlightAreaDTO; +import org.dromara.sample.map.model.dto.FlightAreaFileDTO; +import org.dromara.sample.map.model.entity.FlightAreaFileEntity; +import org.dromara.sample.map.service.IFlightAreaFileService; +import org.dromara.sample.map.service.IFlightAreaPropertyServices; +import org.dromara.sample.map.service.IGroupService; +import org.dromara.sample.map.service.IWorkspaceElementService; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.codec.digest.DigestUtils; @@ -48,9 +49,6 @@ public class FlightAreaFileServiceImpl implements IFlightAreaFileService { @Autowired private IGroupService groupService; - @Autowired - private OssServiceContext ossServiceContext; - @Autowired private ObjectMapper objectMapper; @@ -114,12 +112,16 @@ public class FlightAreaFileServiceImpl implements IFlightAreaFileService { generator.writePOJO(flightAreaJson); try (ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray())) { String name = String.format("geofence_%s.json", org.springframework.util.DigestUtils.md5DigestAsHex(is)); + Long length = 0L; + while (is.read() != -1) { + length++; + } is.reset(); - String objectKey = OssConfiguration.objectDirPrefix + "/" + name; - ossServiceContext.putObject(OssConfiguration.bucket, objectKey, is); + OssClient storage = OssFactory.instance("flight_area_file"); + storage.uploadSuffix(is,name,length,"json"); return FlightAreaFileDTO.builder() .name(name) - .objectKey(objectKey) + .objectKey("flight_area_file/"+name) .fileId(UUID.randomUUID().toString()) .size(os.size()) .workspaceId(workspaceId) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java index 79fc147..85733cb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java @@ -1,13 +1,13 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.dji.sample.map.dao.IFlightAreaPropertyMapper; -import com.dji.sample.map.model.dto.FlightAreaPropertyDTO; -import com.dji.sample.map.model.dto.FlightAreaPropertyUpdate; -import com.dji.sample.map.model.entity.FlightAreaPropertyEntity; -import com.dji.sample.map.service.IFlightAreaPropertyServices; -import com.dji.sdk.cloudapi.flightarea.GeofenceTypeEnum; -import com.dji.sdk.cloudapi.flightarea.GeometrySubTypeEnum; +import org.dromara.common.sdk.cloudapi.flightarea.GeofenceTypeEnum; +import org.dromara.common.sdk.cloudapi.flightarea.GeometrySubTypeEnum; +import org.dromara.sample.map.dao.IFlightAreaPropertyMapper; +import org.dromara.sample.map.model.dto.FlightAreaPropertyDTO; +import org.dromara.sample.map.model.dto.FlightAreaPropertyUpdate; +import org.dromara.sample.map.model.entity.FlightAreaPropertyEntity; +import org.dromara.sample.map.service.IFlightAreaPropertyServices; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java index 8d210dd..1da1fa1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaServiceImpl.java @@ -1,31 +1,33 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.dto.TelemetryDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.map.model.dto.*; -import com.dji.sample.map.model.enums.FlightAreaGeometryTypeEnum; -import com.dji.sample.map.model.enums.FlightAreaOpertaionEnum; -import com.dji.sample.map.model.param.PostFlightAreaParam; -import com.dji.sample.map.model.param.PutFlightAreaParam; -import com.dji.sample.map.service.*; -import com.dji.sdk.cloudapi.flightarea.*; -import com.dji.sdk.cloudapi.flightarea.api.AbstractFlightAreaService; -import com.dji.sdk.cloudapi.map.*; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; -import com.dji.sdk.mqtt.requests.TopicRequestsRequest; -import com.dji.sdk.mqtt.requests.TopicRequestsResponse; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.entity.UploadResult; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.sdk.cloudapi.flightarea.*; +import org.dromara.common.sdk.cloudapi.flightarea.api.AbstractFlightAreaService; +import org.dromara.common.sdk.cloudapi.map.*; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsRequest; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsResponse; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.dto.TelemetryDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.map.model.dto.*; +import org.dromara.sample.map.model.enums.FlightAreaGeometryTypeEnum; +import org.dromara.sample.map.model.enums.FlightAreaOpertaionEnum; +import org.dromara.sample.map.model.param.PostFlightAreaParam; +import org.dromara.sample.map.model.param.PutFlightAreaParam; +import org.dromara.sample.map.service.*; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -68,11 +70,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements @Autowired private IDeviceFlightAreaService deviceFlightAreaService; - @Autowired - private OssServiceContext ossServiceContext; - @Autowired - private IWebSocketMessageService webSocketMessageService; @Autowired private ObjectMapper objectMapper; @@ -141,7 +139,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements } flightAreaFileService.setNonLatestByWorkspaceId(workspaceId); - webSocketMessageService.sendBatch(workspaceId, BizCodeEnum.FLIGHT_AREAS_UPDATE.getCode(), + WebSocketUtils.publishAll( BizCodeEnum.FLIGHT_AREAS_UPDATE.getCode(), FlightAreaWs.builder() .operation(FlightAreaOpertaionEnum.ADD) .areaId(param.getId()) @@ -187,7 +185,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements throw new RuntimeException("Failed to delete the flight area property."); } flightAreaFileService.setNonLatestByWorkspaceId(workspaceId); - webSocketMessageService.sendBatch(workspaceId, BizCodeEnum.FLIGHT_AREAS_UPDATE.getCode(), + WebSocketUtils.publishAll( BizCodeEnum.FLIGHT_AREAS_UPDATE.getCode(), FlightAreaWs.builder() .operation(FlightAreaOpertaionEnum.DELETE) .areaId(areaId) @@ -224,7 +222,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements } flightAreaFileService.setNonLatestByWorkspaceId(workspaceId); Optional areaOpt = getFlightAreaByAreaId(areaId); - areaOpt.ifPresent(area -> webSocketMessageService.sendBatch(workspaceId, + areaOpt.ifPresent(area -> WebSocketUtils.publishAll( BizCodeEnum.FLIGHT_AREAS_UPDATE.getCode(), FlightAreaWs.builder() .operation(FlightAreaOpertaionEnum.UPDATE) @@ -258,7 +256,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements .syncCode(data.getReason()) .build(); deviceFlightAreaService.updateOrSaveDeviceFile(deviceFlightArea); - webSocketMessageService.sendBatch(workspaceId, BizCodeEnum.FLIGHT_AREAS_SYNC_PROGRESS.getCode(), + WebSocketUtils.publishAll( BizCodeEnum.FLIGHT_AREAS_SYNC_PROGRESS.getCode(), FlightAreaNotifyDTO.builder() .sn(request.getGateway()) .result(data.getReason().getReason()) @@ -278,7 +276,7 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements if (request.getData().getDroneLocations().isEmpty()) { return new TopicEventsResponse<>(); } - webSocketMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), BizCodeEnum.FLIGHT_AREAS_DRONE_LOCATION.getCode(), + WebSocketUtils.publishAll( BizCodeEnum.FLIGHT_AREAS_DRONE_LOCATION.getCode(), TelemetryDTO.builder().sn(deviceOpt.get().getChildDeviceSn()).host(request.getData()).build()); return new TopicEventsResponse<>(); } @@ -299,13 +297,14 @@ public class FlightAreaServiceImpl extends AbstractFlightAreaService implements if (flightAreaOpt.isEmpty() || fileOpt.isEmpty()) { file = packageFlightArea(device.getWorkspaceId()); } + OssClient storage = OssFactory.instance("flight_area_file"); return new TopicRequestsResponse>().setData( MqttReply.success(new FlightAreasGetResponse().setFiles( List.of(new FlightAreaGetFile() .setName(file.getName()) .setSize(file.getSize()) .setChecksum(file.getSign()) - .setUrl(ossServiceContext.getObjectUrl(OssConfiguration.bucket, file.getObjectKey()).toString()) + .setUrl(storage.getPrivateUrl( file.getObjectKey(),3600).toString()) )))); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java index 21b25e5..0a4d7eb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java @@ -1,13 +1,12 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.dji.sample.map.dao.IGroupElementMapper; -import com.dji.sample.map.model.dto.GroupElementDTO; -import com.dji.sample.map.model.entity.GroupElementEntity; -import com.dji.sdk.cloudapi.map.ElementTypeEnum; -import com.dji.sample.map.service.IElementCoordinateService; -import com.dji.sample.map.service.IGroupElementService; -import com.dji.sdk.cloudapi.map.*; +import org.dromara.common.sdk.cloudapi.map.*; +import org.dromara.sample.map.dao.IGroupElementMapper; +import org.dromara.sample.map.model.dto.GroupElementDTO; +import org.dromara.sample.map.model.entity.GroupElementEntity; +import org.dromara.sample.map.service.IElementCoordinateService; +import org.dromara.sample.map.service.IGroupElementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java index a73cc3b..2b92327 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java @@ -1,13 +1,13 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.dji.sample.map.dao.IGroupMapper; -import com.dji.sample.map.model.entity.GroupEntity; -import com.dji.sample.map.service.IGroupElementService; -import com.dji.sample.map.service.IGroupService; -import com.dji.sdk.cloudapi.map.GetMapElementsResponse; -import com.dji.sdk.cloudapi.map.GroupTypeEnum; +import org.dromara.common.sdk.cloudapi.map.GetMapElementsResponse; +import org.dromara.common.sdk.cloudapi.map.GroupTypeEnum; +import org.dromara.sample.map.dao.IGroupMapper; +import org.dromara.sample.map.model.entity.GroupEntity; +import org.dromara.sample.map.service.IGroupElementService; +import org.dromara.sample.map.service.IGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/SDKFlightAreaService.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/SDKFlightAreaService.java index 7076452..54bfadc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/SDKFlightAreaService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/SDKFlightAreaService.java @@ -1,6 +1,6 @@ -package com.dji.sample.map.service.impl; +package org.dromara.sample.map.service.impl; -import com.dji.sdk.cloudapi.flightarea.api.AbstractFlightAreaService; +import org.dromara.common.sdk.cloudapi.flightarea.api.AbstractFlightAreaService; import org.springframework.stereotype.Service; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/WorkspaceElementServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/WorkspaceElementServiceImpl.java index e7a40b9..3529f9e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/WorkspaceElementServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/WorkspaceElementServiceImpl.java @@ -1,14 +1,14 @@ -package com.dji.sample.map.service.impl; - -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.map.model.dto.GroupElementDTO; -import com.dji.sample.map.service.IElementCoordinateService; -import com.dji.sample.map.service.IGroupElementService; -import com.dji.sample.map.service.IGroupService; -import com.dji.sample.map.service.IWorkspaceElementService; -import com.dji.sdk.cloudapi.map.*; -import com.dji.sdk.common.HttpResultResponse; +package org.dromara.sample.map.service.impl; + +import org.dromara.common.sdk.cloudapi.map.*; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.map.model.dto.GroupElementDTO; +import org.dromara.sample.map.service.IElementCoordinateService; +import org.dromara.sample.map.service.IGroupElementService; +import org.dromara.sample.map.service.IGroupService; +import org.dromara.sample.map.service.IWorkspaceElementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,8 +34,6 @@ public class WorkspaceElementServiceImpl implements IWorkspaceElementService { @Autowired private IElementCoordinateService elementCoordinateService; - @Autowired - private IWebSocketMessageService webSocketMessageService; @Override public List getAllGroupsByWorkspaceId(String workspaceId, String groupId, Boolean isDistributed) { @@ -53,8 +51,8 @@ public class WorkspaceElementServiceImpl implements IWorkspaceElementService { if (notify) { // Notify all WebSocket connections in this workspace to be updated when an element is created. getElementByElementId(elementCreate.getId()) - .ifPresent(groupElement -> webSocketMessageService.sendBatch( - workspaceId, BizCodeEnum.MAP_ELEMENT_CREATE.getCode(), + .ifPresent(groupElement -> WebSocketUtils.publishAll( + BizCodeEnum.MAP_ELEMENT_CREATE.getCode(), element2CreateWsElement(groupElement))); } return HttpResultResponse.success(); @@ -70,8 +68,8 @@ public class WorkspaceElementServiceImpl implements IWorkspaceElementService { if (notify) { // Notify all WebSocket connections in this workspace to update when there is an element update. getElementByElementId(elementId) - .ifPresent(groupElement -> webSocketMessageService.sendBatch( - workspaceId, BizCodeEnum.MAP_ELEMENT_UPDATE.getCode(), + .ifPresent(groupElement -> WebSocketUtils.publishAll( + BizCodeEnum.MAP_ELEMENT_UPDATE.getCode(), element2UpdateWsElement(groupElement))); } return HttpResultResponse.success(); @@ -94,7 +92,7 @@ public class WorkspaceElementServiceImpl implements IWorkspaceElementService { if (notify) { // Notify all WebSocket connections in this workspace to update when an element is deleted. elementOpt.ifPresent(element -> - webSocketMessageService.sendBatch(workspaceId, BizCodeEnum.MAP_ELEMENT_DELETE.getCode(), + WebSocketUtils.publishAll( BizCodeEnum.MAP_ELEMENT_DELETE.getCode(), new MapElementDeleteWsResponse() .setGroupId(element.getGroupId()) .setId(elementId))); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java index 3934014..1f6f24e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java @@ -1,13 +1,15 @@ -package com.dji.sample.media.controller; +package org.dromara.sample.media.controller; -import com.dji.sample.media.model.MediaFileDTO; -import com.dji.sample.media.service.IFileService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.media.model.MediaFileDTO; +import org.dromara.sample.media.service.IFileService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; @@ -24,31 +26,31 @@ public class FileController { private IFileService fileService; /** + * 根据工作区id获取此工作区中所有媒体文件的信息。 * Get information about all the media files in this workspace based on the workspace id. - * @param workspaceId * @return */ - @GetMapping("/{workspace_id}/files") + @GetMapping("/files") public HttpResultResponse> getFilesList(@RequestParam(defaultValue = "1") Long page, - @RequestParam(name = "page_size", defaultValue = "10") Long pageSize, - @PathVariable(name = "workspace_id") String workspaceId) { - PaginationData filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize); + @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) { + LoginUser loginUser = LoginHelper.getLoginUser(); + PaginationData filesList = fileService.getMediaFilesPaginationByWorkspaceId(loginUser.getTenantId(), page, pageSize); return HttpResultResponse.success(filesList); } /** + * 根据媒体文件id查询文件的下载地址， + * 并直接重定向到此地址进行下载。 * Query the download address of the file according to the media file id, * and redirect to this address directly for download. - * @param workspaceId * @param fileId * @param response */ - @GetMapping("/{workspace_id}/file/{file_id}/url") - public void getFileUrl(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "file_id") String fileId, HttpServletResponse response) { - + @GetMapping("/file/{file_id}/url") + public void getFileUrl(@PathVariable(name = "file_id") String fileId, HttpServletResponse response) { + LoginUser loginUser = LoginHelper.getLoginUser(); try { - URL url = fileService.getObjectUrl(workspaceId, fileId); + URL url = fileService.getObjectUrl(loginUser.getTenantId(), fileId); response.sendRedirect(url.toString()); } catch (IOException e) { e.printStackTrace(); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java index ec21a54..0d48b97 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java @@ -1,16 +1,19 @@ -package com.dji.sample.media.controller; +package org.dromara.sample.media.controller; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.media.*; +import org.dromara.common.sdk.cloudapi.media.api.IHttpMediaService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.media.service.IMediaService; -import com.dji.sample.media.service.IMediaService; -import com.dji.sdk.cloudapi.media.*; -import com.dji.sdk.cloudapi.media.api.IHttpMediaService; -import com.dji.sdk.common.HttpResultResponse; import lombok.extern.slf4j.Slf4j; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.util.List; /** @@ -27,13 +30,13 @@ public class MediaController implements IHttpMediaService { /** * Check if the file has been uploaded by the fingerprint. - * @param workspaceId * @param request * @return */ @Override - public HttpResultResponse mediaFastUpload(String workspaceId, @Valid MediaFastUploadRequest request, HttpServletRequest req, HttpServletResponse rsp) { - boolean isExist = mediaService.fastUpload(workspaceId, request.getFingerprint()); + public HttpResultResponse mediaFastUpload( @Valid MediaFastUploadRequest request, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + boolean isExist = mediaService.fastUpload(loginUser.getTenantId(), request.getFingerprint()); return isExist ? HttpResultResponse.success() : HttpResultResponse.error(request.getFingerprint() + "don't exist."); } @@ -41,31 +44,32 @@ public class MediaController implements IHttpMediaService { /** * When the file is uploaded to the storage server by pilot, * the basic information of the file is reported through this interface. - * @param workspaceId * @param request * @return */ @Override - public HttpResultResponse mediaUploadCallback(String workspaceId, @Valid MediaUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { - mediaService.saveMediaFile(workspaceId, request); + public HttpResultResponse mediaUploadCallback( @Valid MediaUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + mediaService.saveMediaFile(loginUser.getTenantId(), request); return HttpResultResponse.success(request.getObjectKey()); } /** * Query the files that already exist in this workspace based on the workspace id and the collection of tiny fingerprints. - * @param workspaceId * @param request There is only one tiny_fingerprint parameter in the body. * But it is not recommended to use Map to receive the parameter. * @return */ @Override - public HttpResultResponse getExistFileTinyFingerprint(String workspaceId, @Valid GetFileFingerprintRequest request, HttpServletRequest req, HttpServletResponse rsp) { - List existingList = mediaService.getExistTinyFingerprints(workspaceId, request.getTinyFingerprints()); + public HttpResultResponse getExistFileTinyFingerprint(@Valid GetFileFingerprintRequest request, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + List existingList = mediaService.getExistTinyFingerprints(loginUser.getTenantId(), request.getTinyFingerprints()); return HttpResultResponse.success(new GetFileFingerprintResponse().setTinyFingerprints(existingList)); } @Override - public HttpResultResponse folderUploadCallback(String workspaceId, @Valid FolderUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { + public HttpResultResponse folderUploadCallback( @Valid FolderUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); return null; } -} \ No newline at end of file +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java index ec01af1..a72564f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.media.dao; +package org.dromara.sample.media.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.media.model.MediaFileEntity; +import org.dromara.sample.media.model.MediaFileEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileCountDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileCountDTO.java index 2aa952a..44d5fee 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileCountDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileCountDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.media.model; +package org.dromara.sample.media.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java index dec1a1b..18dd636 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.media.model; +package org.dromara.sample.media.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java index 78a747c..d90f04e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.media.model; +package org.dromara.sample.media.model; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaMethodEnum.java index 4de860f..c19a3fa 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.media.model; +package org.dromara.sample.media.model; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java index 72f41a1..63fa171 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java @@ -1,8 +1,8 @@ -package com.dji.sample.media.service; +package org.dromara.sample.media.service; -import com.dji.sample.media.model.MediaFileDTO; -import com.dji.sdk.cloudapi.media.MediaUploadCallbackRequest; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.sdk.cloudapi.media.MediaUploadCallbackRequest; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.media.model.MediaFileDTO; import java.net.URL; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaRedisService.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaRedisService.java index 03fc446..10a6331 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaRedisService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaRedisService.java @@ -1,6 +1,6 @@ -package com.dji.sample.media.service; +package org.dromara.sample.media.service; -import com.dji.sample.media.model.MediaFileCountDTO; +import org.dromara.sample.media.model.MediaFileCountDTO; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java index 4b55d2f..141039d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java @@ -1,6 +1,7 @@ -package com.dji.sample.media.service; +package org.dromara.sample.media.service; -import com.dji.sdk.cloudapi.media.MediaUploadCallbackRequest; + +import org.dromara.common.sdk.cloudapi.media.MediaUploadCallbackRequest; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java index e837436..b74e370 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java @@ -1,20 +1,20 @@ -package com.dji.sample.media.service.impl; +package org.dromara.sample.media.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.manage.model.dto.DeviceDictionaryDTO; -import com.dji.sample.manage.service.IDeviceDictionaryService; -import com.dji.sample.media.dao.IFileMapper; -import com.dji.sample.media.model.MediaFileDTO; -import com.dji.sample.media.model.MediaFileEntity; -import com.dji.sample.media.service.IFileService; -import com.dji.sdk.cloudapi.device.DeviceEnum; -import com.dji.sdk.cloudapi.media.MediaSubFileTypeEnum; -import com.dji.sdk.cloudapi.media.MediaUploadCallbackRequest; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.sdk.cloudapi.device.DeviceEnum; +import org.dromara.common.sdk.cloudapi.media.MediaSubFileTypeEnum; +import org.dromara.common.sdk.cloudapi.media.MediaUploadCallbackRequest; +import org.dromara.common.sdk.common.Pagination; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO; +import org.dromara.sample.manage.service.IDeviceDictionaryService; +import org.dromara.sample.media.dao.IFileMapper; +import org.dromara.sample.media.model.MediaFileDTO; +import org.dromara.sample.media.model.MediaFileEntity; +import org.dromara.sample.media.service.IFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,8 +43,7 @@ public class FileServiceImpl implements IFileService { @Autowired private IDeviceDictionaryService deviceDictionaryService; - @Autowired - private OssServiceContext ossService; + private Optional getMediaByFingerprint(String workspaceId, String fingerprint) { MediaFileEntity fileEntity = mapper.selectOne(new LambdaQueryWrapper() @@ -103,8 +102,8 @@ public class FileServiceImpl implements IFileService { if (mediaFileOpt.isEmpty()) { throw new IllegalArgumentException("{} 不存在。"); } - - return ossService.getObjectUrl(OssConfiguration.bucket, mediaFileOpt.get().getObjectKey()); + OssClient storage = OssFactory.instance("media_file"); + return storage.getPrivateUrlURL(mediaFileOpt.get().getObjectKey(),3600); } @Override diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaRedisServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaRedisServiceImpl.java index 9090d75..1ff6515 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaRedisServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaRedisServiceImpl.java @@ -1,9 +1,9 @@ -package com.dji.sample.media.service.impl; +package org.dromara.sample.media.service.impl; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.media.model.MediaFileCountDTO; -import com.dji.sample.media.service.IMediaRedisService; +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.sample.media.model.MediaFileCountDTO; +import org.dromara.sample.media.service.IMediaRedisService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java index ac9cc77..b7d5d54 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java @@ -1,23 +1,22 @@ -package com.dji.sample.media.service.impl; - -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sample.media.model.MediaFileCountDTO; -import com.dji.sample.media.model.MediaFileDTO; -import com.dji.sample.media.service.IFileService; -import com.dji.sample.media.service.IMediaRedisService; -import com.dji.sample.media.service.IMediaService; -import com.dji.sample.wayline.service.IWaylineJobService; -import com.dji.sdk.cloudapi.media.*; -import com.dji.sdk.cloudapi.media.api.AbstractMediaService; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; +package org.dromara.sample.media.service.impl; + +import org.dromara.common.sdk.cloudapi.media.*; +import org.dromara.common.sdk.cloudapi.media.api.AbstractMediaService; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.media.model.MediaFileCountDTO; +import org.dromara.sample.media.model.MediaFileDTO; +import org.dromara.sample.media.service.IFileService; +import org.dromara.sample.media.service.IMediaRedisService; +import org.dromara.sample.media.service.IMediaService; +import org.dromara.sample.wayline.service.IWaylineJobService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -51,8 +50,6 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ @Autowired private IDeviceService deviceService; - @Autowired - private IWebSocketMessageService webSocketMessageService; @Autowired private IDeviceRedisService deviceRedisService; @@ -121,7 +118,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ @Override public TopicEventsResponse highestPriorityUploadFlightTaskMedia( - TopicEventsRequest request, MessageHeaders headers) { + TopicEventsRequest request, MessageHeaders headers) { String jobId = request.getData().getFlightId(); if (!StringUtils.hasText(jobId)) { return null; @@ -143,7 +140,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ return null; } - webSocketMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA.getCode(), countDTO); return new TopicEventsResponse().setData(MqttReply.success()); @@ -156,7 +153,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ // set path String objectKey = file.getObjectKey(); - file.setPath(objectKey.substring(Optional.of(objectKey.indexOf(OssConfiguration.objectDirPrefix)) + file.setPath(objectKey.substring(Optional.of(objectKey.indexOf("media_file")) .filter(index -> index > 0).map(index -> index++).orElse(0), objectKey.lastIndexOf("/"))); @@ -185,7 +182,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ mediaRedisService.setMediaCount(request.getGateway(), jobId, mediaFileCount); } - webSocketMessageService.sendBatch(dock.getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll( UserTypeEnum.WEB.getVal(), BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode(), mediaFileCount); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/StorageController.java b/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/StorageController.java index 1097cb1..c3376b9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/StorageController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/StorageController.java @@ -1,14 +1,17 @@ -package com.dji.sample.storage.controller; +package org.dromara.sample.storage.controller; -import com.dji.sample.storage.service.IStorageService; -import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; -import com.dji.sdk.cloudapi.storage.api.IHttpStorageService; -import com.dji.sdk.common.HttpResultResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.storage.StsCredentialsResponse; +import org.dromara.common.sdk.cloudapi.storage.api.IHttpStorageService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.storage.service.IStorageService; + +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author sean @@ -23,11 +26,11 @@ public class StorageController implements IHttpStorageService { /** * Get temporary credentials for uploading the media and wayline in DJI Pilot. - * @param workspaceId * @return */ @Override - public HttpResultResponse getTemporaryCredential(String workspaceId, HttpServletRequest req, HttpServletResponse rsp) { + public HttpResultResponse getTemporaryCredential( HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); StsCredentialsResponse stsCredentials = storageService.getSTSCredentials(); return HttpResultResponse.success(stsCredentials); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/IStorageService.java b/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/IStorageService.java index 4d86788..6266d2d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/IStorageService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/IStorageService.java @@ -1,6 +1,8 @@ -package com.dji.sample.storage.service; +package org.dromara.sample.storage.service; -import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; + +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; +import org.dromara.common.sdk.cloudapi.storage.StsCredentialsResponse; /** * @author sean @@ -15,4 +17,5 @@ public interface IStorageService { */ StsCredentialsResponse getSTSCredentials(); + } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/impl/StorageServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/impl/StorageServiceImpl.java index 6295400..4c6991d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/impl/StorageServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/storage/service/impl/StorageServiceImpl.java @@ -1,14 +1,24 @@ -package com.dji.sample.storage.service.impl; +package org.dromara.sample.storage.service.impl; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.storage.service.IStorageService; -import com.dji.sdk.cloudapi.media.StorageConfigGet; -import com.dji.sdk.cloudapi.media.api.AbstractMediaService; -import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.requests.TopicRequestsRequest; -import com.dji.sdk.mqtt.requests.TopicRequestsResponse; +import com.amazonaws.auth.AWSCredentialsProvider; +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.client.builder.AwsClientBuilder; +import com.amazonaws.services.securitytoken.AWSSecurityTokenService; +import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder; +import com.amazonaws.services.securitytoken.model.Credentials; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.sdk.cloudapi.media.StorageConfigGet; +import org.dromara.common.sdk.cloudapi.media.api.AbstractMediaService; +import org.dromara.common.sdk.cloudapi.storage.CredentialsToken; +import org.dromara.common.sdk.cloudapi.storage.OssTypeEnum; +import org.dromara.common.sdk.cloudapi.storage.StsCredentialsResponse; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsRequest; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsResponse; +import org.dromara.sample.storage.service.IStorageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Service; @@ -19,22 +29,23 @@ import org.springframework.stereotype.Service; * @date 2022/3/9 */ @Service +@Slf4j public class StorageServiceImpl extends AbstractMediaService implements IStorageService { - @Autowired - private OssServiceContext ossService; @Override public StsCredentialsResponse getSTSCredentials() { + OssClient ossClient = OssFactory.instance("media_file"); return new StsCredentialsResponse() - .setEndpoint(OssConfiguration.endpoint) - .setBucket(OssConfiguration.bucket) - .setCredentials(ossService.getCredentials()) - .setProvider(OssConfiguration.provider) - .setObjectKeyPrefix(OssConfiguration.objectDirPrefix) - .setRegion(OssConfiguration.region); + .setEndpoint(ossClient.getOssProperties().getEndpoint()) + .setBucket("media_file") + .setCredentials(OssFactory.getCredentials("media_file")) + .setProvider(OssTypeEnum.fromType(ossClient.getOssProperties().getSThreeType())) + .setObjectKeyPrefix(ossClient.getOssProperties().getPrefix()) + .setRegion(ossClient.getOssProperties().getRegion()); } + @Override public TopicRequestsResponse> storageConfigGet(TopicRequestsRequest response, MessageHeaders headers) { return new TopicRequestsResponse>().setData(MqttReply.success(getSTSCredentials())); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java index 37e6d61..b10a78f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java @@ -1,24 +1,27 @@ -package com.dji.sample.wayline.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.wayline.model.dto.WaylineFileDTO; -import com.dji.sample.wayline.model.entity.WaylineFileEntity; -import com.dji.sample.wayline.service.IWaylineFileService; -import com.dji.sdk.cloudapi.device.DeviceEnum; -import com.dji.sdk.cloudapi.wayline.*; -import com.dji.sdk.cloudapi.wayline.api.IHttpWaylineService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; +package org.dromara.sample.wayline.controller; + + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.device.DeviceEnum; +import org.dromara.common.sdk.cloudapi.wayline.*; +import org.dromara.common.sdk.cloudapi.wayline.api.IHttpWaylineService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.wayline.model.dto.WaylineFileDTO; +import org.dromara.sample.wayline.model.entity.WaylineFileEntity; +import org.dromara.sample.wayline.service.IWaylineFileService; + +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; + import java.io.IOException; import java.net.URL; import java.sql.SQLException; @@ -26,7 +29,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -41,14 +43,13 @@ public class WaylineFileController implements IHttpWaylineService { /** * Delete the wayline file in the workspace according to the wayline id. - * @param workspaceId * @param waylineId * @return */ - @DeleteMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/{workspace_id}/waylines/{wayline_id}") - public HttpResultResponse deleteWayline(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "wayline_id") String waylineId) { - boolean isDel = waylineFileService.deleteByWaylineId(workspaceId, waylineId); + @DeleteMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/waylines/{wayline_id}") + public HttpResultResponse deleteWayline(@PathVariable(name = "wayline_id") String waylineId) { + LoginUser loginUser = LoginHelper.getLoginUser(); + boolean isDel = waylineFileService.deleteByWaylineId(loginUser.getTenantId(), waylineId); return isDel ? HttpResultResponse.success() : HttpResultResponse.error("航线删除失败"); } @@ -57,15 +58,14 @@ public class WaylineFileController implements IHttpWaylineService { * @param file * @return */ - @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/{workspace_id}/waylines/file/upload") + @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/waylines/file/upload") public HttpResultResponse importKmzFile(HttpServletRequest request, MultipartFile file) { if (Objects.isNull(file)) { return HttpResultResponse.error("No file received."); } - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - String workspaceId = customClaim.getWorkspaceId(); - String creator = customClaim.getUsername(); - waylineFileService.importKmzFile(file, workspaceId, creator); + LoginUser loginUser = LoginHelper.getLoginUser(); + String creator = loginUser.getUsername(); + waylineFileService.importKmzFile(file, loginUser.getTenantId(), creator); return HttpResultResponse.success(); } @@ -73,27 +73,27 @@ public class WaylineFileController implements IHttpWaylineService { * Query the basic data of the wayline file according to the query conditions. * The query condition field in pilot is fixed. * @param request - * @param workspaceId * @return */ @Override - public HttpResultResponse> getWaylineList(@Valid GetWaylineListRequest request, String workspaceId, HttpServletRequest req, HttpServletResponse rsp) { - PaginationData data = waylineFileService.getWaylinesByParam(workspaceId, request); + public HttpResultResponse> getWaylineList(@Valid GetWaylineListRequest request, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + PaginationData data = waylineFileService.getWaylinesByParam(loginUser.getTenantId(), request); return HttpResultResponse.success(data); } /** * Query the download address of the file according to the wayline file id, * and redirect to this address directly for download. - * @param workspaceId * @param waylineId * @param req * @param rsp */ @Override - public void getWaylineFileDownloadAddress(String workspaceId, String waylineId, HttpServletRequest req, HttpServletResponse rsp) { + public void getWaylineFileDownloadAddress( String waylineId, HttpServletRequest req, HttpServletResponse rsp) { try { - URL url = waylineFileService.getObjectUrl(workspaceId, waylineId); + LoginUser loginUser = LoginHelper.getLoginUser(); + URL url = waylineFileService.getObjectUrl(loginUser.getTenantId(), waylineId); rsp.sendRedirect(url.toString()); } catch (IOException | SQLException e) { @@ -104,13 +104,13 @@ public class WaylineFileController implements IHttpWaylineService { /** * Checking whether the name already exists according to the wayline name must ensure the uniqueness of the wayline name. * This interface will be called when uploading waylines and must be available. - * @param workspaceId * @param names * @return */ @Override - public HttpResultResponse> getDuplicatedWaylineName(String workspaceId, @NotNull @Size(min = 1) List names, HttpServletRequest req, HttpServletResponse rsp) { - List existNamesList = waylineFileService.getDuplicateNames(workspaceId, names); + public HttpResultResponse> getDuplicatedWaylineName(@NotNull @Size(min = 1) List names, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + List existNamesList = waylineFileService.getDuplicateNames(loginUser.getTenantId(), names); return HttpResultResponse.success(existNamesList); } @@ -119,17 +119,16 @@ public class WaylineFileController implements IHttpWaylineService { * When the wayline file is uploaded to the storage server by pilot, * the basic information of the file is reported through this interface. * @param request - * @param workspaceId * @return */ @Override - public HttpResultResponse fileUploadResultReport(String workspaceId, @Valid WaylineUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { - CustomClaim customClaim = (CustomClaim)req.getAttribute(TOKEN_CLAIM); + public HttpResultResponse fileUploadResultReport( @Valid WaylineUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); WaylineUploadCallbackMetadata metadata = request.getMetadata(); WaylineFileDTO file = WaylineFileDTO.builder() - .username(customClaim.getUsername()) + .username(loginUser.getUsername()) .objectKey(request.getObjectKey()) .name(request.getName()) .templateTypes(metadata.getTemplateTypes().stream().map(WaylineTypeEnum::getValue).collect(Collectors.toList())) @@ -137,33 +136,33 @@ public class WaylineFileController implements IHttpWaylineService { .droneModelKey(metadata.getDroneModelKey().getDevice()) .build(); - int id = waylineFileService.saveWaylineFile(workspaceId, file); + int id = waylineFileService.saveWaylineFile(loginUser.getTenantId(), file); return id <= 0 ? HttpResultResponse.error() : HttpResultResponse.success(); } /** * Favorite the wayline file according to the wayline file id. - * @param workspaceId * @param ids wayline file id * @return */ @Override - public HttpResultResponse batchFavoritesWayline(String workspaceId, @NotNull @Size(min = 1) List ids, HttpServletRequest req, HttpServletResponse rsp) { - boolean isMark = waylineFileService.markFavorite(workspaceId, ids, true); + public HttpResultResponse batchFavoritesWayline( @NotNull @Size(min = 1) List ids, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + boolean isMark = waylineFileService.markFavorite(loginUser.getTenantId(), ids, true); return isMark ? HttpResultResponse.success() : HttpResultResponse.error(); } /** * Delete the favorites of this wayline file based on the wayline file id. - * @param workspaceId * @param ids wayline file id * @return */ @Override - public HttpResultResponse batchUnfavoritesWayline(String workspaceId, @NotNull @Size(min = 1) List ids, HttpServletRequest req, HttpServletResponse rsp) { - boolean isMark = waylineFileService.markFavorite(workspaceId, ids, false); + public HttpResultResponse batchUnfavoritesWayline(@NotNull @Size(min = 1) List ids, HttpServletRequest req, HttpServletResponse rsp) { + LoginUser loginUser = LoginHelper.getLoginUser(); + boolean isMark = waylineFileService.markFavorite(loginUser.getTenantId(), ids, false); return isMark ? HttpResultResponse.success() : HttpResultResponse.error(); } @@ -172,10 +171,10 @@ public class WaylineFileController implements IHttpWaylineService { * Import kmz wayline files. * @return */ - @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/{workspace_id}/waylines/file/save") - public HttpResultResponse importDeptIdKmzFile(HttpServletRequest request, @Valid @RequestBody WaylineFileDTO metadata, - @PathVariable(name = "workspace_id") String workspaceId) { - Integer fileId = waylineFileService.saveWaylineFile(workspaceId, metadata); + @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/waylines/file/save") + public HttpResultResponse importDeptIdKmzFile(HttpServletRequest request, @Valid @RequestBody WaylineFileDTO metadata) { + LoginUser loginUser = LoginHelper.getLoginUser(); + Integer fileId = waylineFileService.saveWaylineFile(loginUser.getTenantId(), metadata); if(fileId > 0){ return HttpResultResponse.success(waylineFileService.getWaylineIdByFileId(fileId)); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java index 5d8c259..f7b827d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java @@ -1,22 +1,22 @@ -package com.dji.sample.wayline.controller; +package org.dromara.sample.wayline.controller; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.model.param.CreateJobParam; -import com.dji.sample.wayline.model.param.UpdateJobParam; -import com.dji.sample.wayline.service.IFlightTaskService; -import com.dji.sample.wayline.service.IWaylineJobService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.PaginationData; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.model.param.CreateJobParam; +import org.dromara.sample.wayline.model.param.UpdateJobParam; +import org.dromara.sample.wayline.service.IFlightTaskService; +import org.dromara.sample.wayline.service.IWaylineJobService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.sql.SQLException; import java.util.Set; -import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; /** * @author sean @@ -37,66 +37,60 @@ public class WaylineJobController { * Create a wayline task for the Dock. * @param request * @param param - * @param workspaceId + * @param * @return * @throws SQLException */ - @PostMapping("/{workspace_id}/flight-tasks") - public HttpResultResponse createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param, - @PathVariable(name = "workspace_id") String workspaceId) throws SQLException { - CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM); - customClaim.setWorkspaceId(workspaceId); + @PostMapping("/flight-tasks") + public HttpResultResponse createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param) throws SQLException { - return flighttaskService.publishFlightTask(param, customClaim); + return flighttaskService.publishFlightTask(param); } /** * Paginate through all jobs in this workspace. * @param page * @param pageSize - * @param workspaceId * @return */ - @GetMapping("/{workspace_id}/jobs") + @GetMapping("/jobs") public HttpResultResponse> getJobs(@RequestParam(defaultValue = "1") Long page, - @RequestParam(name = "page_size", defaultValue = "10") Long pageSize, - @PathVariable(name = "workspace_id") String workspaceId) { - PaginationData data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize); + @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,) { + LoginUser loginUser = LoginHelper.getLoginUser(); + PaginationData data = waylineJobService.getJobsByWorkspaceId(loginUser.getTenantId(), page, pageSize); return HttpResultResponse.success(data); } /** * Send the command to cancel the jobs. * @param jobIds - * @param workspaceId * @return * @throws SQLException */ - @DeleteMapping("/{workspace_id}/jobs") - public HttpResultResponse publishCancelJob(@RequestParam(name = "job_id") Set jobIds, - @PathVariable(name = "workspace_id") String workspaceId) throws SQLException { - flighttaskService.cancelFlightTask(workspaceId, jobIds); + @DeleteMapping("/jobs") + public HttpResultResponse publishCancelJob(@RequestParam(name = "job_id") Set jobIds) throws SQLException { + LoginUser loginUser = LoginHelper.getLoginUser(); + flighttaskService.cancelFlightTask(loginUser.getTenantId(), jobIds); return HttpResultResponse.success(); } /** * Set the media files for this job to upload immediately. - * @param workspaceId * @param jobId * @return */ - @PostMapping("/{workspace_id}/jobs/{job_id}/media-highest") - public HttpResultResponse uploadMediaHighestPriority(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "job_id") String jobId) { - flighttaskService.uploadMediaHighestPriority(workspaceId, jobId); + @PostMapping("/jobs/{job_id}/media-highest") + public HttpResultResponse uploadMediaHighestPriority(@PathVariable(name = "job_id") String jobId) { + LoginUser loginUser = LoginHelper.getLoginUser(); + flighttaskService.uploadMediaHighestPriority(loginUser.getTenantId(), jobId); return HttpResultResponse.success(); } - @PutMapping("/{workspace_id}/jobs/{job_id}") - public HttpResultResponse updateJobStatus(@PathVariable(name = "workspace_id") String workspaceId, - @PathVariable(name = "job_id") String jobId, + @PutMapping("/jobs/{job_id}") + public HttpResultResponse updateJobStatus(@PathVariable(name = "job_id") String jobId, @Valid @RequestBody UpdateJobParam param) { - flighttaskService.updateJobStatus(workspaceId, jobId, param); + LoginUser loginUser = LoginHelper.getLoginUser(); + flighttaskService.updateJobStatus(loginUser.getTenantId(), jobId, param); return HttpResultResponse.success(); } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java index 5537e4f..bab0f86 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.wayline.dao; +package org.dromara.sample.wayline.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.wayline.model.entity.WaylineFileEntity; +import org.dromara.sample.wayline.model.entity.WaylineFileEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java index 9a18c69..f2b1f67 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java @@ -1,7 +1,7 @@ -package com.dji.sample.wayline.dao; +package org.dromara.sample.wayline.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dji.sample.wayline.model.entity.WaylineJobEntity; +import org.dromara.sample.wayline.model.entity.WaylineJobEntity; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/ConditionalWaylineJobKey.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/ConditionalWaylineJobKey.java index 2dd1ca2..ded9ebd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/ConditionalWaylineJobKey.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/ConditionalWaylineJobKey.java @@ -1,7 +1,7 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; -import com.dji.sample.component.redis.RedisConst; import lombok.Data; +import org.dromara.common.redis.config.RedisConst; import java.util.Objects; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressExt.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressExt.java index a04ea45..93773e6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressExt.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressExt.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressProgress.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressProgress.java index 46e525d..94e4208 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressProgress.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/FlighttaskProgressProgress.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/KmzFileProperties.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/KmzFileProperties.java index f729961..4d7218b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/KmzFileProperties.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/KmzFileProperties.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java index 8e6282a..eeb6f0f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobBreakPointDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobBreakPointDTO.java index ca59f2f..2e19656 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobBreakPointDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobBreakPointDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java index 0d38d59..48d1c48 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java @@ -1,10 +1,13 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; -import com.dji.sdk.cloudapi.wayline.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.wayline.OutOfControlActionEnum; +import org.dromara.common.sdk.cloudapi.wayline.ProgressExtBreakPoint; +import org.dromara.common.sdk.cloudapi.wayline.TaskTypeEnum; +import org.dromara.common.sdk.cloudapi.wayline.WaylineTypeEnum; import java.time.LocalDateTime; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskConditionDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskConditionDTO.java index c924b07..cddbdac 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskConditionDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskConditionDTO.java @@ -1,11 +1,11 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; -import com.dji.sdk.cloudapi.wayline.ExecutableConditions; -import com.dji.sdk.cloudapi.wayline.ReadyConditions; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.wayline.ExecutableConditions; +import org.dromara.common.sdk.cloudapi.wayline.ReadyConditions; /** * @author sean diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateBreakPointDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateBreakPointDTO.java index 054e238..947234a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateBreakPointDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateBreakPointDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateDTO.java index da6fe1c..ca6a2d1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskCreateDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskExecutableConditionDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskExecutableConditionDTO.java index 24cfc4c..ecab0eb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskExecutableConditionDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskExecutableConditionDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskFileDTO.java index 604eb9d..bf477e8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskFileDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskProgressReceiver.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskProgressReceiver.java index 75671c4..d7316a7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskProgressReceiver.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskProgressReceiver.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskReadyConditionDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskReadyConditionDTO.java index 61fe5a7..c826531 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskReadyConditionDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineTaskReadyConditionDTO.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.dto; +package org.dromara.sample.wayline.model.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java index 27be0bf..79c23ff 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.entity; +package org.dromara.sample.wayline.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java index 93f1637..c66bc2c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java @@ -1,12 +1,11 @@ -package com.dji.sample.wayline.model.entity; +package org.dromara.sample.wayline.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.dji.sdk.cloudapi.wayline.FlighttaskBreakPoint; -import com.dji.sdk.cloudapi.wayline.ProgressExtBreakPoint; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.sdk.cloudapi.wayline.ProgressExtBreakPoint; import java.io.Serializable; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineErrorCodeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineErrorCodeEnum.java index 45b42a1..fc18e88 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineErrorCodeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineErrorCodeEnum.java @@ -1,7 +1,7 @@ -package com.dji.sample.wayline.model.enums; +package org.dromara.sample.wayline.model.enums; -import com.dji.sdk.common.IErrorInfo; import com.fasterxml.jackson.annotation.JsonCreator; +import org.dromara.common.sdk.common.IErrorInfo; import java.util.Arrays; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineJobStatusEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineJobStatusEnum.java index dcd5bb7..45339ce 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineJobStatusEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineJobStatusEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.enums; +package org.dromara.sample.wayline.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineMethodEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineMethodEnum.java index 6ad9807..ab20fc0 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineMethodEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineMethodEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.enums; +package org.dromara.sample.wayline.model.enums; import lombok.Getter; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTaskStatusEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTaskStatusEnum.java index 9bdf4f6..48a780d 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTaskStatusEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTaskStatusEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.enums; +package org.dromara.sample.wayline.model.enums; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTemplateTypeEnum.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTemplateTypeEnum.java index 760fc8d..cd85847 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTemplateTypeEnum.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/enums/WaylineTemplateTypeEnum.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.enums; +package org.dromara.sample.wayline.model.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobBreakPointParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobBreakPointParam.java index da09921..ce76797 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobBreakPointParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobBreakPointParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.param; +package org.dromara.sample.wayline.model.param; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java index e6ce07c..a5cbad7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java @@ -1,14 +1,14 @@ -package com.dji.sample.wayline.model.param; +package org.dromara.sample.wayline.model.param; -import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum; -import com.dji.sdk.cloudapi.wayline.ProgressExtBreakPoint; -import com.dji.sdk.cloudapi.wayline.TaskTypeEnum; -import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; +import org.dromara.common.sdk.cloudapi.wayline.OutOfControlActionEnum; +import org.dromara.common.sdk.cloudapi.wayline.ProgressExtBreakPoint; +import org.dromara.common.sdk.cloudapi.wayline.TaskTypeEnum; +import org.dromara.common.sdk.cloudapi.wayline.WaylineTypeEnum; import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/UpdateJobParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/UpdateJobParam.java index dfa8e37..e4a0c68 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/UpdateJobParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/UpdateJobParam.java @@ -1,6 +1,6 @@ -package com.dji.sample.wayline.model.param; +package org.dromara.sample.wayline.model.param; -import com.dji.sample.wayline.model.enums.WaylineTaskStatusEnum; +import org.dromara.sample.wayline.model.enums.WaylineTaskStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/WaylineQueryParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/WaylineQueryParam.java index e0c39ce..f666f0a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/WaylineQueryParam.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/WaylineQueryParam.java @@ -1,4 +1,4 @@ -package com.dji.sample.wayline.model.param; +package org.dromara.sample.wayline.model.param; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java index 79c4857..9556906 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IFlightTaskService.java @@ -1,11 +1,10 @@ -package com.dji.sample.wayline.service; +package org.dromara.sample.wayline.service; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.wayline.model.dto.ConditionalWaylineJobKey; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.model.param.CreateJobParam; -import com.dji.sample.wayline.model.param.UpdateJobParam; -import com.dji.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.sample.wayline.model.dto.ConditionalWaylineJobKey; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.model.param.CreateJobParam; +import org.dromara.sample.wayline.model.param.UpdateJobParam; import java.sql.SQLException; import java.util.Collection; @@ -22,10 +21,9 @@ public interface IFlightTaskService { /** * Issue wayline mission to the dock. * @param param - * @param customClaim user info * @return */ - HttpResultResponse publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException; + HttpResultResponse publishFlightTask(CreateJobParam param) throws SQLException; /** * Issue wayline mission to the dock. diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java index d48d7ca..871a0cf 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java @@ -1,9 +1,9 @@ -package com.dji.sample.wayline.service; +package org.dromara.sample.wayline.service; -import com.dji.sample.wayline.model.dto.WaylineFileDTO; -import com.dji.sdk.cloudapi.wayline.GetWaylineListRequest; -import com.dji.sdk.cloudapi.wayline.GetWaylineListResponse; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListRequest; +import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListResponse; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.wayline.model.dto.WaylineFileDTO; import org.springframework.web.multipart.MultipartFile; import java.net.URL; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java index 1b5c84f..f5f4959 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java @@ -1,9 +1,9 @@ -package com.dji.sample.wayline.service; +package org.dromara.sample.wayline.service; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum; -import com.dji.sample.wayline.model.param.CreateJobParam; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum; +import org.dromara.sample.wayline.model.param.CreateJobParam; import java.util.Collection; import java.util.List; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineRedisService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineRedisService.java index 7230c50..d199637 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineRedisService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineRedisService.java @@ -1,9 +1,9 @@ -package com.dji.sample.wayline.service; +package org.dromara.sample.wayline.service; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.wayline.model.dto.ConditionalWaylineJobKey; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sdk.cloudapi.wayline.FlighttaskProgress; +import org.dromara.common.sdk.cloudapi.wayline.FlighttaskProgress; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.wayline.model.dto.ConditionalWaylineJobKey; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; import java.util.Optional; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java index cdef858..fc0d7a2 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java @@ -1,41 +1,42 @@ -package com.dji.sample.wayline.service.impl; - -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.common.model.CustomClaim; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.media.model.MediaFileCountDTO; -import com.dji.sample.media.service.IMediaRedisService; -import com.dji.sample.wayline.model.dto.ConditionalWaylineJobKey; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.model.dto.WaylineTaskConditionDTO; -import com.dji.sample.wayline.model.enums.WaylineErrorCodeEnum; -import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum; -import com.dji.sample.wayline.model.param.CreateJobParam; -import com.dji.sample.wayline.model.param.UpdateJobParam; -import com.dji.sample.wayline.service.IFlightTaskService; -import com.dji.sample.wayline.service.IWaylineFileService; -import com.dji.sample.wayline.service.IWaylineJobService; -import com.dji.sample.wayline.service.IWaylineRedisService; -import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; -import com.dji.sdk.cloudapi.media.UploadFlighttaskMediaPrioritize; -import com.dji.sdk.cloudapi.media.api.AbstractMediaService; -import com.dji.sdk.cloudapi.wayline.*; -import com.dji.sdk.cloudapi.wayline.api.AbstractWaylineService; -import com.dji.sdk.common.HttpResultResponse; -import com.dji.sdk.common.SDKManager; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; -import com.dji.sdk.mqtt.services.ServicesReplyData; -import com.dji.sdk.mqtt.services.TopicServicesResponse; +package org.dromara.sample.wayline.service.impl; + +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; +import org.dromara.common.sdk.cloudapi.media.UploadFlighttaskMediaPrioritize; +import org.dromara.common.sdk.cloudapi.media.api.AbstractMediaService; +import org.dromara.common.sdk.cloudapi.wayline.*; +import org.dromara.common.sdk.cloudapi.wayline.api.AbstractWaylineService; +import org.dromara.common.sdk.common.HttpResultResponse; +import org.dromara.common.sdk.common.SDKManager; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.sdk.mqtt.services.ServicesReplyData; +import org.dromara.common.sdk.mqtt.services.TopicServicesResponse; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.component.mqtt.model.EventsReceiver; + +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.media.model.MediaFileCountDTO; +import org.dromara.sample.media.service.IMediaRedisService; +import org.dromara.sample.wayline.model.dto.ConditionalWaylineJobKey; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.model.dto.WaylineTaskConditionDTO; +import org.dromara.sample.wayline.model.enums.WaylineErrorCodeEnum; +import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum; +import org.dromara.sample.wayline.model.param.CreateJobParam; +import org.dromara.sample.wayline.model.param.UpdateJobParam; +import org.dromara.sample.wayline.service.IFlightTaskService; +import org.dromara.sample.wayline.service.IWaylineFileService; +import org.dromara.sample.wayline.service.IWaylineJobService; +import org.dromara.sample.wayline.service.IWaylineRedisService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpStatus; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.messaging.MessageHeaders; @@ -62,9 +63,6 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl @Autowired private ObjectMapper mapper; - @Autowired - private IWebSocketMessageService websocketMessageService; - @Autowired private IWaylineJobService waylineJobService; @@ -224,7 +222,8 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl } @Override - public HttpResultResponse publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException { + public HttpResultResponse publishFlightTask(CreateJobParam param) throws SQLException { + LoginUser loginUser = LoginHelper.getLoginUser(); fillImmediateTime(param); for (Long taskDay : param.getTaskDays()) { LocalDate date = LocalDate.ofInstant(Instant.ofEpochSecond(taskDay), ZoneId.systemDefault()); @@ -238,7 +237,7 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl continue; } - Optional waylineJobOpt = waylineJobService.createWaylineJob(param, customClaim.getWorkspaceId(), customClaim.getUsername(), beginTime, endTime); + Optional waylineJobOpt = waylineJobService.createWaylineJob(param, loginUser.getTenantId(), loginUser.getUsername(), beginTime, endTime); if (waylineJobOpt.isEmpty()) { throw new SQLException("无法创建路线作业。"); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java index a129b66..62d07d1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java @@ -1,27 +1,27 @@ -package com.dji.sample.wayline.service.impl; - -import com.dji.sample.common.error.CommonErrorEnum; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.websocket.model.BizCodeEnum; -import com.dji.sample.component.websocket.service.IWebSocketMessageService; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.model.enums.UserTypeEnum; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.media.model.MediaFileCountDTO; -import com.dji.sample.media.service.IMediaRedisService; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum; -import com.dji.sample.wayline.service.IWaylineFileService; -import com.dji.sample.wayline.service.IWaylineJobService; -import com.dji.sample.wayline.service.IWaylineRedisService; -import com.dji.sdk.cloudapi.wayline.*; -import com.dji.sdk.cloudapi.wayline.api.AbstractWaylineService; -import com.dji.sdk.mqtt.MqttReply; -import com.dji.sdk.mqtt.events.EventsDataRequest; -import com.dji.sdk.mqtt.events.TopicEventsRequest; -import com.dji.sdk.mqtt.events.TopicEventsResponse; -import com.dji.sdk.mqtt.requests.TopicRequestsRequest; -import com.dji.sdk.mqtt.requests.TopicRequestsResponse; +package org.dromara.sample.wayline.service.impl; + +import org.dromara.common.sdk.cloudapi.wayline.*; +import org.dromara.common.sdk.cloudapi.wayline.api.AbstractWaylineService; +import org.dromara.common.sdk.mqtt.MqttReply; +import org.dromara.common.sdk.mqtt.events.EventsDataRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsRequest; +import org.dromara.common.sdk.mqtt.events.TopicEventsResponse; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsRequest; +import org.dromara.common.sdk.mqtt.requests.TopicRequestsResponse; +import org.dromara.common.websocket.dto.BizCodeEnum; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.sample.common.error.CommonErrorEnum; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.model.enums.UserTypeEnum; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.media.model.MediaFileCountDTO; +import org.dromara.sample.media.service.IMediaRedisService; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum; +import org.dromara.sample.wayline.service.IWaylineFileService; +import org.dromara.sample.wayline.service.IWaylineJobService; +import org.dromara.sample.wayline.service.IWaylineRedisService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.MessageHeaders; @@ -53,9 +53,6 @@ public class SDKWaylineService extends AbstractWaylineService { @Autowired private IMediaRedisService mediaRedisService; - @Autowired - private IWebSocketMessageService webSocketMessageService; - @Autowired private IWaylineJobService waylineJobService; @@ -112,8 +109,7 @@ public class SDKWaylineService extends AbstractWaylineService { waylineRedisService.delRunningWaylineJob(response.getGateway()); waylineRedisService.delPausedWaylineJob(response.getBid()); } - - webSocketMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(), + WebSocketUtils.publishAll(UserTypeEnum.WEB.getVal(), BizCodeEnum.FLIGHT_TASK_PROGRESS.getCode(), eventsReceiver); return new TopicEventsResponse<>(); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java index d90a98e..aa16927 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java @@ -1,28 +1,30 @@ -package com.dji.sample.wayline.service.impl; +package org.dromara.sample.wayline.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.component.oss.model.OssConfiguration; -import com.dji.sample.component.oss.service.impl.OssServiceContext; -import com.dji.sample.wayline.dao.IWaylineFileMapper; -import com.dji.sample.wayline.model.dto.KmzFileProperties; -import com.dji.sample.wayline.model.dto.WaylineFileDTO; -import com.dji.sample.wayline.model.entity.WaylineFileEntity; -import com.dji.sample.wayline.service.IWaylineFileService; -import com.dji.sdk.cloudapi.device.DeviceDomainEnum; -import com.dji.sdk.cloudapi.device.DeviceEnum; -import com.dji.sdk.cloudapi.device.DeviceSubTypeEnum; -import com.dji.sdk.cloudapi.device.DeviceTypeEnum; -import com.dji.sdk.cloudapi.wayline.GetWaylineListRequest; -import com.dji.sdk.cloudapi.wayline.GetWaylineListResponse; -import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; + +import jodd.util.StringUtil; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Node; import org.dom4j.io.SAXReader; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceSubTypeEnum; +import org.dromara.common.sdk.cloudapi.device.DeviceTypeEnum; +import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListRequest; +import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListResponse; +import org.dromara.common.sdk.cloudapi.wayline.WaylineTypeEnum; +import org.dromara.common.sdk.common.Pagination; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.wayline.dao.IWaylineFileMapper; +import org.dromara.sample.wayline.model.dto.KmzFileProperties; +import org.dromara.sample.wayline.model.dto.WaylineFileDTO; +import org.dromara.sample.wayline.model.entity.WaylineFileEntity; +import org.dromara.sample.wayline.service.IWaylineFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +43,7 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import static com.dji.sample.wayline.model.dto.KmzFileProperties.WAYLINE_FILE_SUFFIX; +import static org.dromara.sample.wayline.model.dto.KmzFileProperties.WAYLINE_FILE_SUFFIX; /** * @author sean @@ -55,9 +57,6 @@ public class WaylineFileServiceImpl implements IWaylineFileService { @Autowired private IWaylineFileMapper mapper; - @Autowired - private OssServiceContext ossService; - @Override public PaginationData getWaylinesByParam(String workspaceId, GetWaylineListRequest param) { // Paging Query @@ -110,7 +109,8 @@ public class WaylineFileServiceImpl implements IWaylineFileService { if (waylineOpt.isEmpty()) { throw new SQLException(waylineId + " 不存在。"); } - return ossService.getObjectUrl(OssConfiguration.bucket, waylineOpt.get().getObjectKey()); + OssClient storage = OssFactory.instance("wayline_file"); + return storage.getPrivateUrlURL(waylineOpt.get().getObjectKey(), 3600); } @Override @@ -120,10 +120,12 @@ public class WaylineFileServiceImpl implements IWaylineFileService { file.setWorkspaceId(workspaceId); if (!StringUtils.hasText(file.getSign())) { - try (InputStream object = ossService.getObject(OssConfiguration.bucket, metadata.getObjectKey())) { + OssClient storage = OssFactory.instance("wayline_file"); + String privateUrl = storage.getPrivateUrl(metadata.getObjectKey(), 3600); + try (InputStream object = storage.getObjectContent(privateUrl)) { if (object.available() == 0) { throw new RuntimeException("文件 " + metadata.getObjectKey() + - " 桶中不存在[" + OssConfiguration.bucket + "]."); + " 桶中不存在[ wayline_file ]."); } file.setSign(DigestUtils.md5DigestAsHex(object)); } catch (IOException e) { @@ -172,7 +174,9 @@ public class WaylineFileServiceImpl implements IWaylineFileService { if (!isDel) { return false; } - return ossService.deleteObject(OssConfiguration.bucket, wayline.getObjectKey()); + OssClient storage = OssFactory.instance("wayline_file"); + storage.delete(wayline.getObjectKey()); + return true; } @Override @@ -181,12 +185,13 @@ public class WaylineFileServiceImpl implements IWaylineFileService { if (waylineFileOpt.isEmpty()) { throw new RuntimeException("文件格式不正确。"); } - try { WaylineFileDTO waylineFile = waylineFileOpt.get(); waylineFile.setUsername(creator); - - ossService.putObject(OssConfiguration.bucket, waylineFile.getObjectKey(), file.getInputStream()); + OssClient storage = OssFactory.instance("wayline_file"); + String originalfileName = file.getOriginalFilename(); + String suffix = org.apache.commons.lang3.StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); + storage.uploadSuffix( file.getBytes(),suffix,file.getContentType()); this.saveWaylineFile(workspaceId, waylineFile); } catch (IOException e) { e.printStackTrace(); @@ -232,11 +237,11 @@ public class WaylineFileServiceImpl implements IWaylineFileService { DeviceTypeEnum payloadType = DeviceTypeEnum.find(Integer.parseInt(payloadNode.valueOf(KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_PAYLOAD_ENUM_VALUE))); DeviceSubTypeEnum payloadSubType = DeviceSubTypeEnum.find(Integer.parseInt(payloadNode.valueOf(KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_PAYLOAD_SUB_ENUM_VALUE))); String templateType = document.valueOf("//" + KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_TEMPLATE_TYPE); - + OssClient storage = OssFactory.instance("wayline_file"); return Optional.of(WaylineFileDTO.builder() .droneModelKey(DeviceEnum.find(DeviceDomainEnum.DRONE, type, subType).getDevice()) .payloadModelKeys(List.of(DeviceEnum.find(DeviceDomainEnum.PAYLOAD, payloadType, payloadSubType).getDevice())) - .objectKey((OssConfiguration.objectDirPrefix + File.separator + filename).replace("\\","/")) + .objectKey((storage.getOssProperties().getPrefix() + File.separator + filename).replace("\\","/")) .name(filename.substring(0, filename.lastIndexOf(WAYLINE_FILE_SUFFIX))) .sign(DigestUtils.md5DigestAsHex(file.getInputStream())) .templateTypes(List.of(WaylineTypeEnum.find(templateType).getValue())) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java index 9724f04..49f8d7c 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java @@ -1,31 +1,31 @@ -package com.dji.sample.wayline.service.impl; +package org.dromara.sample.wayline.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.manage.model.dto.DeviceDTO; -import com.dji.sample.manage.service.IDeviceRedisService; -import com.dji.sample.manage.service.IDeviceService; -import com.dji.sample.media.model.MediaFileCountDTO; -import com.dji.sample.media.service.IFileService; -import com.dji.sample.wayline.dao.IWaylineJobMapper; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.model.entity.WaylineJobEntity; -import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum; -import com.dji.sample.wayline.model.param.CreateJobParam; -import com.dji.sample.wayline.service.IWaylineFileService; -import com.dji.sample.wayline.service.IWaylineJobService; -import com.dji.sample.wayline.service.IWaylineRedisService; -import com.dji.sdk.cloudapi.device.DockModeCodeEnum; -import com.dji.sdk.cloudapi.device.DroneModeCodeEnum; -import com.dji.sdk.cloudapi.device.OsdDock; -import com.dji.sdk.cloudapi.device.OsdDockDrone; -import com.dji.sdk.cloudapi.wayline.*; -import com.dji.sdk.common.Pagination; -import com.dji.sdk.common.PaginationData; +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.sdk.cloudapi.device.DockModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.DroneModeCodeEnum; +import org.dromara.common.sdk.cloudapi.device.OsdDock; +import org.dromara.common.sdk.cloudapi.device.OsdDockDrone; +import org.dromara.common.sdk.cloudapi.wayline.*; +import org.dromara.common.sdk.common.Pagination; +import org.dromara.common.sdk.common.PaginationData; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.manage.model.dto.DeviceDTO; +import org.dromara.sample.manage.service.IDeviceRedisService; +import org.dromara.sample.manage.service.IDeviceService; +import org.dromara.sample.media.model.MediaFileCountDTO; +import org.dromara.sample.media.service.IFileService; +import org.dromara.sample.wayline.dao.IWaylineJobMapper; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.model.entity.WaylineJobEntity; +import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum; +import org.dromara.sample.wayline.model.param.CreateJobParam; +import org.dromara.sample.wayline.service.IWaylineFileService; +import org.dromara.sample.wayline.service.IWaylineJobService; +import org.dromara.sample.wayline.service.IWaylineRedisService; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java index fc62020..43b4157 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineRedisServiceImpl.java @@ -1,12 +1,13 @@ -package com.dji.sample.wayline.service.impl; - -import com.dji.sample.component.mqtt.model.EventsReceiver; -import com.dji.sample.component.redis.RedisConst; -import com.dji.sample.component.redis.RedisOpsUtils; -import com.dji.sample.wayline.model.dto.ConditionalWaylineJobKey; -import com.dji.sample.wayline.model.dto.WaylineJobDTO; -import com.dji.sample.wayline.service.IWaylineRedisService; -import com.dji.sdk.cloudapi.wayline.FlighttaskProgress; +package org.dromara.sample.wayline.service.impl; + + +import org.dromara.common.redis.config.RedisConst; +import org.dromara.common.redis.utils.RedisOpsUtils; +import org.dromara.common.sdk.cloudapi.wayline.FlighttaskProgress; +import org.dromara.sample.component.mqtt.model.EventsReceiver; +import org.dromara.sample.wayline.model.dto.ConditionalWaylineJobKey; +import org.dromara.sample.wayline.model.dto.WaylineJobDTO; +import org.dromara.sample.wayline.service.IWaylineRedisService; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/dk-modules/sample/src/main/resources/application.yml b/dk-modules/sample/src/main/resources/application.yml index d8b94d5..ddf661f 100644 --- a/dk-modules/sample/src/main/resources/application.yml +++ b/dk-modules/sample/src/main/resources/application.yml @@ -17,34 +17,17 @@ spring: max-active: 20 max-wait: 60000 - redis: - host: 127.0.0.1 - port: 6379 - database: 5 - username: # if you enable - password: 123456 - lettuce: - pool: - max-active: 8 - max-idle: 8 - min-idle: 0 servlet: multipart: max-file-size: 2GB max-request-size: 2GB -jwt: - issuer: DJI - subject: CloudApiSample - secret: CloudApiSample - age: 86400 - mqtt: - # @see com.dji.sample.component.mqtt.model.MqttUseEnum + # @see org.dromara.sample.component.mqtt.model.MqttUseEnum # BASIC parameters are required. BASIC: - protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum + protocol: MQTT # @see org.dromara.sample.component.mqtt.model.MqttProtocolEnum host: 114.235.183.162 port: 1883 username: adminPCBASIC @@ -53,7 +36,7 @@ mqtt: # If the protocol is ws/wss, this value is required. path: DRC: - protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum + protocol: WS # @see org.dromara.sample.component.mqtt.model.MqttProtocolEnum host: 114.235.183.162 port: 8083 path: /mqtt @@ -85,46 +68,6 @@ url: prefix: control version: /api/v1 -# Tutorial: https://www.alibabacloud.com/help/en/object-storage-service/latest/use-a-temporary-credential-provided-by-sts-to-access-oss -#oss: -# enable: true -# provider: ALIYUN # @see com.dji.sample.component.OssConfiguration.model.enums.OssTypeEnum -# endpoint: http://oss-cn-hangzhou.aliyuncs.com -# access-key: LTAI5tMDFvYZRvrJfK7HeuEm -# secret-key: kP7ueRlhLbM9mvkaLtHfcje3GxgawH -# expire: 3600 -# region: oss-cn-hangzhou # cn-hangzhou -# role-session-name: ossRam -# role-arn: acs:ram::1454407249617199:role/ossram # acs:ram::123456789:role/stsrole -# bucket: yq-dajiang -# object-dir-prefix: goucong - -#oss: -# enable: true -# provider: aws -# endpoint: http://eos-wuxi-1.cmecloud.cn -# access-key: LHJPESZYDZ3ZMC79SZ6V -# secret-key: DnIBjpaBotuO9TD0izb9GbyLFt5jf2F3VQqOje5f -# expire: 3600 -# region: eos-wuxi-1 -# role-session-name: goucong -# role-arn: arn:aws:s3:::dikongtyx/goucong -# bucket: dikongtyx -# object-dir-prefix: goucong - -oss: - enable: true - provider: MINIO - endpoint: http://eos-wuxi-1.cmecloud.cn - access-key: B4E9TC3WUV2DAXZ4P625 - secret-key: Px3VINH6TghgSg11gX5Z59AxxxASB8y9tEsNACNh - bucket: dikongtyx - expire: 3600 - region: wuxi1 - object-dir-prefix: goucong - - - logging: level: com.dji: debug diff --git a/dk-modules/system/pom.xml b/dk-modules/system/pom.xml index bfaf2e9..6ed43f7 100644 --- a/dk-modules/system/pom.xml +++ b/dk-modules/system/pom.xml @@ -48,12 +48,6 @@ common-web - - org.dromara - common-cloudsdk - 2.2.2 - - org.dromara common-mybatis diff --git a/pom.xml b/pom.xml index 9855181..390fe57 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ 1.0.3 6.4.1 1.7.0 + 3.12.0