dev #6

Merged

yuanqiang merged 74 commits from dev into test 11 months ago

yuanqiang commented 11 months ago

Owner

There is no content yet.

yuanqiang added 74 commits 11 months ago

a17dc254d5 [feat]

提交新版本

6e16e0a2bb 提交：图片比对修改

(cherry picked from commit eea8f2bd63)

7321f972b0 [feat]

1、修改根据设备权限获取飞行时长、飞行总价次

648fad0e8a [feat]

1、开发app相关功能

16b741290d [feat]

1、修改工作流bug

0f8f8603ba 改动

fc55fa0267 改动

6095947d8f Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

956c0d53dd Merge pull request 'dev' (#2 ) from dev into test

Reviewed-on: #2

38758ec5b7 Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

97895d4aef Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

# Conflicts:
#	dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java
#	dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java

60dd87a197 Merge pull request 'test' (#3 ) from test into master

Reviewed-on: #3

d51c1bfb40 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

# Conflicts:
#	dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java

579001a1a8 Merge branch 'wuyuan' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

1cf4aa57f3 1

ec7d7da18f 改动

1f43d62910 改动

8e8f5cbffb Merge branch 'wuyuan' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

# Conflicts:
#	dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java

64df39fdd2 改动

08343e9e51 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

# Conflicts:
#	dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java
#	dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java
#	dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java

3a6821b572 改动

f17a1432c1 [feat]修改生成案件号

045159043f [bug]实时预警接口

90d3ef685e Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

fcdbbd0683 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

3615d66873 ai预警平台推送用户

1685c8892f [feat]增加ai实时流预警列表查询

38ae466a5a 改动

28b616b5bf Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml

175de6bb82 推流接口

bfa2ea542a Merge remote-tracking branch 'origin/dev' into dev

5d7223be75 推流接口

fe95340e68 推流接口

731faee877 取消负载控制验证

bbf2dc57d0 [feat]修改预警统计查询

5a88dc5b6d Merge remote-tracking branch 'origin/dev' into dev

3e713dc9ce [bug]实时预警接口

f1856400cc Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

188fa5595d [feat]修改ai实时流预警推送

96233bb44e 取消负载控制验证

344d15a734 Merge remote-tracking branch 'origin/dev' into dev

90fdcfc75f [feat]去掉ai实时流预警权限

eadc252337 Merge remote-tracking branch 'origin/dev' into dev

3842d00629 不同项目-特定数据库查询加入动态配置，处理南通工地/丰县燃气项目。

7748ed2f74 [bug]实时预警接口-新增部门

3d1239ea10 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

3490a6efdf [feat]修改实时流预警增加分页查询&修改推送逻辑增加页面选择部门提交

8659c2cfae [feat]修改实时流预警增加分页查询&修改推送逻辑增加页面选择部门提交①

a30fa0eace [feat]修改实时流预警增加分页查询&修改推送逻辑增加页面选择部门提交&增加查询降序排序②

53856e06d8 提交

d223adbef5 推流接口

1cd95b2073 提交

0f425dd451 取消负载控制验证

f1cdcf7e55 Merge remote-tracking branch 'origin/dev' into dev

0be8b2fb90 提交

7e3fbe05ba 推流接口

edf2421452 取消负载控制验证

00b94b21a7 Merge remote-tracking branch 'origin/dev' into dev

0f261990f8 提交:无人机自动飞行逻辑修改

f9a167cd64 取消负载控制验证

94b291c967 Merge remote-tracking branch 'origin/dev' into dev

2efece6054 提交:演示流程修改

b729f33c01 提交

5eab033669 取消负载控制验证

52c60b63b7 Merge remote-tracking branch 'origin/dev' into dev

210ccbec1b 取消负载控制验证

852db5c9fc 提交:演示测试

343163f500 驭光算法-克隆版

b27068b3a2 取消负载控制验证

b011937260 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

f3b0e734e8 预警信息扩展-提交预警记录+文件

8e383badf3 Merge remote-tracking branch 'origin/dev' into dev

7fdf677a8a 取消负载控制验证

b626ee65f3 推流接口

yuanqiang merged commit b00159d492 into test 11 months ago

yuanqiang referenced this issue from a commit 11 months ago

Merge pull request 'dev' (#6) from dev into test

The pull request has been merged as b00159d492.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.