From d71f82a177ad62c2ea23e6d6a1811f4770cc2f64 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 16:03:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
/dev/null | 6 -
src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java | 32 +++++++
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobBreakPointServiceImpl.java | 28 +++++++
src/main/java/com/dji/sample/wayline/dao/IWaylineJobBreakPointMapper.java | 13 +++
src/main/resources/application-dev.yml | 9 +
src/main/resources/application-prod.yml | 7 +
src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java | 21 +++-
src/main/java/com/dji/sample/wayline/model/entity/WaylineJobBreakPointEntity.java | 64 ++++++++++++++++
src/main/java/com/dji/sample/wayline/service/IWaylineJobBreakPointService.java | 14 +++
9 files changed, 176 insertions(+), 18 deletions(-)
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/drone.iml b/.idea/drone.iml
deleted file mode 100644
index 0d215e6..0000000
--- a/.idea/drone.iml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="gt-geojson-24.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.6" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.32" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.53" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.53" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.26" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.10" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.10" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.32" level="project" />
- <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.12.1" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:5.5.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.10" level="project" />
- <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.jetbrains:annotations:24.1.0" level="project" />
- <orderEntry type="library" name="Maven: io.minio:minio:8.3.7" level="project" />
- <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:30.1.1-jre" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.8.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
- <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.8.4" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.1" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32" level="project" />
- <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.4.32" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.8" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
- <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.10" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
- <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.13" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.13" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.13" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.68.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.68.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.68.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.68.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.68.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.68.Final" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-s3:1.12.261" level="project" />
- <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-kms:1.12.261" level="project" />
- <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-core:1.12.261" level="project" />
- <orderEntry type="library" name="Maven: software.amazon.ion:ion-java:1.0.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.4" level="project" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.8.1" level="project" />
- <orderEntry type="library" name="Maven: com.amazonaws:jmespath-java:1.12.261" level="project" />
- <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-sts:1.12.261" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
- <orderEntry type="library" name="Maven: jaxen:jaxen:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" />
- <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.4" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.2.Final" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.33" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.4.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.10" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.10" level="project" />
- <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-geojson:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-main:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-referencing:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.ejml:ejml-ddense:0.41" level="project" />
- <orderEntry type="library" name="Maven: org.ejml:ejml-core:0.41" level="project" />
- <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-metadata:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-opengis:28.0" level="project" />
- <orderEntry type="library" name="Maven: systems.uom:systems-common:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: javax.measure:unit-api:2.0" level="project" />
- <orderEntry type="library" name="Maven: tech.units:indriya:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: tech.uom.lib:uom-lib-common:2.0" level="project" />
- <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
- <orderEntry type="library" name="Maven: si.uom:si-quantity:2.0.1" level="project" />
- <orderEntry type="library" name="Maven: si.uom:si-units:2.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.geotools.ogc:net.opengis.ows:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.geotools.ogc:org.w3.xlink:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.emf:org.eclipse.emf.common:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.emf:org.eclipse.emf.ecore:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.15.0" level="project" />
- <orderEntry type="library" name="Maven: it.geosolutions.jgridshift:jgridshift-core:1.3" level="project" />
- <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.49" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-http:28.0" level="project" />
- <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.19.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.10.0" level="project" />
- <orderEntry type="library" name="Maven: com.google.re2j:re2j:1.6" level="project" />
- <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
- <orderEntry type="library" name="Maven: javax.media:jai_core:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.6.5" level="project" />
- <orderEntry type="library" name="Maven: org.geotools:gt-shapefile:28.0" level="project" />
- <orderEntry type="library" name="Maven: ant:ant:1.6.5" level="project" />
- <orderEntry type="library" name="Maven: com.github.junrar:junrar:0.7" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-vfs2:2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.maven.scm:maven-scm-api:1.4" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.5.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.maven.scm:maven-scm-provider-svnexe:1.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.maven.scm:maven-scm-provider-svn-commons:1.4" level="project" />
- <orderEntry type="library" name="Maven: regexp:regexp:1.3" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index bcd41e5..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index d622de2..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/drone.iml" filepath="$PROJECT_DIR$/.idea/drone.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/dji/sample/wayline/dao/IWaylineJobBreakPointMapper.java b/src/main/java/com/dji/sample/wayline/dao/IWaylineJobBreakPointMapper.java
new file mode 100644
index 0000000..6840172
--- /dev/null
+++ b/src/main/java/com/dji/sample/wayline/dao/IWaylineJobBreakPointMapper.java
@@ -0,0 +1,13 @@
+package com.dji.sample.wayline.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dji.sample.wayline.model.entity.WaylineJobBreakPointEntity;
+
+/**
+ * @PROJECT_NAME: drone
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2024/3/23 11:09
+ */
+public interface IWaylineJobBreakPointMapper extends BaseMapper<WaylineJobBreakPointEntity> {
+}
diff --git a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java
index 44e92f3..8307907 100644
--- a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java
+++ b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskProgressExtBreakPoint.java
@@ -1,5 +1,6 @@
package com.dji.sample.wayline.model.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
/**
@@ -11,14 +12,22 @@
@Data
public class WaylineTaskProgressExtBreakPoint {
- private Integer attitudeHead;
- private Integer breakReason;
- private Integer height;
private Integer index;
- private Integer latitude;
- private Integer longitude;
- private Integer progress;
+
private Integer state;
+
+ private Double progress;
+
private Integer waylineId;
+ private Integer breakReason;
+
+ private Double latitude;
+
+ private Double longitude;
+
+ private Double height;
+
+ private Double attitudeHead;
+
}
diff --git a/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobBreakPointEntity.java b/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobBreakPointEntity.java
new file mode 100644
index 0000000..376fb96
--- /dev/null
+++ b/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobBreakPointEntity.java
@@ -0,0 +1,64 @@
+package com.dji.sample.wayline.model.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author sean
+ * @version 1.1
+ * @date 2022/6/1
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName(value = "wayline_job_break_point",autoResultMap = true)
+public class WaylineJobBreakPointEntity implements Serializable {
+
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ @TableField("job_id")
+ private String jobId;
+
+ @TableField("bp_index")
+ private Integer bpIndex;
+
+ @TableField("state")
+ private Integer state;
+
+ @TableField("progress")
+ private Double progress;
+
+ @TableField("wayline_id")
+ private Integer waylineId;
+
+ @TableField("break_reason")
+ private Integer breakReason;
+
+ @TableField("latitude")
+ private Double latitude;
+
+ @TableField("longitude")
+ private Double longitude;
+
+ @TableField("height")
+ private Double height;
+
+ @TableField("attitudehead")
+ private Double attitudeHead;
+
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Long createTime;
+
+ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+ private Long updateTime;
+
+}
diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineJobBreakPointService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineJobBreakPointService.java
new file mode 100644
index 0000000..b5bfc38
--- /dev/null
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobBreakPointService.java
@@ -0,0 +1,14 @@
+package com.dji.sample.wayline.service;
+
+import com.dji.sample.wayline.model.entity.WaylineJobBreakPointEntity;
+
+/**
+ * @PROJECT_NAME: drone
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2024/3/23 11:07
+ */
+public interface IWaylineJobBreakPointService {
+
+ public boolean addWaylineJobBreakPoint(WaylineJobBreakPointEntity entity);
+}
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
index 47a0442..f27f3a2 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
@@ -14,10 +14,13 @@
import com.dji.sample.media.model.MediaFileCountDTO;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.model.dto.WaylineJobKey;
+import com.dji.sample.wayline.model.dto.WaylineTaskProgressExtBreakPoint;
import com.dji.sample.wayline.model.dto.WaylineTaskProgressReceiver;
+import com.dji.sample.wayline.model.entity.WaylineJobBreakPointEntity;
import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum;
import com.dji.sample.wayline.model.enums.WaylineTaskTypeEnum;
import com.dji.sample.wayline.service.IFlightTaskService;
+import com.dji.sample.wayline.service.IWaylineJobBreakPointService;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.dji.sample.wayline.service.IWaylineRedisService;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -63,6 +66,9 @@
@Autowired
private IWaylineRedisService waylineRedisService;
+ @Autowired
+ private IWaylineJobBreakPointService waylineJobBreakPointService;
+
/**
* Handle the progress messages of the flight tasks reported by the dock.
* 处理机场上报的飞行任务进度信息
@@ -85,7 +91,31 @@
log.info("任务进度: {}", output.getProgress().toString());
if (null != output.getExt().getBreakPoint()) {
- log.info("任务进度 ===> 断点信息：{}", output.getExt().getBreakPoint().toString());
+ WaylineTaskProgressExtBreakPoint breakPoint = output.getExt().getBreakPoint();
+ log.info("任务进度 ===> 断点信息：{}", breakPoint.toString());
+ // 保存断点信息
+ try {
+ Boolean isAddBp = waylineJobBreakPointService.addWaylineJobBreakPoint(WaylineJobBreakPointEntity.builder()
+ .jobId(receiver.getBid())
+ .bpIndex(breakPoint.getIndex())
+ .state(breakPoint.getState())
+ .progress(breakPoint.getProgress())
+ .waylineId(breakPoint.getWaylineId())
+ .breakReason(breakPoint.getBreakReason())
+ .latitude(breakPoint.getLatitude())
+ .longitude(breakPoint.getLongitude())
+ .height(breakPoint.getHeight())
+ .attitudeHead(breakPoint.getAttitudeHead())
+ .build());
+ if (isAddBp) {
+ log.info("任务进度 ===> 断点信息 ===> 保存成功：{}", breakPoint.toString());
+ } else {
+ log.info("任务进度 ===> 断点信息 ===> 保存失败：{}", breakPoint.toString());
+ }
+ }catch (Exception e) {
+ log.info("任务进度 ===> 断点信息 ===> 保存失败：{},\n {}", breakPoint.toString(),e.getMessage());
+ }
+
}
if (eventsReceiver.getResult() != ResponseResult.CODE_SUCCESS) {
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobBreakPointServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobBreakPointServiceImpl.java
new file mode 100644
index 0000000..e456ed2
--- /dev/null
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobBreakPointServiceImpl.java
@@ -0,0 +1,28 @@
+package com.dji.sample.wayline.service.impl;
+
+import com.dji.sample.wayline.dao.IWaylineJobBreakPointMapper;
+import com.dji.sample.wayline.model.entity.WaylineJobBreakPointEntity;
+import com.dji.sample.wayline.service.IWaylineJobBreakPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @PROJECT_NAME: drone
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2024/3/23 11:21
+ */
+@Service
+@Transactional
+public class WaylineJobBreakPointServiceImpl implements IWaylineJobBreakPointService {
+
+ @Autowired
+ private IWaylineJobBreakPointMapper mapper;
+
+ @Override
+ public boolean addWaylineJobBreakPoint(WaylineJobBreakPointEntity entity) {
+ int insertId = mapper.insert(entity);
+ return insertId>0;
+ }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ac8e37a..33f69ec 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,9 +1,12 @@
#spring
spring:
datasource:
- url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
- username: root
- password: yshb@123
+# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
+# username: root
+# password: yshb@123
+ url: jdbc:mysql://192.168.2.104:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+ username: root
+ password: 123456
redis:
host: 127.0.0.1
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ac0cf11..ed74bbe 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,9 +1,12 @@
#spring
spring:
datasource:
- url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
+# username: root
+# password: yshb@123
+ url: jdbc:mysql://127.0.0.1:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
- password: yshb@123
+ password: jxpskj_2018
redis:
host: 127.0.0.1
--
Gitblit v1.9.3