forked from drone/drone-java
| pom.xml | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/dji/sample/log/model/entity/DroneFlightLogEntity.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/dji/sample/manage/service/impl/DeviceOSDServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-dev.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-prod.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application.yml | ●●●●● patch | view | raw | blame | history |
pom.xml
@@ -219,7 +219,7 @@ </plugin> </plugins> <!--配置后才可以扫描到xml文件--> <!--配置后才可以扫描到xml文件--> <resources> <resource> <directory>src/main/resources</directory> src/main/java/com/dji/sample/log/model/entity/DroneFlightLogEntity.java
@@ -42,6 +42,8 @@ private Double totalFlightDistance; @TableField("track_id") private String trackId; @TableField("job_id") private String jobId; @TableField("start_flight_distance") private Double startFlightDistance; @TableField("end_flight_distance") src/main/java/com/dji/sample/manage/service/impl/DeviceOSDServiceImpl.java
@@ -89,6 +89,7 @@ .title(data.getModeCode().getVal() == 3?"手动飞行":data.getModeCode().getVal() == 4?"自动起飞":data.getModeCode().getVal() == 5?"航线飞行":"未知") .startTime(System.currentTimeMillis()) .trackId(data.getTrackId()) .jobId(String.valueOf(RedisOpsUtils.get(RedisConst.FLIGHT_LOG + "job_id"))) .startFlightDistance(data.getTotalFlightDistance()) .build(); droneFlightLogService.save(dflPo); src/main/java/com/dji/sample/wayline/service/impl/FlightTaskServiceImpl.java
@@ -76,6 +76,9 @@ eventsReceiver.setBid(receiver.getBid()); eventsReceiver.setSn(receiver.getGateway()); //用户记录飞行任务id RedisOpsUtils.set(RedisConst.FLIGHT_LOG + "job_id",receiver.getBid()); WaylineTaskProgressReceiver output = eventsReceiver.getOutput(); log.info("Task progress: {}", output.getProgress().toString()); src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -421,7 +421,7 @@ .status(WaylineJobStatusEnum.FAILED.getVal()) .completedTime(LocalDateTime.now()) .code(serviceReply.getResult()).build()); // The conditional task fails and enters the blocking status. // 条件任务失败，进入阻塞状态。 if (WaylineTaskTypeEnum.CONDITION == job.getTaskType() && WaylineErrorCodeEnum.find(serviceReply.getResult()).isBlock()) { waylineRedisService.setBlockedWaylineJob(job.getDockSn(), jobId); src/main/resources/application-dev.yml
New file @@ -0,0 +1,73 @@ #spring spring: datasource: url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true username: root password: yshb@123 redis: host: 127.0.0.1 port: 6379 database: 0 username: # if you enable password: lettuce: pool: max-active: 8 max-idle: 8 min-idle: 0 rabbitmq: host: 182.108.40.114 port: 35672 username: root password: root virtualHost: / is-open: false jwt: issuer: DJI subject: CloudApiSample secret: CloudApiSample age: 86400 mqtt: # @see com.dji.sample.component.mqtt.model.MqttUseEnum # BASIC parameters are required. BASIC: protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum host: 139.196.74.78 port: 1883 username: manage password: 123456 # host: 127.0.0.1 # port: 1883 # username: guest # password: guest client-id: manage_drone # If the protocol is ws/wss, this value is required. path: # 最初连接到mqtt时需要订阅的主题 多个订阅用 "," . inbound-topic: sys/product/+/status,thing/product/+/requests,thing/product/+/osd # inbound-topic: sys/product/+/+,thing/product/+/+ DRC: protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum host: 139.196.74.78 port: 8083 path: /mqtt oss: enable: true provider: minio endpoint: http://dev.jxpskj.com:9000 external-endpoint: http://dev.jxpskj.com:9000 access-key: pskj secret-key: pskj@2021 bucket: cloud-bucket expire: 3600 region: us-east-1 object-dir-prefix: out-net-file-address: http://dev.jxpskj.com:9000
New file @@ -0,0 +1,73 @@ #spring spring: datasource: url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true username: root password: yshb@123 redis: host: 127.0.0.1 port: 6379 database: 0 username: # if you enable password: jxpskj_2018 lettuce: pool: max-active: 8 max-idle: 8 min-idle: 0 rabbitmq: host: 182.108.40.114 port: 35672 username: root password: root virtualHost: / is-open: false jwt: issuer: DJI subject: CloudApiSample secret: CloudApiSample age: 86400 mqtt: # @see com.dji.sample.component.mqtt.model.MqttUseEnum # BASIC parameters are required. BASIC: protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum host: 139.196.74.78 port: 1883 username: manage password: 123456 # host: 127.0.0.1 # port: 1883 # username: guest # password: guest client-id: manage_drone # If the protocol is ws/wss, this value is required. path: # 最初连接到mqtt时需要订阅的主题 多个订阅用 "," . inbound-topic: sys/product/+/status,thing/product/+/requests # inbound-topic: sys/product/+/+,thing/product/+/+ DRC: protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum host: 139.196.74.78 port: 8083 path: /mqtt oss: enable: true provider: minio endpoint: http://dev.jxpskj.com:9000 external-endpoint: http://dev.jxpskj.com:9000 access-key: pskj secret-key: pskj@2021 bucket: cloud-bucket expire: 3600 region: us-east-1 object-dir-prefix: out-net-file-address: http://dev.jxpskj.com:9000
@@ -10,78 +10,15 @@ druid: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://172.16.13.129:3306/cloud_sample?useSSL=false&allowPublicKeyRetrieval=true # username: root # password: 123456 url: jdbc:mysql://182.106.212.58:3308/drone_test?useSSL=false&allowPublicKeyRetrieval=true username: root password: yshb@123 initial-size: 10 min-idle: 10 max-active: 20 max-wait: 60000 redis: host: 127.0.0.1 port: 6379 database: 0 username: # if you enable password: lettuce: pool: max-active: 8 max-idle: 8 min-idle: 0 servlet: multipart: max-file-size: 2GB max-request-size: 2GB rabbitmq: host: 182.106.212.58 port: 35672 username: root password: root virtualHost: / is-open: true # rabbitmq: # host: localhost # port: 5672 # username: guest # password: guest # virtualHost: / # is-open: true jwt: issuer: DJI subject: CloudApiSample secret: CloudApiSample age: 86400 mqtt: # @see com.dji.sample.component.mqtt.model.MqttUseEnum # BASIC parameters are required. BASIC: protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum host: 182.106.212.58 port: 31883 username: root password: root # host: 127.0.0.1 # port: 1883 # username: guest # password: guest client-id: aix123456 # If the protocol is ws/wss, this value is required. path: # 最初连接到mqtt时需要订阅的主题 多个订阅用 "," . # inbound-topic: sys/product/+/status,thing/product/+/requests,thing/product/+/osd inbound-topic: sys/product/+/+,thing/product/+/+ DRC: protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum host: 182.106.212.58 port: 35675 path: /ws url: manage: @@ -129,23 +66,6 @@ # role-arn: # bucket: cloudapi-bucket # object-dir-prefix: wayline oss: enable: true provider: minio # endpoint: http://172.16.13.129:9000 # access-key: admin # secret-key: 12345678 endpoint: http://dev.jxpskj.com:9000 external-endpoint: http://dev.jxpskj.com:9000 # endpoint: https://dev.jxpskj.com:8026 access-key: pskj secret-key: pskj@2021 bucket: cloud-bucket expire: 3600 region: us-east-1 object-dir-prefix: out-net-file-address: http://171.34.76.171:8880/drone/file logging: level:
