diff --git a/pom.xml b/pom.xml index 249aa19..5502fd0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.12 + 3.1.3 @@ -15,19 +15,20 @@ cloud-api-sample - 11 - 3.4.2 - 1.2.6 + 21 + 3.5.3.2 + 1.2.18 3.12.1 - 5.5.5 - 8.3.7 - 4.9.1 - 3.1.0 - 3.12.0 - 1.1.1 - 2.3.3 - 2.15.0 - 2.3.0 + 6.1.2 + 8.5.4 + 4.11.0 + 3.1.1 + 3.17.1 + 2.20.0 + 8.1.0 + 1.18.30 + 2.2 + 24.0.1 @@ -35,16 +36,17 @@ org.springframework.boot spring-boot-starter-web - + - mysql - mysql-connector-java - 8.0.31 + org.yaml + snakeyaml + ${snakeyaml.version} org.projectlombok lombok + ${lombok.version} true @@ -59,12 +61,19 @@ ${mybatis-plus.version} + com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter ${druid.version} + + com.mysql + mysql-connector-j + ${mysql-connector-j.version} + + com.auth0 java-jwt @@ -81,10 +90,11 @@ org.springframework.boot spring-boot-starter-websocket + org.jetbrains annotations - RELEASE + ${jetbrains.annotations.version} compile @@ -112,22 +122,6 @@ ${aliyun-oss.version} - - javax.xml.bind - jaxb-api - - - javax.activation - activation - ${javax-activation.version} - - - - org.glassfish.jaxb - jaxb-runtime - ${glassfish-jaxb.version} - - org.springframework.boot spring-boot-starter-data-redis @@ -140,12 +134,12 @@ com.amazonaws aws-java-sdk-s3 - 1.12.261 + 1.12.528 com.amazonaws aws-java-sdk-sts - 1.12.261 + 1.12.528 @@ -159,32 +153,41 @@ - org.dom4j - dom4j - 2.1.3 + org.bouncycastle + bcpkix-jdk18on + 1.76 - jaxen - jaxen + org.springframework.boot + spring-boot-starter-validation - org.bouncycastle - bcpkix-jdk15on - 1.69 + org.springdoc + springdoc-openapi-ui + 1.7.0 org.springframework.boot - spring-boot-starter-validation + spring-boot-docker-compose + true - - org.springdoc - springdoc-openapi-ui - 1.7.0 + org.dom4j + dom4j + 2.1.4 + + + jaxen + jaxen + + + org.json + json + 20230618 diff --git a/src/main/java/com/dji/sample/component/AuthInterceptor.java b/src/main/java/com/dji/sample/component/AuthInterceptor.java index 9933466..0267ca7 100644 --- a/src/main/java/com/dji/sample/component/AuthInterceptor.java +++ b/src/main/java/com/dji/sample/component/AuthInterceptor.java @@ -3,6 +3,8 @@ 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 jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -11,8 +13,6 @@ 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 diff --git a/src/main/java/com/dji/sample/component/CorsFilter.java b/src/main/java/com/dji/sample/component/CorsFilter.java index a4c245f..d997738 100644 --- a/src/main/java/com/dji/sample/component/CorsFilter.java +++ b/src/main/java/com/dji/sample/component/CorsFilter.java @@ -1,10 +1,10 @@ package com.dji.sample.component; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; 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; @@ -32,4 +32,4 @@ public class CorsFilter implements Filter { } filterChain.doFilter(request, response); } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java b/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java index 10e109a..3e0f1f1 100644 --- a/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java +++ b/src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java @@ -16,10 +16,10 @@ 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 jakarta.annotation.PostConstruct; 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; @@ -37,7 +37,7 @@ import java.util.Objects; public class AmazonS3ServiceImpl implements IOssService { private AmazonS3 client; - + @Override public OssTypeEnum getOssType() { return OssTypeEnum.AWS; @@ -120,6 +120,6 @@ public class AmazonS3ServiceImpl implements IOssService { client.setBucketCrossOriginConfiguration(OssConfiguration.bucket, new BucketCrossOriginConfiguration().withRules(rule)); - + } } diff --git a/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java b/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java index 5039094..d50e422 100644 --- a/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java +++ b/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java @@ -14,6 +14,8 @@ import org.springframework.stereotype.Service; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -29,7 +31,7 @@ import java.util.Objects; public class MinIOServiceImpl implements IOssService { private MinioClient client; - + @Override public OssTypeEnum getOssType() { return OssTypeEnum.MINIO; @@ -52,15 +54,15 @@ public class MinIOServiceImpl implements IOssService { @Override public URL getObjectUrl(String bucket, String objectKey) { try { - return new URL( + return new URI( client.getPresignedObjectUrl( GetPresignedObjectUrlArgs.builder() .method(Method.GET) .bucket(bucket) .object(objectKey) .expiry(Math.toIntExact(OssConfiguration.expire)) - .build())); - } catch (ErrorResponseException | InsufficientDataException | InternalException | + .build())).toURL(); + } catch (ErrorResponseException | URISyntaxException | InsufficientDataException | InternalException | InvalidKeyException | InvalidResponseException | IOException | NoSuchAlgorithmException | XmlParserException | ServerException e) { throw new RuntimeException("The file does not exist on the OssConfiguration."); diff --git a/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java b/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java index 05fbd2d..e99e9ac 100644 --- a/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java +++ b/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java @@ -11,7 +11,7 @@ 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 jakarta.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.Map; import java.util.Optional; @@ -67,4 +67,4 @@ public class AuthPrincipalHandler extends DefaultHandshakeHandler { } return () -> null; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/control/controller/DockController.java b/src/main/java/com/dji/sample/control/controller/DockController.java index 3146d9d..52538fb 100644 --- a/src/main/java/com/dji/sample/control/controller/DockController.java +++ b/src/main/java/com/dji/sample/control/controller/DockController.java @@ -5,12 +5,11 @@ 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 jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - /** * @author sean * @version 1.2 diff --git a/src/main/java/com/dji/sample/control/controller/DrcController.java b/src/main/java/com/dji/sample/control/controller/DrcController.java index f40670c..fce21d0 100644 --- a/src/main/java/com/dji/sample/control/controller/DrcController.java +++ b/src/main/java/com/dji/sample/control/controller/DrcController.java @@ -7,12 +7,12 @@ 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; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; 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; diff --git a/src/main/java/com/dji/sample/control/model/param/DrcModeParam.java b/src/main/java/com/dji/sample/control/model/param/DrcModeParam.java index d483da1..a9248a6 100644 --- a/src/main/java/com/dji/sample/control/model/param/DrcModeParam.java +++ b/src/main/java/com/dji/sample/control/model/param/DrcModeParam.java @@ -1,14 +1,14 @@ package com.dji.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/src/main/java/com/dji/sample/control/model/param/DronePayloadParam.java b/src/main/java/com/dji/sample/control/model/param/DronePayloadParam.java index de9aa21..6318b2a 100644 --- a/src/main/java/com/dji/sample/control/model/param/DronePayloadParam.java +++ b/src/main/java/com/dji/sample/control/model/param/DronePayloadParam.java @@ -3,12 +3,11 @@ package com.dji.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.hibernate.validator.constraints.Range; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - /** * @author sean * @version 1.4 diff --git a/src/main/java/com/dji/sample/control/model/param/FlyToPointParam.java b/src/main/java/com/dji/sample/control/model/param/FlyToPointParam.java index d003c67..eda0878 100644 --- a/src/main/java/com/dji/sample/control/model/param/FlyToPointParam.java +++ b/src/main/java/com/dji/sample/control/model/param/FlyToPointParam.java @@ -1,14 +1,14 @@ package com.dji.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.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/src/main/java/com/dji/sample/control/model/param/PayloadCommandsParam.java b/src/main/java/com/dji/sample/control/model/param/PayloadCommandsParam.java index f5c4a6e..6c136f9 100644 --- a/src/main/java/com/dji/sample/control/model/param/PayloadCommandsParam.java +++ b/src/main/java/com/dji/sample/control/model/param/PayloadCommandsParam.java @@ -1,10 +1,10 @@ package com.dji.sample.control.model.param; import com.dji.sample.control.model.enums.PayloadCommandsEnum; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sample/control/model/param/RemoteDebugParam.java b/src/main/java/com/dji/sample/control/model/param/RemoteDebugParam.java index 8678d3a..2984592 100644 --- a/src/main/java/com/dji/sample/control/model/param/RemoteDebugParam.java +++ b/src/main/java/com/dji/sample/control/model/param/RemoteDebugParam.java @@ -1,8 +1,8 @@ package com.dji.sample.control.model.param; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java b/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java index d2e79fc..75c385d 100644 --- a/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java +++ b/src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java @@ -5,12 +5,12 @@ 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.hibernate.validator.constraints.Range; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java b/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java index 6425bbb..7514ffc 100644 --- a/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java +++ b/src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java @@ -10,14 +10,13 @@ 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; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; 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; diff --git a/src/main/java/com/dji/sample/manage/controller/DeviceLogsController.java b/src/main/java/com/dji/sample/manage/controller/DeviceLogsController.java index 3e08d53..4ecc9c2 100644 --- a/src/main/java/com/dji/sample/manage/controller/DeviceLogsController.java +++ b/src/main/java/com/dji/sample/manage/controller/DeviceLogsController.java @@ -9,12 +9,12 @@ 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 jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; 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; diff --git a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java index 27f1a64..6cba122 100644 --- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java +++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java @@ -6,11 +6,11 @@ import com.dji.sample.manage.model.dto.LiveTypeDTO; import com.dji.sample.manage.service.ILiveStreamService; import com.dji.sdk.common.HttpResultResponse; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; 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; @@ -82,4 +82,4 @@ public class LiveStreamController { return liveStreamService.liveLensChange(liveParam); } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/manage/controller/LoginController.java b/src/main/java/com/dji/sample/manage/controller/LoginController.java index 9572dbb..edabd69 100644 --- a/src/main/java/com/dji/sample/manage/controller/LoginController.java +++ b/src/main/java/com/dji/sample/manage/controller/LoginController.java @@ -5,6 +5,8 @@ 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 jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PostMapping; @@ -12,8 +14,6 @@ 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; diff --git a/src/main/java/com/dji/sample/manage/controller/TopologyController.java b/src/main/java/com/dji/sample/manage/controller/TopologyController.java index 10908d2..709ed8c 100644 --- a/src/main/java/com/dji/sample/manage/controller/TopologyController.java +++ b/src/main/java/com/dji/sample/manage/controller/TopologyController.java @@ -5,11 +5,11 @@ 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.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; /** diff --git a/src/main/java/com/dji/sample/manage/controller/UserController.java b/src/main/java/com/dji/sample/manage/controller/UserController.java index 5536948..81ee789 100644 --- a/src/main/java/com/dji/sample/manage/controller/UserController.java +++ b/src/main/java/com/dji/sample/manage/controller/UserController.java @@ -5,11 +5,10 @@ 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 jakarta.servlet.http.HttpServletRequest; 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; diff --git a/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java b/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java index 80110ac..4bb7f12 100644 --- a/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java +++ b/src/main/java/com/dji/sample/manage/controller/WorkspaceController.java @@ -4,12 +4,12 @@ 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.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; @@ -38,4 +38,4 @@ public class WorkspaceController { return workspaceOpt.isEmpty() ? HttpResultResponse.error() : HttpResultResponse.success(workspaceOpt.get()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java b/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java index fbfe916..496d49c 100644 --- a/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java +++ b/src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java @@ -2,12 +2,12 @@ package com.dji.sample.manage.model.common; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareQueryParam.java b/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareQueryParam.java index ffcc8fb..cd38e80 100644 --- a/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareQueryParam.java +++ b/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareQueryParam.java @@ -1,12 +1,12 @@ package com.dji.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/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUpdateParam.java b/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUpdateParam.java index 45c357d..e5828f9 100644 --- a/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUpdateParam.java +++ b/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUpdateParam.java @@ -1,8 +1,8 @@ package com.dji.sample.manage.model.param; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUploadParam.java b/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUploadParam.java index deeb67f..4531f71 100644 --- a/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUploadParam.java +++ b/src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUploadParam.java @@ -1,9 +1,9 @@ package com.dji.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/src/main/java/com/dji/sample/manage/service/impl/DeviceRedisServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DeviceRedisServiceImpl.java index 4d01f56..6758dc6 100644 --- a/src/main/java/com/dji/sample/manage/service/impl/DeviceRedisServiceImpl.java +++ b/src/main/java/com/dji/sample/manage/service/impl/DeviceRedisServiceImpl.java @@ -78,7 +78,7 @@ public class DeviceRedisServiceImpl implements IDeviceRedisService { @Override public void addEndHmsKeys(String sn, String... keys) { - RedisOpsUtils.listRPush(RedisConst.HMS_PREFIX + sn, keys); + RedisOpsUtils.listRPush(RedisConst.HMS_PREFIX + sn, (Object[]) keys); } @Override diff --git a/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java index f5bbe95..16c047b 100644 --- a/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java @@ -330,7 +330,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; @@ -680,4 +680,4 @@ public class DeviceServiceImpl implements IDeviceService { .deviceDesc(dto.getDeviceDesc()) .build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/map/controller/WorkspaceElementController.java b/src/main/java/com/dji/sample/map/controller/WorkspaceElementController.java index ce65c19..3d3d9ca 100644 --- a/src/main/java/com/dji/sample/map/controller/WorkspaceElementController.java +++ b/src/main/java/com/dji/sample/map/controller/WorkspaceElementController.java @@ -9,14 +9,14 @@ 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; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; 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 jakarta.servlet.http.HttpServletRequest; import java.util.List; import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM; @@ -73,7 +73,7 @@ public class WorkspaceElementController implements IHttpMapService { */ @Override public HttpResultResponse createMapElement(String workspaceId, String groupId, - @Valid CreateMapElementRequest elementCreate, HttpServletRequest req, HttpServletResponse rsp) { + @Valid CreateMapElementRequest elementCreate, HttpServletRequest req, HttpServletResponse rsp) { CustomClaim claims = (CustomClaim) req.getAttribute(TOKEN_CLAIM); // Set the creator of the element elementCreate.getResource().setUsername(claims.getUsername()); @@ -118,4 +118,4 @@ public class WorkspaceElementController implements IHttpMapService { return elementService.deleteElement(workspaceId, elementId); } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java index 3934014..49e8f2d 100644 --- a/src/main/java/com/dji/sample/media/controller/FileController.java +++ b/src/main/java/com/dji/sample/media/controller/FileController.java @@ -7,7 +7,7 @@ import com.dji.sdk.common.PaginationData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/com/dji/sample/media/controller/MediaController.java b/src/main/java/com/dji/sample/media/controller/MediaController.java index ec21a54..a5d3a02 100644 --- a/src/main/java/com/dji/sample/media/controller/MediaController.java +++ b/src/main/java/com/dji/sample/media/controller/MediaController.java @@ -4,13 +4,13 @@ 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 jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; 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; /** @@ -68,4 +68,4 @@ public class MediaController implements IHttpMediaService { public HttpResultResponse folderUploadCallback(String workspaceId, @Valid FolderUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sample/storage/controller/StorageController.java b/src/main/java/com/dji/sample/storage/controller/StorageController.java index 1097cb1..6ba4586 100644 --- a/src/main/java/com/dji/sample/storage/controller/StorageController.java +++ b/src/main/java/com/dji/sample/storage/controller/StorageController.java @@ -4,11 +4,11 @@ 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.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author sean diff --git a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java index 7b877f4..0c279ce 100644 --- a/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java +++ b/src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java @@ -8,6 +8,11 @@ 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; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -15,11 +20,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; 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; diff --git a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java index 5d8c259..8a564a0 100644 --- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java +++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java @@ -8,11 +8,11 @@ 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.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; diff --git a/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java b/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java index f1cdedd..d4783bc 100644 --- a/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java +++ b/src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java @@ -3,11 +3,11 @@ package com.dji.sample.wayline.model.param; import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum; 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.hibernate.validator.constraints.Range; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java index ae79c37..4f43e2c 100644 --- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java +++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java @@ -1,5 +1,7 @@ package com.dji.sample.wayline.service.impl; +import com.fasterxml.jackson.core.JsonPointer; +import org.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,10 +19,10 @@ 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 org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Node; +import org.dom4j.*; import org.dom4j.io.SAXReader; +import org.json.JSONPointer; +import org.json.XML; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -194,14 +196,16 @@ public class WaylineFileServiceImpl implements IWaylineFileService { nextEntry = unzipFile.getNextEntry(); continue; } + SAXReader reader = new SAXReader(); Document document = reader.read(unzipFile); if (!StandardCharsets.UTF_8.name().equals(document.getXMLEncoding())) { throw new RuntimeException("The file encoding format is incorrect."); } + Node droneNode =document.selectSingleNode( "//"+ KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_DRONE_INFO);; + + Node payloadNode = document.selectSingleNode("//"+KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_PAYLOAD_INFO );; - Node droneNode = document.selectSingleNode("//" + KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_DRONE_INFO); - Node payloadNode = document.selectSingleNode("//" + KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_PAYLOAD_INFO); if (Objects.isNull(droneNode) || Objects.isNull(payloadNode)) { throw new RuntimeException("The file format is incorrect."); } diff --git a/src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java b/src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java index f3a9bd2..bb4e729 100644 --- a/src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java @@ -1,8 +1,8 @@ package com.dji.sdk.cloudapi.config; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java index ab9ea9d..dd2fae7 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java @@ -2,10 +2,10 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java index 73de6a0..88a9bb2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java @@ -2,10 +2,10 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java index 37d00c8..5c1f1b2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.CameraModeEnum; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java index a2fef96..b0c333d 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java index f695c7d..8c696f5 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java index f98e268..ea15119 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java index 7c5bcf2..e4fe84a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java @@ -1,11 +1,11 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java b/src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java index 7b16c71..b758867 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java @@ -1,9 +1,8 @@ package com.dji.sdk.cloudapi.control; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** * @author sean * @version 1.3 diff --git a/src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java index e6ba180..1cc3cd2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java index 8af4ca9..aae6f7d 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; -import javax.validation.Valid; -import javax.validation.constraints.*; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java index 8030180..22e7b65 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java index 8ae23af..3187de9 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java index 4b99053..fad8323 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/Point.java b/src/main/java/com/dji/sdk/cloudapi/control/Point.java index f44e76c..04fcc3f 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/Point.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/Point.java @@ -1,8 +1,9 @@ package com.dji.sdk.cloudapi.control; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java b/src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java index 2c5424e..8c46954 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java @@ -6,11 +6,11 @@ import com.dji.sdk.cloudapi.device.RcLostActionEnum; import com.dji.sdk.cloudapi.wayline.RthModeEnum; import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.CloudSDKVersionEnum; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java b/src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java index 8ea9e77..faa5592 100644 --- a/src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java +++ b/src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java @@ -18,11 +18,11 @@ import com.dji.sdk.mqtt.events.TopicEventsResponse; import com.dji.sdk.mqtt.services.ServicesPublish; import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; import java.util.Objects; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java b/src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java index 78698bc..b43433f 100644 --- a/src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java @@ -1,8 +1,8 @@ package com.dji.sdk.cloudapi.debug; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java b/src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java index 0f7c584..842325c 100644 --- a/src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.debug; import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java b/src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java index c25f1ca..0f3099c 100644 --- a/src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.debug; import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java b/src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java index 974bbcc..3b300df 100644 --- a/src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.debug; import com.dji.sdk.cloudapi.device.BatteryStoreModeEnum; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java b/src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java index 2298a28..07d7aa7 100644 --- a/src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.debug; import com.dji.sdk.cloudapi.device.LinkWorkModeEnum; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java b/src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java index 1d3e6a1..5d8b89b 100644 --- a/src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java +++ b/src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java @@ -17,11 +17,11 @@ import com.dji.sdk.mqtt.services.ServicesPublish; import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; import java.util.Objects; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java b/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java index f540f48..943c598 100644 --- a/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java +++ b/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.device; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java b/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java index 57e17f5..f6f5040 100644 --- a/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.device; import com.dji.sdk.common.BaseModel; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java b/src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java index c3c842f..c208bb5 100644 --- a/src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java +++ b/src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java @@ -4,8 +4,8 @@ import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/dji/sdk/cloudapi/device/VideoId.java b/src/main/java/com/dji/sdk/cloudapi/device/VideoId.java index a61b77b..b4a425b 100644 --- a/src/main/java/com/dji/sdk/cloudapi/device/VideoId.java +++ b/src/main/java/com/dji/sdk/cloudapi/device/VideoId.java @@ -5,9 +5,9 @@ import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.constraints.NotNull; import org.springframework.util.StringUtils; -import javax.validation.constraints.NotNull; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java b/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java index bef65e7..20f5e3a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java +++ b/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java @@ -1,7 +1,8 @@ package com.dji.sdk.cloudapi.firmware; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java b/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java index 1c43792..2716c1a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.firmware; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java b/src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java index 44766de..94b53d5 100644 --- a/src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java +++ b/src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java @@ -14,11 +14,11 @@ import com.dji.sdk.mqtt.services.ServicesPublish; import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java index ff498b9..4e01426 100644 --- a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java @@ -2,8 +2,7 @@ package com.dji.sdk.cloudapi.livestream; import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.common.BaseModel; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java index 541b25e..a633dc1 100644 --- a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.livestream; import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java index 8748869..ac1ff5f 100644 --- a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.livestream; import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java index 9107c53..9a48510 100644 --- a/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java @@ -2,8 +2,7 @@ package com.dji.sdk.cloudapi.livestream; import com.dji.sdk.cloudapi.device.VideoId; import com.dji.sdk.common.BaseModel; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java b/src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java index 24597ea..29629f4 100644 --- a/src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java +++ b/src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java @@ -8,11 +8,11 @@ import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; import com.dji.sdk.mqtt.state.TopicStateRequest; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java index 229fd4c..3f7c2ae 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.log; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java index 751e38f..e84a522 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java @@ -1,7 +1,8 @@ package com.dji.sdk.cloudapi.log; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; + import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java index df0e6af..c9fbf95 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java @@ -1,8 +1,9 @@ package com.dji.sdk.cloudapi.log; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java index 366836a..e100a13 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java @@ -4,9 +4,9 @@ import com.dji.sdk.cloudapi.storage.CredentialsToken; import com.dji.sdk.cloudapi.storage.OssTypeEnum; import com.dji.sdk.cloudapi.storage.StsCredentialsResponse; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java index ce62daf..c8ac59e 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.log; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java b/src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java index b830901..00c71b2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java @@ -1,6 +1,7 @@ package com.dji.sdk.cloudapi.log; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java b/src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java index 8958fa8..c118be6 100644 --- a/src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java +++ b/src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java @@ -11,11 +11,11 @@ import com.dji.sdk.mqtt.services.ServicesPublish; import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java b/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java index 8c5947c..f0f9e46 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.map; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java b/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java index 26769ed..c92034b 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.map; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementContent.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementContent.java index b6aefbe..65b5820 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementContent.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementContent.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.map; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementCoordinate.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementCoordinate.java index 8932943..10011e8 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementCoordinate.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementCoordinate.java @@ -1,8 +1,8 @@ package com.dji.sdk.cloudapi.map; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementLineStringGeometry.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementLineStringGeometry.java index 5aef1cf..027ade6 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementLineStringGeometry.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementLineStringGeometry.java @@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.springframework.util.CollectionUtils; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementPointGeometry.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementPointGeometry.java index 5bed461..693a3db 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementPointGeometry.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementPointGeometry.java @@ -3,10 +3,9 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.springframework.util.CollectionUtils; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementPolygonGeometry.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementPolygonGeometry.java index 7068c9d..d04292a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementPolygonGeometry.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementPolygonGeometry.java @@ -4,10 +4,10 @@ import com.dji.sample.map.model.enums.ElementTypeEnum; import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.springframework.util.CollectionUtils; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementProperty.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementProperty.java index d3a35aa..ac7a625 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementProperty.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementProperty.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.map; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/ElementResource.java b/src/main/java/com/dji/sdk/cloudapi/map/ElementResource.java index 33571d2..e62140a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/ElementResource.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/ElementResource.java @@ -2,10 +2,8 @@ package com.dji.sdk.cloudapi.map; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * @author sean * @version 0.2 diff --git a/src/main/java/com/dji/sdk/cloudapi/map/GetMapElementsResponse.java b/src/main/java/com/dji/sdk/cloudapi/map/GetMapElementsResponse.java index d2b0c71..9d11ad8 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/GetMapElementsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/GetMapElementsResponse.java @@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/map/MapElementCreateWsResponse.java b/src/main/java/com/dji/sdk/cloudapi/map/MapElementCreateWsResponse.java index 74933f5..a38add3 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/MapElementCreateWsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/MapElementCreateWsResponse.java @@ -3,11 +3,11 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/MapElementDeleteWsResponse.java b/src/main/java/com/dji/sdk/cloudapi/map/MapElementDeleteWsResponse.java index fdf48ae..bb38c33 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/MapElementDeleteWsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/MapElementDeleteWsResponse.java @@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/MapElementUpdateWsResponse.java b/src/main/java/com/dji/sdk/cloudapi/map/MapElementUpdateWsResponse.java index 2ace077..7544d11 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/MapElementUpdateWsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/MapElementUpdateWsResponse.java @@ -3,11 +3,11 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/MapGroupElement.java b/src/main/java/com/dji/sdk/cloudapi/map/MapGroupElement.java index f360571..0c2126d 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/MapGroupElement.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/MapGroupElement.java @@ -2,11 +2,11 @@ package com.dji.sdk.cloudapi.map; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/MapGroupRefreshWsResponse.java b/src/main/java/com/dji/sdk/cloudapi/map/MapGroupRefreshWsResponse.java index b30c2ea..ffc44f2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/MapGroupRefreshWsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/MapGroupRefreshWsResponse.java @@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.map; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/map/UpdateMapElementRequest.java b/src/main/java/com/dji/sdk/cloudapi/map/UpdateMapElementRequest.java index 1c712be..c185423 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/UpdateMapElementRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/UpdateMapElementRequest.java @@ -1,9 +1,8 @@ package com.dji.sdk.cloudapi.map; import io.swagger.v3.oas.annotations.media.Schema; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/map/api/IHttpMapService.java b/src/main/java/com/dji/sdk/cloudapi/map/api/IHttpMapService.java index be0530b..10aa23d 100644 --- a/src/main/java/com/dji/sdk/cloudapi/map/api/IHttpMapService.java +++ b/src/main/java/com/dji/sdk/cloudapi/map/api/IHttpMapService.java @@ -9,11 +9,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.util.List; /** @@ -121,4 +121,4 @@ public interface IHttpMapService { @PathVariable(name = "element_id") String elementId, HttpServletRequest req, HttpServletResponse rsp); -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/media/FastUploadExtension.java b/src/main/java/com/dji/sdk/cloudapi/media/FastUploadExtension.java index 5426ceb..c51ce5c 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/FastUploadExtension.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/FastUploadExtension.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.media; import com.dji.sdk.cloudapi.device.DeviceEnum; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/FolderUploadCallbackRequest.java b/src/main/java/com/dji/sdk/cloudapi/media/FolderUploadCallbackRequest.java index 78abab4..bc3d1ef 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/FolderUploadCallbackRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/FolderUploadCallbackRequest.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.media; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintRequest.java b/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintRequest.java index 7fe08bb..e15435a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintRequest.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.media; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintResponse.java b/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintResponse.java index d0ab21a..3ec0c66 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintResponse.java @@ -4,8 +4,8 @@ package com.dji.sdk.cloudapi.media; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/media/MediaFastUploadRequest.java b/src/main/java/com/dji/sdk/cloudapi/media/MediaFastUploadRequest.java index 78c22b3..29e08ae 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/MediaFastUploadRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/MediaFastUploadRequest.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.media; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/MediaFileExtension.java b/src/main/java/com/dji/sdk/cloudapi/media/MediaFileExtension.java index 8e2f7c9..3491c66 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/MediaFileExtension.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/MediaFileExtension.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.media; import com.dji.sdk.cloudapi.device.DeviceEnum; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/MediaFileMetadata.java b/src/main/java/com/dji/sdk/cloudapi/media/MediaFileMetadata.java index 5a5a17b..2051e70 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/MediaFileMetadata.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/MediaFileMetadata.java @@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.media; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/media/MediaUploadCallbackRequest.java b/src/main/java/com/dji/sdk/cloudapi/media/MediaUploadCallbackRequest.java index 6567ea3..cac79a8 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/MediaUploadCallbackRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/MediaUploadCallbackRequest.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.media; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/Position.java b/src/main/java/com/dji/sdk/cloudapi/media/Position.java index f192f6e..aa7faef 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/Position.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/Position.java @@ -1,8 +1,8 @@ package com.dji.sdk.cloudapi.media; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/UploadFlighttaskMediaPrioritize.java b/src/main/java/com/dji/sdk/cloudapi/media/UploadFlighttaskMediaPrioritize.java index 59c197f..b9a0da1 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/UploadFlighttaskMediaPrioritize.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/UploadFlighttaskMediaPrioritize.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.media; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/api/AbstractMediaService.java b/src/main/java/com/dji/sdk/cloudapi/media/api/AbstractMediaService.java index 1aa0afa..b0827c2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/api/AbstractMediaService.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/api/AbstractMediaService.java @@ -14,10 +14,10 @@ import com.dji.sdk.mqtt.requests.TopicRequestsResponse; import com.dji.sdk.mqtt.services.ServicesPublish; import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/media/api/IHttpMediaService.java b/src/main/java/com/dji/sdk/cloudapi/media/api/IHttpMediaService.java index 81a23e0..1d59fc3 100644 --- a/src/main/java/com/dji/sdk/cloudapi/media/api/IHttpMediaService.java +++ b/src/main/java/com/dji/sdk/cloudapi/media/api/IHttpMediaService.java @@ -9,13 +9,13 @@ import io.swagger.v3.oas.annotations.media.ExampleObject; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/organization/AirportBindStatusResponse.java b/src/main/java/com/dji/sdk/cloudapi/organization/AirportBindStatusResponse.java index 9928c5c..54d3ee4 100644 --- a/src/main/java/com/dji/sdk/cloudapi/organization/AirportBindStatusResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/organization/AirportBindStatusResponse.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.organization; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationBindResponse.java b/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationBindResponse.java index 8155091..e169339 100644 --- a/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationBindResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationBindResponse.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.organization; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationGetResponse.java b/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationGetResponse.java index cb10abf..967a9a9 100644 --- a/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationGetResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/organization/AirportOrganizationGetResponse.java @@ -1,8 +1,7 @@ package com.dji.sdk.cloudapi.organization; import com.dji.sdk.common.BaseModel; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/organization/BindStatusRequestDevice.java b/src/main/java/com/dji/sdk/cloudapi/organization/BindStatusRequestDevice.java index 68a263e..f56678a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/organization/BindStatusRequestDevice.java +++ b/src/main/java/com/dji/sdk/cloudapi/organization/BindStatusRequestDevice.java @@ -1,8 +1,8 @@ package com.dji.sdk.cloudapi.organization; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/organization/OrganizationBindInfo.java b/src/main/java/com/dji/sdk/cloudapi/organization/OrganizationBindInfo.java index 128c44b..23a2823 100644 --- a/src/main/java/com/dji/sdk/cloudapi/organization/OrganizationBindInfo.java +++ b/src/main/java/com/dji/sdk/cloudapi/organization/OrganizationBindInfo.java @@ -1,8 +1,8 @@ package com.dji.sdk.cloudapi.organization; import com.dji.sdk.mqtt.MqttReply; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusData.java b/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusData.java index cf03f33..976ee5d 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusData.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusData.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; /** * The state of the drone's limited distance diff --git a/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusSet.java b/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusSet.java index ddca848..e21fff3 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/DistanceLimitStatusSet.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * The state of the drone's limited distance diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ExitWaylineWhenRcLostSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ExitWaylineWhenRcLostSet.java index d9053fa..984bda7 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ExitWaylineWhenRcLostSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ExitWaylineWhenRcLostSet.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/HeightLimitSet.java b/src/main/java/com/dji/sdk/cloudapi/property/HeightLimitSet.java index 0fc3180..bef12fe 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/HeightLimitSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/HeightLimitSet.java @@ -2,10 +2,9 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/NightLightsStateSet.java b/src/main/java/com/dji/sdk/cloudapi/property/NightLightsStateSet.java index feb5fea..797d95c 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/NightLightsStateSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/NightLightsStateSet.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ObstacleAvoidanceSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ObstacleAvoidanceSet.java index f84ec4c..dd8e1e2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ObstacleAvoidanceSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ObstacleAvoidanceSet.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.ObstacleAvoidance; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/RcLostActionSet.java b/src/main/java/com/dji/sdk/cloudapi/property/RcLostActionSet.java index 6866478..4ae32f2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/RcLostActionSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/RcLostActionSet.java @@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.RcLostActionEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/RthAltitudeSet.java b/src/main/java/com/dji/sdk/cloudapi/property/RthAltitudeSet.java index 94e3094..d978a8f 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/RthAltitudeSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/RthAltitudeSet.java @@ -2,10 +2,10 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ThermalCurrentPaletteStyleSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ThermalCurrentPaletteStyleSet.java index 6b5e847..4aa92b2 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ThermalCurrentPaletteStyleSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ThermalCurrentPaletteStyleSet.java @@ -4,9 +4,9 @@ import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.ThermalPaletteStyleEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.Map; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ThermalGainModeSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ThermalGainModeSet.java index f49bea4..6d1135a 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ThermalGainModeSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ThermalGainModeSet.java @@ -4,9 +4,9 @@ import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.ThermalGainModeEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.Map; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermLowerLimitSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermLowerLimitSet.java index 66ff5b4..25c3927 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermLowerLimitSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermLowerLimitSet.java @@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.Map; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermStateSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermStateSet.java index df25b38..d36b2d4 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermStateSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermStateSet.java @@ -4,9 +4,9 @@ import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.cloudapi.device.SwitchActionEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.Map; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermUpperLimitSet.java b/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermUpperLimitSet.java index 3d5df2b..fa05bd6 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermUpperLimitSet.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/ThermalIsothermUpperLimitSet.java @@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.property; import com.dji.sdk.cloudapi.device.PayloadIndex; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.Map; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/property/api/AbstractPropertyService.java b/src/main/java/com/dji/sdk/cloudapi/property/api/AbstractPropertyService.java index eec89bc..a6bad1b 100644 --- a/src/main/java/com/dji/sdk/cloudapi/property/api/AbstractPropertyService.java +++ b/src/main/java/com/dji/sdk/cloudapi/property/api/AbstractPropertyService.java @@ -11,9 +11,9 @@ import com.dji.sdk.exception.CloudSDKException; import com.dji.sdk.mqtt.property.PropertySetPublish; import com.dji.sdk.mqtt.property.PropertySetReplyResultEnum; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; -import javax.annotation.Resource; -import javax.validation.Valid; import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/dji/sdk/cloudapi/storage/CredentialsToken.java b/src/main/java/com/dji/sdk/cloudapi/storage/CredentialsToken.java index 93317b4..817ddc4 100644 --- a/src/main/java/com/dji/sdk/cloudapi/storage/CredentialsToken.java +++ b/src/main/java/com/dji/sdk/cloudapi/storage/CredentialsToken.java @@ -4,9 +4,8 @@ import com.aliyuncs.sts.model.v20150401.AssumeRoleResponse; import com.fasterxml.jackson.annotation.JsonProperty; import io.minio.credentials.Credentials; import io.swagger.v3.oas.annotations.media.Schema; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/storage/StsCredentialsResponse.java b/src/main/java/com/dji/sdk/cloudapi/storage/StsCredentialsResponse.java index 0821274..9159d6c 100644 --- a/src/main/java/com/dji/sdk/cloudapi/storage/StsCredentialsResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/storage/StsCredentialsResponse.java @@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.storage; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/storage/api/IHttpStorageService.java b/src/main/java/com/dji/sdk/cloudapi/storage/api/IHttpStorageService.java index 602a8d2..29ae4ae 100644 --- a/src/main/java/com/dji/sdk/cloudapi/storage/api/IHttpStorageService.java +++ b/src/main/java/com/dji/sdk/cloudapi/storage/api/IHttpStorageService.java @@ -5,12 +5,11 @@ import com.dji.sdk.common.HttpResultResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * @author sean * @version 0.3 diff --git a/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceIconUrl.java b/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceIconUrl.java index 937cb4a..f51aead 100644 --- a/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceIconUrl.java +++ b/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceIconUrl.java @@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.tsa; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceTopology.java b/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceTopology.java index 437783d..47811be 100644 --- a/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceTopology.java +++ b/src/main/java/com/dji/sdk/cloudapi/tsa/DeviceTopology.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.tsa; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyDeviceModel.java b/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyDeviceModel.java index 770c28b..96f814b 100644 --- a/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyDeviceModel.java +++ b/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyDeviceModel.java @@ -6,8 +6,8 @@ import com.dji.sdk.cloudapi.device.DeviceSubTypeEnum; import com.dji.sdk.cloudapi.device.DeviceTypeEnum; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyList.java b/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyList.java index 4f41c57..169258c 100644 --- a/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyList.java +++ b/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyList.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.tsa; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyResponse.java b/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyResponse.java index b3a2216..971b6b7 100644 --- a/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/tsa/TopologyResponse.java @@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.tsa; import com.dji.sdk.common.BaseModel; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/tsa/api/IHttpTsaService.java b/src/main/java/com/dji/sdk/cloudapi/tsa/api/IHttpTsaService.java index 6e9a2d8..da3a604 100644 --- a/src/main/java/com/dji/sdk/cloudapi/tsa/api/IHttpTsaService.java +++ b/src/main/java/com/dji/sdk/cloudapi/tsa/api/IHttpTsaService.java @@ -6,11 +6,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/ExecutableConditions.java b/src/main/java/com/dji/sdk/cloudapi/wayline/ExecutableConditions.java index 768b301..7e5268b 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/ExecutableConditions.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/ExecutableConditions.java @@ -1,7 +1,8 @@ package com.dji.sdk.cloudapi.wayline; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** * @author sean @@ -36,4 +37,4 @@ public class ExecutableConditions { this.storageCapacity = storageCapacity; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskBreakPoint.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskBreakPoint.java index 6d0c232..2e1782f 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskBreakPoint.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskBreakPoint.java @@ -1,8 +1,9 @@ package com.dji.sdk.cloudapi.wayline; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** * @author sean @@ -160,4 +161,4 @@ public class FlighttaskBreakPoint { this.attitudeHead = attitudeHead; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateFile.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateFile.java index 271d2d4..9b7b667 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateFile.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateFile.java @@ -1,6 +1,7 @@ package com.dji.sdk.cloudapi.wayline; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.NotNull; /** * @author sean @@ -48,4 +49,4 @@ public class FlighttaskCreateFile { this.sign = sign; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateRequest.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateRequest.java index c614c96..7a6b6bb 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskCreateRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.wayline; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean @@ -70,4 +70,4 @@ public class FlighttaskCreateRequest extends BaseModel { this.file = file; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskExecuteRequest.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskExecuteRequest.java index 451b784..9182988 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskExecuteRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskExecuteRequest.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.wayline; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskFile.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskFile.java index 70837fc..c4a4aaa 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskFile.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskFile.java @@ -1,6 +1,7 @@ package com.dji.sdk.cloudapi.wayline; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskPrepareRequest.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskPrepareRequest.java index 41a7934..45374e9 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskPrepareRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskPrepareRequest.java @@ -4,12 +4,12 @@ import com.dji.sdk.annotations.CloudSDKVersion; import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; import com.dji.sdk.common.BaseModel; import com.dji.sdk.common.CloudSDKVersionEnum; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; /** * @author sean @@ -239,4 +239,4 @@ public class FlighttaskPrepareRequest extends BaseModel { this.simulateMission = simulateMission; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskResourceGetResponse.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskResourceGetResponse.java index 1a1f275..1a2aedd 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskResourceGetResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskResourceGetResponse.java @@ -1,9 +1,9 @@ package com.dji.sdk.cloudapi.wayline; import com.dji.sdk.common.BaseModel; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * @author sean @@ -36,4 +36,4 @@ public class FlighttaskResourceGetResponse extends BaseModel { this.file = file; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskUndoRequest.java b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskUndoRequest.java index a38af28..802454b 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskUndoRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/FlighttaskUndoRequest.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.wayline; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListRequest.java b/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListRequest.java index 8ea9c41..5c16a81 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListRequest.java @@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.wayline; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListResponse.java b/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListResponse.java index 8e856da..76e43d6 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListResponse.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/GetWaylineListResponse.java @@ -4,11 +4,11 @@ import com.dji.sdk.cloudapi.device.DeviceEnum; import com.dji.sdk.common.BaseModel; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/ReadyConditions.java b/src/main/java/com/dji/sdk/cloudapi/wayline/ReadyConditions.java index 6194e8d..24d3413 100755 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/ReadyConditions.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/ReadyConditions.java @@ -1,10 +1,10 @@ package com.dji.sdk.cloudapi.wayline; import com.dji.sdk.common.BaseModel; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * @author sean @@ -74,4 +74,4 @@ public class ReadyConditions extends BaseModel { this.endTime = endTime; return this; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/SimulateMission.java b/src/main/java/com/dji/sdk/cloudapi/wayline/SimulateMission.java index bf3c4bc..467dd52 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/SimulateMission.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/SimulateMission.java @@ -1,8 +1,9 @@ package com.dji.sdk.cloudapi.wayline; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackMetadata.java b/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackMetadata.java index aa97993..576bccb 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackMetadata.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackMetadata.java @@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.wayline; import com.dji.sdk.cloudapi.device.DeviceEnum; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackRequest.java b/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackRequest.java index 87f8214..a37fc1d 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackRequest.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/WaylineUploadCallbackRequest.java @@ -2,9 +2,8 @@ package com.dji.sdk.cloudapi.wayline; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/api/AbstractWaylineService.java b/src/main/java/com/dji/sdk/cloudapi/wayline/api/AbstractWaylineService.java index b295d0f..55262d6 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/api/AbstractWaylineService.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/api/AbstractWaylineService.java @@ -18,11 +18,11 @@ import com.dji.sdk.mqtt.requests.TopicRequestsResponse; import com.dji.sdk.mqtt.services.ServicesPublish; import com.dji.sdk.mqtt.services.ServicesReplyData; import com.dji.sdk.mqtt.services.TopicServicesResponse; +import jakarta.annotation.Resource; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/cloudapi/wayline/api/IHttpWaylineService.java b/src/main/java/com/dji/sdk/cloudapi/wayline/api/IHttpWaylineService.java index 17fae68..a2b1489 100644 --- a/src/main/java/com/dji/sdk/cloudapi/wayline/api/IHttpWaylineService.java +++ b/src/main/java/com/dji/sdk/cloudapi/wayline/api/IHttpWaylineService.java @@ -9,14 +9,14 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +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.springdoc.api.annotations.ParameterObject; import org.springframework.web.bind.annotation.*; -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.util.List; /** diff --git a/src/main/java/com/dji/sdk/common/BaseModel.java b/src/main/java/com/dji/sdk/common/BaseModel.java index 00fde60..a7c1c4e 100644 --- a/src/main/java/com/dji/sdk/common/BaseModel.java +++ b/src/main/java/com/dji/sdk/common/BaseModel.java @@ -3,11 +3,11 @@ package com.dji.sdk.common; import com.dji.sdk.annotations.CloudSDKVersion; import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import org.springframework.util.CollectionUtils; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; import java.lang.reflect.Field; import java.util.Arrays; import java.util.HashSet; @@ -78,4 +78,4 @@ public class BaseModel { throw new CloudSDKException(e); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/config/GetSnakeDataBinder.java b/src/main/java/com/dji/sdk/config/GetSnakeDataBinder.java index b14ab6b..d0e213f 100644 --- a/src/main/java/com/dji/sdk/config/GetSnakeDataBinder.java +++ b/src/main/java/com/dji/sdk/config/GetSnakeDataBinder.java @@ -3,11 +3,11 @@ package com.dji.sdk.config; import com.dji.sdk.common.Common; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.servlet.ServletRequest; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyValue; import org.springframework.web.servlet.mvc.method.annotation.ExtendedServletRequestDataBinder; -import javax.servlet.ServletRequest; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/com/dji/sdk/mqtt/MqttConfiguration.java b/src/main/java/com/dji/sdk/mqtt/MqttConfiguration.java index 5855113..31614d5 100644 --- a/src/main/java/com/dji/sdk/mqtt/MqttConfiguration.java +++ b/src/main/java/com/dji/sdk/mqtt/MqttConfiguration.java @@ -1,5 +1,6 @@ package com.dji.sdk.mqtt; +import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -15,7 +16,6 @@ import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; -import javax.annotation.Resource; import java.util.UUID; /** diff --git a/src/main/java/com/dji/sdk/mqtt/MqttGatewayPublish.java b/src/main/java/com/dji/sdk/mqtt/MqttGatewayPublish.java index 8d60425..c9ecb68 100644 --- a/src/main/java/com/dji/sdk/mqtt/MqttGatewayPublish.java +++ b/src/main/java/com/dji/sdk/mqtt/MqttGatewayPublish.java @@ -4,6 +4,7 @@ import com.dji.sdk.common.Common; import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import com.fasterxml.jackson.core.JsonProcessingException; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.TypeMismatchException; import org.springframework.integration.mqtt.support.MqttHeaders; @@ -11,7 +12,6 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import javax.annotation.Resource; import java.util.Objects; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; @@ -98,4 +98,4 @@ public class MqttGatewayPublish { } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/mqtt/MqttTopicServiceImpl.java b/src/main/java/com/dji/sdk/mqtt/MqttTopicServiceImpl.java index 158fa60..e62e737 100644 --- a/src/main/java/com/dji/sdk/mqtt/MqttTopicServiceImpl.java +++ b/src/main/java/com/dji/sdk/mqtt/MqttTopicServiceImpl.java @@ -1,11 +1,11 @@ package com.dji.sdk.mqtt; +import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Arrays; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/dji/sdk/mqtt/drc/DrcDownPublish.java b/src/main/java/com/dji/sdk/mqtt/drc/DrcDownPublish.java index 25d643b..f29c43f 100644 --- a/src/main/java/com/dji/sdk/mqtt/drc/DrcDownPublish.java +++ b/src/main/java/com/dji/sdk/mqtt/drc/DrcDownPublish.java @@ -2,9 +2,9 @@ package com.dji.sdk.mqtt.drc; import com.dji.sdk.mqtt.MqttGatewayPublish; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Objects; /** diff --git a/src/main/java/com/dji/sdk/mqtt/drc/DrcUpRouter.java b/src/main/java/com/dji/sdk/mqtt/drc/DrcUpRouter.java index 8648bf8..4987e1d 100644 --- a/src/main/java/com/dji/sdk/mqtt/drc/DrcUpRouter.java +++ b/src/main/java/com/dji/sdk/mqtt/drc/DrcUpRouter.java @@ -6,7 +6,6 @@ import com.dji.sdk.mqtt.ChannelName; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.messaging.Message; import java.io.IOException; @@ -22,7 +21,7 @@ public class DrcUpRouter { @Bean public IntegrationFlow drcUpRouterFlow() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.INBOUND_DRC_UP) .transform(Message.class, source -> { try { diff --git a/src/main/java/com/dji/sdk/mqtt/drc/DrcUpSubscribe.java b/src/main/java/com/dji/sdk/mqtt/drc/DrcUpSubscribe.java index cbb85ba..ee222e7 100644 --- a/src/main/java/com/dji/sdk/mqtt/drc/DrcUpSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/drc/DrcUpSubscribe.java @@ -3,9 +3,9 @@ package com.dji.sdk.mqtt.drc; import com.dji.sdk.common.GatewayManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * diff --git a/src/main/java/com/dji/sdk/mqtt/events/EventsRouter.java b/src/main/java/com/dji/sdk/mqtt/events/EventsRouter.java index 0a6d50d..00cdee7 100644 --- a/src/main/java/com/dji/sdk/mqtt/events/EventsRouter.java +++ b/src/main/java/com/dji/sdk/mqtt/events/EventsRouter.java @@ -4,15 +4,14 @@ import com.dji.sdk.common.Common; import com.dji.sdk.exception.CloudSDKException; import com.dji.sdk.mqtt.ChannelName; import com.dji.sdk.mqtt.MqttGatewayPublish; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; import java.io.IOException; import java.util.Arrays; import java.util.Objects; @@ -32,7 +31,7 @@ public class EventsRouter { @Bean public IntegrationFlow eventsMethodRouterFlow() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.INBOUND_EVENTS) .transform(Message.class, source -> { try { @@ -53,7 +52,7 @@ public class EventsRouter { @Bean public IntegrationFlow replySuccessEvents() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.OUTBOUND_EVENTS) .handle(this::publish) .nullChannel(); diff --git a/src/main/java/com/dji/sdk/mqtt/events/EventsSubscribe.java b/src/main/java/com/dji/sdk/mqtt/events/EventsSubscribe.java index 84cffff..ad3b5e1 100644 --- a/src/main/java/com/dji/sdk/mqtt/events/EventsSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/events/EventsSubscribe.java @@ -3,9 +3,9 @@ package com.dji.sdk.mqtt.events; import com.dji.sdk.common.GatewayManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * diff --git a/src/main/java/com/dji/sdk/mqtt/osd/OsdRouter.java b/src/main/java/com/dji/sdk/mqtt/osd/OsdRouter.java index 87f5282..a0161c5 100644 --- a/src/main/java/com/dji/sdk/mqtt/osd/OsdRouter.java +++ b/src/main/java/com/dji/sdk/mqtt/osd/OsdRouter.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.Message; @@ -33,7 +32,7 @@ public class OsdRouter { @Bean public IntegrationFlow osdRouterFlow() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.INBOUND_OSD) .transform(Message.class, source -> { try { @@ -61,4 +60,4 @@ public class OsdRouter { .get(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/mqtt/osd/OsdSubscribe.java b/src/main/java/com/dji/sdk/mqtt/osd/OsdSubscribe.java index bc359b2..f4943a6 100644 --- a/src/main/java/com/dji/sdk/mqtt/osd/OsdSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/osd/OsdSubscribe.java @@ -4,10 +4,9 @@ import com.dji.sdk.common.GatewayManager; import com.dji.sdk.common.SDKManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; - /** * * @author sean.zhou diff --git a/src/main/java/com/dji/sdk/mqtt/property/PropertySetPublish.java b/src/main/java/com/dji/sdk/mqtt/property/PropertySetPublish.java index 3426a85..59e617d 100644 --- a/src/main/java/com/dji/sdk/mqtt/property/PropertySetPublish.java +++ b/src/main/java/com/dji/sdk/mqtt/property/PropertySetPublish.java @@ -2,9 +2,9 @@ package com.dji.sdk.mqtt.property; import com.dji.sdk.mqtt.MqttGatewayPublish; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/com/dji/sdk/mqtt/property/PropertySetSubscribe.java b/src/main/java/com/dji/sdk/mqtt/property/PropertySetSubscribe.java index 6bcd266..a5da999 100644 --- a/src/main/java/com/dji/sdk/mqtt/property/PropertySetSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/property/PropertySetSubscribe.java @@ -3,9 +3,9 @@ package com.dji.sdk.mqtt.property; import com.dji.sdk.common.GatewayManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/mqtt/requests/RequestsRouter.java b/src/main/java/com/dji/sdk/mqtt/requests/RequestsRouter.java index 045afcd..6491669 100644 --- a/src/main/java/com/dji/sdk/mqtt/requests/RequestsRouter.java +++ b/src/main/java/com/dji/sdk/mqtt/requests/RequestsRouter.java @@ -5,13 +5,12 @@ import com.dji.sdk.exception.CloudSDKErrorEnum; import com.dji.sdk.exception.CloudSDKException; import com.dji.sdk.mqtt.ChannelName; import com.dji.sdk.mqtt.MqttGatewayPublish; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.messaging.MessageHeaders; -import javax.annotation.Resource; import java.io.IOException; import java.util.Arrays; import java.util.Objects; @@ -29,7 +28,7 @@ public class RequestsRouter { @Bean public IntegrationFlow requestsMethodRouterFlow() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.INBOUND_REQUESTS) .transform(payload -> { try { @@ -48,7 +47,7 @@ public class RequestsRouter { @Bean public IntegrationFlow replyRequestsMethod() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.OUTBOUND_REQUESTS) .handle(this::publish) .nullChannel(); diff --git a/src/main/java/com/dji/sdk/mqtt/requests/RequestsSubscribe.java b/src/main/java/com/dji/sdk/mqtt/requests/RequestsSubscribe.java index 6f520fc..951f0df 100644 --- a/src/main/java/com/dji/sdk/mqtt/requests/RequestsSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/requests/RequestsSubscribe.java @@ -3,9 +3,9 @@ package com.dji.sdk.mqtt.requests; import com.dji.sdk.common.GatewayManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/mqtt/services/ServicesPublish.java b/src/main/java/com/dji/sdk/mqtt/services/ServicesPublish.java index 9ca29d2..c4c2813 100644 --- a/src/main/java/com/dji/sdk/mqtt/services/ServicesPublish.java +++ b/src/main/java/com/dji/sdk/mqtt/services/ServicesPublish.java @@ -5,9 +5,9 @@ import com.dji.sdk.mqtt.MqttGatewayPublish; import com.dji.sdk.mqtt.TopicConst; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/com/dji/sdk/mqtt/services/ServicesSubscribe.java b/src/main/java/com/dji/sdk/mqtt/services/ServicesSubscribe.java index a3b92a9..9557b80 100644 --- a/src/main/java/com/dji/sdk/mqtt/services/ServicesSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/services/ServicesSubscribe.java @@ -3,9 +3,9 @@ package com.dji.sdk.mqtt.services; import com.dji.sdk.common.GatewayManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * @author sean diff --git a/src/main/java/com/dji/sdk/mqtt/state/StateRouter.java b/src/main/java/com/dji/sdk/mqtt/state/StateRouter.java index b26c00e..7523444 100644 --- a/src/main/java/com/dji/sdk/mqtt/state/StateRouter.java +++ b/src/main/java/com/dji/sdk/mqtt/state/StateRouter.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.Message; @@ -31,7 +30,7 @@ public class StateRouter { @Bean public IntegrationFlow stateDataRouterFlow() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.INBOUND_STATE) .transform(Message.class, source -> { try { @@ -60,4 +59,4 @@ public class StateRouter { throw new CloudSDKException(CloudSDKErrorEnum.WRONG_DATA, "Unexpected value: " + SDKManager.getDeviceSDK(gatewaySn).getType()); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/mqtt/state/StateSubscribe.java b/src/main/java/com/dji/sdk/mqtt/state/StateSubscribe.java index 7a1a746..06cd68c 100644 --- a/src/main/java/com/dji/sdk/mqtt/state/StateSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/state/StateSubscribe.java @@ -4,9 +4,9 @@ import com.dji.sdk.common.GatewayManager; import com.dji.sdk.common.SDKManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * diff --git a/src/main/java/com/dji/sdk/mqtt/status/StatusRouter.java b/src/main/java/com/dji/sdk/mqtt/status/StatusRouter.java index 396bd2e..aaaac62 100644 --- a/src/main/java/com/dji/sdk/mqtt/status/StatusRouter.java +++ b/src/main/java/com/dji/sdk/mqtt/status/StatusRouter.java @@ -6,16 +6,15 @@ import com.dji.sdk.exception.CloudSDKException; import com.dji.sdk.mqtt.ChannelName; import com.dji.sdk.mqtt.MqttGatewayPublish; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.util.CollectionUtils; -import javax.annotation.Resource; import java.io.IOException; import java.util.Objects; import java.util.Optional; @@ -36,7 +35,7 @@ public class StatusRouter { @Bean public IntegrationFlow statusRouterFlow() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.INBOUND_STATUS) .transform(Message.class, source -> { try { @@ -56,7 +55,7 @@ public class StatusRouter { @Bean public IntegrationFlow replySuccessStatus() { - return IntegrationFlows + return IntegrationFlow .from(ChannelName.OUTBOUND_STATUS) .handle(this::publish) .nullChannel(); @@ -70,4 +69,4 @@ public class StatusRouter { gatewayPublish.publishReply(request, headers); return request; } -} \ No newline at end of file +} diff --git a/src/main/java/com/dji/sdk/mqtt/status/StatusSubscribe.java b/src/main/java/com/dji/sdk/mqtt/status/StatusSubscribe.java index 2412067..53cbc8a 100644 --- a/src/main/java/com/dji/sdk/mqtt/status/StatusSubscribe.java +++ b/src/main/java/com/dji/sdk/mqtt/status/StatusSubscribe.java @@ -4,9 +4,9 @@ import com.dji.sdk.common.GatewayManager; import com.dji.sdk.common.SDKManager; import com.dji.sdk.mqtt.IMqttTopicService; import com.dji.sdk.mqtt.TopicConst; +import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -import javax.annotation.Resource; /** * diff --git a/src/main/java/com/dji/sdk/swagger/SwaggerConfig.java b/src/main/java/com/dji/sdk/swagger/SwaggerConfig.java index 46be817..92c0fd4 100644 --- a/src/main/java/com/dji/sdk/swagger/SwaggerConfig.java +++ b/src/main/java/com/dji/sdk/swagger/SwaggerConfig.java @@ -1,6 +1,7 @@ package com.dji.sdk.swagger; import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -11,6 +12,7 @@ import org.springdoc.core.GroupedOpenApi; import org.springdoc.core.SpringDocConfigProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; /** * @author sean @@ -46,11 +48,4 @@ public class SwaggerConfig { .packagesToScan("com.dji").build(); } - @Bean - public SpringDocConfigProperties springDocConfigProperties(SpringDocConfigProperties properties) { - properties.setDefaultFlatParamObject(false); - properties.setDefaultSupportFormData(true); - properties.setDefaultProducesMediaType("application/json"); - return properties; - } } diff --git a/src/main/java/com/dji/sdk/websocket/WebSocketMessageResponse.java b/src/main/java/com/dji/sdk/websocket/WebSocketMessageResponse.java index 816d555..11fa00f 100644 --- a/src/main/java/com/dji/sdk/websocket/WebSocketMessageResponse.java +++ b/src/main/java/com/dji/sdk/websocket/WebSocketMessageResponse.java @@ -2,9 +2,9 @@ package com.dji.sdk.websocket; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** * The format of WebSocket messages that the pilot can receive. @@ -80,4 +80,4 @@ public class WebSocketMessageResponse { this.data = data; return this; } -} \ No newline at end of file +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 07752bf..b92d4b5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,29 +5,38 @@ spring: allow-bean-definition-overriding: true application: name: cloud-api-sample + docker: + compose: + enabled: true + file: ./docker/docker-compose.yml + lifecycle-management: start_and_stop + readiness: + tcp: + connect-timeout: 10s + read-timeout: 5s datasource: druid: - type: com.alibaba.druid.pool.DruidDataSource + enable: true driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://cloud_api_sample_mysql:3306/cloud_sample?useSSL=false&allowPublicKeyRetrieval=true - username: root - password: root + url: jdbc:mysql://127.0.0.1:3306/cloud_sample?useSSL=false&allowPublicKeyRetrieval=true + username: dji + password: dji2023 initial-size: 10 min-idle: 10 max-active: 20 max-wait: 60000 - - redis: - host: cloud_api_sample_redis - port: 6379 - database: 0 - username: # if you enable - password: - lettuce: - pool: - max-active: 8 - max-idle: 8 - min-idle: 0 + data: + redis: + host: 127.0.0.1 + port: 6379 + database: 0 + username: # if you enable + password: dji2023 + lettuce: + pool: + max-active: 8 + max-idle: 8 + min-idle: 0 servlet: multipart: @@ -85,19 +94,29 @@ 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: false - provider: ALIYUN # @see com.dji.sample.component.OssConfiguration.model.enums.OssTypeEnum - endpoint: https://oss-cn-hangzhou.aliyuncs.com - access-key: Please enter your access key. - secret-key: Please enter your secret key. + enable: true + provider: minio + endpoint: http://127.0.0.1:9000 + access-key: minioadmin2023 + secret-key: minioadmin2023 + bucket: cloud-bucket expire: 3600 - region: Please enter your oss region. # cn-hangzhou - role-session-name: cloudApi - role-arn: Please enter your role arn. # acs:ram::123456789:role/stsrole - bucket: Please enter your bucket name. - object-dir-prefix: Please enter a folder name. + object-dir-prefix: wayline + +# Tutorial: https://www.alibabacloud.com/help/en/object-storage-service/latest/use-a-temporary-credential-provided-by-sts-to-access-oss +#oss: +# enable: false +# provider: ALIYUN # @see com.dji.sample.component.OssConfiguration.model.enums.OssTypeEnum +# endpoint: https://oss-cn-hangzhou.aliyuncs.com +# access-key: Please enter your access key. +# secret-key: Please enter your secret key. +# expire: 3600 +# region: Please enter your oss region. # cn-hangzhou +# role-session-name: cloudApi +# role-arn: Please enter your role arn. # acs:ram::123456789:role/stsrole +# bucket: Please enter your bucket name. +# object-dir-prefix: Please enter a folder name. #oss: # enable: true @@ -138,4 +157,9 @@ cloud-api: app: id: Please enter the app id. key: Please enter the app key. - license: Please enter the app license. \ No newline at end of file + license: Please enter the app license. + +springdoc: + default-flat-param-object: false + default-support-form-data: true + default-produces-media-type: application/json diff --git a/src/main/resources/docker/docker-compose.yml b/src/main/resources/docker/docker-compose.yml new file mode 100644 index 0000000..b417914 --- /dev/null +++ b/src/main/resources/docker/docker-compose.yml @@ -0,0 +1,66 @@ +name: dji-cloud-sample +services: + mysql: + container_name: "dji-mysql" + image: mysql:latest + command: + --default-authentication-plugin=mysql_native_password + --character-set-server=utf8mb4 + --collation-server=utf8mb4_unicode_ci + volumes: + - mysql_data:/var/lib/mysql + - ./init.sql:/docker-entrypoint-initdb.d/init.sql + environment: + TZ: Asia/Shanghai + MYSQL_ROOT_HOST: '%' + MYSQL_ROOT_PASSWORD: dji2023 + MYSQL_DATABASE: cloud_sample + MYSQL_USER: dji + MYSQL_PASSWORD: dji2023 + ports: + - '127.0.0.1:3306:3306' + restart: always + redis: + image: redis/redis-stack-server:latest + container_name: "dji-redis" + restart: unless-stopped + ports: + - '127.0.0.1:6379:6379' + environment: + - REDIS_ARGS=--requirepass dji2023 --appendonly yes --save 900 1 + - SET_CONTAINER_TIMEZONE=true + volumes: + - redis_data:/data + minio: + image: minio/minio + container_name: "dji-minio" + ports: + - "127.0.0.1:9000:9000" + volumes: + - minio_data:/data + environment: + - MINIO_ACCESS_KEY=minioadmin2023 + - MINIO_SECRET_KEY=minioadmin2023 + command: server /data + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] + interval: 5s + timeout: 5s + retries: 6 + minio-client: + image: minio/mc + container_name: "dji-minio-client" + depends_on: + minio: + condition: service_healthy + restart: on-failure + entrypoint: > + /bin/sh -c " + /usr/bin/mc alias set myminio http://dji-minio:9000 minioadmin2023 minioadmin2023; + /usr/bin/mc mb myminio/cloud-bucket; + /usr/bin/mc policy set authorized myminio/cloud-bucket; + " +volumes: + mysql_data: + redis_data: + minio_data: diff --git a/src/main/resources/docker/init.sql b/src/main/resources/docker/init.sql new file mode 100644 index 0000000..17f6199 --- /dev/null +++ b/src/main/resources/docker/init.sql @@ -0,0 +1,477 @@ +CREATE DATABASE IF NOT EXISTS `cloud_sample` /*!40100 DEFAULT CHARACTER SET utf8 */; +USE `cloud_sample`; + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +SET NAMES utf8mb4; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE='NO_AUTO_VALUE_ON_ZERO', SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + + + + +# logs_file +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `logs_file`; + +CREATE TABLE `logs_file` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `file_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the file in the bucket.', + `size` bigint NOT NULL DEFAULT '0' COMMENT 'file size', + `logs_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The logs_id in the manage_device_logs table.', + `device_sn` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The sn of the device.', + `fingerprint` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'file fingerprint', + `object_key` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The key of the file in the bucket.', + `status` tinyint(1) NOT NULL COMMENT 'Whether the upload was successful. 1: success; 0: failed;', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `file_id_UNIQUE` (`file_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Logs file information'; + + + +# logs_file_index +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `logs_file_index`; + +CREATE TABLE `logs_file_index` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `boot_index` int NOT NULL COMMENT 'The file index reported by the dock.', + `file_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The file_id in the logs_file table.', + `start_time` bigint NOT NULL COMMENT 'The file start time reported by the dock.', + `end_time` bigint NOT NULL COMMENT 'The file end time reported by the dock.', + `size` bigint NOT NULL COMMENT 'The file size reported by the dock.', + `device_sn` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The sn of the device.', + `domain` int NOT NULL COMMENT 'This parameter corresponds to the domain in the device dictionary table.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='The boot index table corresponding to the logs file.'; + + + +# manage_device +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_device`; + +CREATE TABLE `manage_device` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `device_sn` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'dock, drone, remote control', + `device_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'undefined' COMMENT 'model of the device. This parameter corresponds to the device name in the device dictionary table.', + `user_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The account used when the device was bound.', + `nickname` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'custom name of the device', + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The workspace to which the current device belongs.', + `device_type` int NOT NULL DEFAULT '-1' COMMENT 'This parameter corresponds to the device type in the device dictionary table.', + `sub_type` int NOT NULL DEFAULT '-1' COMMENT 'This parameter corresponds to the sub type in the device dictionary table.', + `domain` int NOT NULL DEFAULT '-1' COMMENT 'This parameter corresponds to the domain in the device dictionary table.', + `firmware_version` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'firmware version of the device', + `compatible_status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1: consistent; 0: inconsistent; Whether the firmware versions are consistent.', + `version` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'version of the protocol. This field is currently not useful.', + `device_index` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'Control of the drone, A control or B control.', + `child_sn` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The device controlled by the gateway.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + `bound_time` bigint DEFAULT NULL COMMENT 'The time when the device is bound to the workspace.', + `bound_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'The status when the device is bound to the workspace. 1: bound; 0: not bound;', + `login_time` bigint DEFAULT NULL COMMENT 'The time of the last device login.', + `device_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '', + `url_normal` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The icon displayed on the remote control.', + `url_select` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The icon displayed on the remote control when it is selected.', + PRIMARY KEY (`id`), + UNIQUE KEY `product_sn_UNIQUE` (`device_sn`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Device information'; + + + +# manage_device_dictionary +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_device_dictionary`; + +CREATE TABLE `manage_device_dictionary` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `domain` int NOT NULL COMMENT 'This parameter corresponds to the domain in the Product Type section of the document. 0: drone; 1: payload; 2: remote control; 3: dock;', + `device_type` int NOT NULL COMMENT 'This parameter corresponds to the type in the Product Type section of the document.', + `sub_type` int NOT NULL COMMENT 'This parameter corresponds to the sub_type in the Product Type section of the document.', + `device_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'This parameter corresponds to the name in the Product Type section of the document.', + `device_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'remark', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Device product enum'; + +LOCK TABLES `manage_device_dictionary` WRITE; +/*!40000 ALTER TABLE `manage_device_dictionary` DISABLE KEYS */; + +INSERT INTO `manage_device_dictionary` (`id`, `domain`, `device_type`, `sub_type`, `device_name`, `device_desc`) +VALUES + (1,0,60,0,'Matrice 300 RTK',NULL), + (2,0,67,0,'Matrice 30',NULL), + (3,0,67,1,'Matrice 30T',NULL), + (4,1,20,0,'Z30',NULL), + (5,1,26,0,'XT2',NULL), + (6,1,39,0,'FPV',NULL), + (7,1,41,0,'XTS',NULL), + (8,1,42,0,'H20',NULL), + (9,1,43,0,'H20T',NULL), + (10,1,50,65535,'P1','include 24 and 35 and 50mm'), + (11,1,52,0,'M30 Camera',NULL), + (12,1,53,0,'M30T Camera',NULL), + (13,1,61,0,'H20N',NULL), + (14,1,165,0,'DJI Dock Camera',NULL), + (15,1,90742,0,'L1',NULL), + (16,2,56,0,'DJI Smart Controller','Remote control for M300'), + (17,2,119,0,'DJI RC Plus','Remote control for M30'), + (18,3,1,0,'DJI Dock',''), + (19,0,77,0,'Mavic 3E',NULL), + (20,0,77,1,'Mavic 3T',NULL), + (21,1,66,0,'Mavic 3E Camera',NULL), + (22,1,67,0,'Mavic 3T Camera',NULL), + (23,2,144,0,'DJI RC Pro','Remote control for Mavic 3E/T and Mavic 3M'), + (24,0,77,2,'Mavic 3M',NULL), + (25,1,68,0,'Mavic 3M Camera',NULL), + (26,0,89,0,'Matrice 350 RTK',NULL); + +/*!40000 ALTER TABLE `manage_device_dictionary` ENABLE KEYS */; +UNLOCK TABLES; + + +# manage_device_firmware +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_device_firmware`; + +CREATE TABLE `manage_device_firmware` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `firmware_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `file_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'undefined' COMMENT 'The file name of the firmware package, including the file suffix', + `firmware_version` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'It needs to be formatted according to the official firmware version. 00.00.0000', + `object_key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'The object key of the firmware package in the bucket.', + `file_size` bigint NOT NULL COMMENT 'The size of the firmware package.', + `file_md5` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The md5 of the firmware package.', + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `release_note` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The release note of the firmware package.', + `release_date` bigint NOT NULL COMMENT 'The release date of the firmware package.', + `user_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'The name of the creator.', + `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Availability of the firmware package. 1: available; 0: unavailable', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `UNIQUE_firmware_id` (`firmware_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Firmware file information'; + + + +# manage_device_hms +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_device_hms`; + +CREATE TABLE `manage_device_hms` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `hms_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `tid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The tid when the device reports the hms message.', + `bid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The bid when the device reports the hms message.', + `sn` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Which device reported the message.', + `level` smallint NOT NULL COMMENT 'hms level. 0: notice; 1: caution; 2: warning.', + `module` tinyint NOT NULL COMMENT 'Which module''s message. 0: flight task; 1:device manage; 2: media; 3: hms.', + `hms_key` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The key of the hms message, according to which the message text is obtained.', + `message_zh` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Chinese message.', + `message_en` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'English message.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `UNIQUE_hms_id` (`hms_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Device''s hms information'; + + + +# manage_device_logs +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_device_logs`; + +CREATE TABLE `manage_device_logs` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `logs_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `username` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the creator.', + `device_sn` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The sn of the device.', + `logs_info` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'A description of the log issue.', + `happen_time` bigint DEFAULT NULL COMMENT 'The time when the logging problem occurred.', + `status` tinyint NOT NULL COMMENT '1: uploading; 2: done 3: canceled; 4: failed;', + `update_time` bigint NOT NULL, + `create_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `log_id_UNIQUE` (`logs_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Log for uploading logs'; + + + +# manage_device_payload +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_device_payload`; + +CREATE TABLE `manage_device_payload` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `payload_sn` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The sn of the device payload.', + `payload_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'undefined' COMMENT 'model of the payload. This parameter corresponds to the device name in the device dictionary table.', + `payload_type` smallint NOT NULL COMMENT 'This parameter corresponds to the device type in the device dictionary table.', + `sub_type` smallint NOT NULL COMMENT 'This parameter corresponds to the sub type in the device dictionary table.', + `firmware_version` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'firmware version of the device payload', + `payload_index` smallint NOT NULL COMMENT 'The location of the payload on the device.', + `device_sn` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Which device the current payload belongs to.', + `payload_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + `control_source` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `payload_sn_UNIQUE` (`payload_sn`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='The payload information of the device.'; + + + +# manage_firmware_model +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_firmware_model`; + +CREATE TABLE `manage_firmware_model` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `firmware_id` varchar(64) NOT NULL, + `device_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'model of the device. This parameter corresponds to the device name in the device dictionary table.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; + + + +# manage_user +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_user`; + +CREATE TABLE `manage_user` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `user_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `username` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the account.', + `password` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The password of the account.', + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Which workspace the current account belongs to.', + `user_type` smallint NOT NULL COMMENT 'The type of account. Different sides need to be logged in with the corresponding type of account. 1: web; 2: pilot.', + `mqtt_username` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The account name used by the current account when logging into the emqx server.', + `mqtt_password` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The account password used by the current account when logging into the emqx server.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `user_id_UNIQUE` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='System account.'; + +LOCK TABLES `manage_user` WRITE; +/*!40000 ALTER TABLE `manage_user` DISABLE KEYS */; + +INSERT INTO `manage_user` (`id`, `user_id`, `username`, `password`, `workspace_id`, `user_type`, `mqtt_username`, `mqtt_password`, `create_time`, `update_time`) +VALUES + (1,'a1559e7c-8dd8-4780-b952-100cc4797da2','adminPC','adminPC','e3dea0f5-37f2-4d79-ae58-490af3228069',1,'admin','admin',1634898410751,1650880112310), + (2,'be7c6c3d-afe9-4be4-b9eb-c55066c0914e','pilot','pilot123','e3dea0f5-37f2-4d79-ae58-490af3228069',2,'pilot','pilot123',1634898410751,1634898410751); + +/*!40000 ALTER TABLE `manage_user` ENABLE KEYS */; +UNLOCK TABLES; + + +# manage_workspace +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `manage_workspace`; + +CREATE TABLE `manage_workspace` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `workspace_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the workspace.', + `workspace_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The description of the workspace.', + `platform_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The platform name of the workspace.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + `bind_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The binding code for this workspace is required when the dock connects to a third-party cloud.', + PRIMARY KEY (`id`), + UNIQUE KEY `workspace_id_UNIQUE` (`workspace_id`), + UNIQUE KEY `bind_code_UNIQUE` (`bind_code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; + +LOCK TABLES `manage_workspace` WRITE; +/*!40000 ALTER TABLE `manage_workspace` DISABLE KEYS */; + +INSERT INTO `manage_workspace` (`id`, `workspace_id`, `workspace_name`, `workspace_desc`, `platform_name`, `create_time`, `update_time`, `bind_code`) +VALUES + (1,'e3dea0f5-37f2-4d79-ae58-490af3228069','Test Group One','Cloud Sample Test Platform','Cloud Api Platform',1634898410751,1634898410751,'qwe'); + +/*!40000 ALTER TABLE `manage_workspace` ENABLE KEYS */; +UNLOCK TABLES; + + +# map_element_coordinate +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `map_element_coordinate`; + +CREATE TABLE `map_element_coordinate` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `element_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The element_id in the logs_file table.', + `longitude` decimal(18,14) NOT NULL COMMENT 'The longitude of this element.', + `latitude` decimal(17,14) NOT NULL COMMENT 'The latitude of this element.', + `altitude` decimal(17,14) DEFAULT NULL COMMENT 'The altitude of this element. If the element is point, it is null.', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='The coordinate information corresponding to the element.'; + + + +# map_group +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `map_group`; + +CREATE TABLE `map_group` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `group_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `group_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the group.', + `group_type` int NOT NULL COMMENT 'The type of the group. 0: custome; 1: default; 2: app shared; see developer document for detail.', + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The workspace_id in the manage_workspace table.', + `is_distributed` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'element group distributed status. Only data with value 1 is displayed on the pilot map. 1: true; 0: false.', + `is_lock` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether to lock. If locked, the elements under this element group cannot be deleted and modified. 1: locked; 0: unlock.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `group_id_UNIQUE` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin COMMENT='The group information of the map element.'; + +LOCK TABLES `map_group` WRITE; +/*!40000 ALTER TABLE `map_group` DISABLE KEYS */; + +INSERT INTO `map_group` (`id`, `group_id`, `group_name`, `group_type`, `workspace_id`, `is_distributed`, `is_lock`, `create_time`, `update_time`) +VALUES + (1,'e3dea0f5-37f2-4d79-ae58-490af3228060','Pilot Share Layer',2,'e3dea0f5-37f2-4d79-ae58-490af3228069',1,0,1638330077356,1638330077356), + (2,'e3dea0f5-37f2-4d79-ae58-490af3228011','Default Layer',1,'e3dea0f5-37f2-4d79-ae58-490af3228069',1,0,1638330077356,1638330077356); + +/*!40000 ALTER TABLE `map_group` ENABLE KEYS */; +UNLOCK TABLES; + + +# map_group_element +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `map_group_element`; + +CREATE TABLE `map_group_element` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `element_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `element_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the element.', + `display` smallint NOT NULL DEFAULT '1' COMMENT 'It no longer works.', + `group_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The group_id in the map_group table.', + `element_type` smallint NOT NULL COMMENT 'element type. 0: point; 1: line; 2: polygon.', + `username` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the creator.', + `color` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The color of the element. Hexadecimal.', + `clamp_to_ground` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether it is on the ground. 1: true; 0: false.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `element_id_UNIQUE` (`element_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin COMMENT='Information about the element corresponding to the group.'; + + + +# media_file +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `media_file`; + +CREATE TABLE `media_file` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `file_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `file_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The original name of the file.', + `file_path` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The path of the file.', + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The workspace to which the file belongs.', + `fingerprint` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The fingerprint of the file. This property exists only for media files uploaded by Pilot.', + `tinny_fingerprint` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The tiny fingerprint of the file. This property exists only for media files uploaded by Pilot.', + `object_key` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The key of the file in the bucket.', + `sub_file_type` int DEFAULT NULL COMMENT 'This property exists only for image files uploaded by Pilot. 0: normal picture; 1: panorama.', + `is_original` tinyint(1) NOT NULL COMMENT 'Whether is the original image.', + `drone` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'undefined' COMMENT 'The sn of the drone which create the file.', + `payload` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'undefined' COMMENT 'The name of the drone payload which create the file.', + `job_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT 'The job_id in the wayline_job table. Whether the file belongs to the dock task.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `UNIQUE_file_id` (`file_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Media file information'; + + + +# wayline_file +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `wayline_file`; + +CREATE TABLE `wayline_file` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'wayline name', + `wayline_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `drone_model_key` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'device product enum. format: domain-device_type-sub_type', + `payload_model_keys` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'payload product enum. format: domain-device_type-sub_type', + `workspace_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Which workspace the current wayline belongs to.', + `sign` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The md5 of the wayline file.', + `favorited` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether the file is favorited or not.', + `template_types` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'wayline file template type. 0: waypoint;', + `object_key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The key of the file in the bucket.', + `user_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the creator.', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL COMMENT 'required, can''t modify.', + PRIMARY KEY (`id`), + UNIQUE KEY `wayline_id_UNIQUE` (`wayline_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Wayline file information'; + + + +# wayline_job +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `wayline_job`; + +CREATE TABLE `wayline_job` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `job_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'uuid', + `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the job.', + `file_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The wayline file used for this job.', + `dock_sn` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Which dock executes the job.', + `workspace_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Which workspace the current job belongs to.', + `task_type` int NOT NULL, + `wayline_type` int NOT NULL COMMENT 'The template type of the wayline.', + `execute_time` bigint DEFAULT NULL COMMENT 'actual begin time', + `completed_time` bigint DEFAULT NULL COMMENT 'actual end time', + `username` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the creator.', + `begin_time` bigint NOT NULL COMMENT 'planned begin time', + `end_time` bigint DEFAULT NULL COMMENT 'planned end time', + `error_code` int DEFAULT NULL, + `status` int NOT NULL COMMENT '1: pending; 2: in progress; 3: success; 4: cancel; 5: failed', + `rth_altitude` int NOT NULL COMMENT 'return to home altitude. min: 20m; max: 500m', + `out_of_control` int NOT NULL COMMENT 'out of control action. 0: go home; 1: hover; 2: landing;', + `media_count` int NOT NULL DEFAULT '0', + `create_time` bigint NOT NULL, + `update_time` bigint NOT NULL, + `parent_id` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `job_id_UNIQUE` (`job_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='Wayline mission information of the dock.'; + + +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +