 吴远
|
64df39fdd2
|
改动
|
1 month ago |
|
吴远
|
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
|
1 month ago |
 杨威
|
2f78be2b4e
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 month ago |
|
杨威
|
2651bfdeaa
|
[feat]
1、修改预警查询问题。
2、增加工作流批量加签功能。
|
1 month ago |
 袁强
|
3f7b3eb7ac
|
提交:feign
|
1 month ago |
|
杨威
|
eb3b6364de
|
[feat]
1、修改工作流
|
1 month ago |
|
杨威
|
82903e136a
|
[feat]
1、修改设备组管理相关问题④
|
1 month ago |
|
杨威
|
639dd1d056
|
[feat]
1、修改设备组管理相关问题③
|
1 month ago |
|
杨威
|
18a6858dfb
|
[feat]
1、修改设备组管理相关问题②
|
1 month ago |
|
杨威
|
7486db2f68
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 month ago |
|
杨威
|
b776c64d65
|
[feat]
1、修改设备组管理相关问题①
|
1 month ago |
|
袁强
|
6d90d193bd
|
提交：预警热力图
|
1 month ago |
|
杨威
|
f5c4041894
|
[feat]
1、修改bug
|
2 months ago |
|
杨威
|
8aced047e5
|
[feat]
1、修改根据用户查询设备组信息①
|
2 months ago |
|
吴远
|
1f43d62910
|
改动
|
2 months ago |
|
杨威
|
06ebc2a4ea
|
[feat]
1、增加预警管理查询标签下拉列表接口①
|
2 months ago |
|
杨威
|
37f98c55a5
|
[feat]
1、对接设备权限③
|
2 months ago |
|
杨威
|
f29808dfaf
|
[feat]
1、增加预警管理根据标签查询
2、增加工作流动态增加处理人逻辑。
3、对接设备权限②
|
2 months ago |
|
杨威
|
993a9d44d7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 months ago |
|
杨威
|
8a664019af
|
[feat]
1、增加预警管理根据标签查询
2、增加工作流动态增加处理人逻辑。
3、对接设备权限
|
2 months ago |
|
袁强
|
a3e6b0b2fa
|
提交：排序
|
2 months ago |
|
吴远
|
ec7d7da18f
|
改动
|
2 months ago |
|
吴远
|
1cf4aa57f3
|
1
|
2 months ago |
|
吴远
|
579001a1a8
|
Merge branch 'wuyuan' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone
|
2 months ago |
|
杨威
|
0bab96fa64
|
[feat]
1、增加预警已完结接口、增加查询部门处置人员接口②
|
2 months ago |
|
杨威
|
98ee5beb61
|
[feat]
1、增加预警已完结接口、增加查询部门处置人员接口②
|
2 months ago |
|
杨威
|
987006d305
|
[feat]
1、增加预警已完结接口、增加查询部门处置人员接口①
|
2 months ago |
|
杨威
|
3fca31c79f
|
[feat]
1、修复预警统计查询未删除的预警②
|
2 months ago |
|
杨威
|
f2ddd94e5e
|
[feat]
1、修复预警统计图展示如果没有下一级则展示当前级
|
2 months ago |
|
杨威
|
5ad384d2c0
|
[feat]
1、恢复查询权限①
|
2 months ago |
|
杨威
|
711c489a87
|
[feat]
1、修改无人机复制航线bug
|
2 months ago |
|
杨威
|
cfa54467eb
|
[feat]
1、增加部门筛选预警、去掉部门根据当前查询查询部门接口的saToken权限①
|
2 months ago |
|
吴远
|
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
|
2 months ago |
|
杨威
|
3bf3345f7c
|
[feat]
1、修改数据权限②
|
2 months ago |
|
袁强
|
60dd87a197
|
Merge pull request 'test' (#3) from test into master
Reviewed-on: #3
|
2 months ago |
|
袁强
|
20c6fc5ca0
|
提交
|
2 months ago |
|
杨威
|
5af411aab1
|
[feat]
1、修改数据权限①
|
2 months ago |
|
杨威
|
a54cceef0d
|
[feat]
1、增加图片比对历史预警、根据经纬度查看重复预警个数③
|
2 months ago |
|
杨威
|
5224a43389
|
[feat]
1、增加图片比对历史预警、根据经纬度查看重复预警个数②
|
2 months ago |
|
杨威
|
c9f0286fd8
|
[feat]
1、增加图片比对历史预警、根据经纬度查看重复预警个数②
|
2 months ago |
|
杨威
|
010341500b
|
[feat]
1、增加图片比对历史预警、根据经纬度查看重复预警个数
|
2 months ago |
|
杨威
|
bd1be26370
|
[feat]
1、修改飞行次数时长接受参数和异步调用②
|
2 months ago |
|
杨威
|
7dafce3977
|
[feat]
1、修改飞行次数时长接受参数和异步调用①
|
2 months ago |
|
吴远
|
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
|
2 months ago |
|
吴远
|
38758ec5b7
|
Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone
|
2 months ago |
|
杨威
|
9a3ffebe7a
|
[feat]
1、增加loginUser中设备权限字段①
|
2 months ago |
|
杨威
|
0099ad53ad
|
[feat]
1、修改bug①
|
2 months ago |
|
杨威
|
d88ba8b224
|
[feat]
1、修改bug
|
2 months ago |
|
袁强
|
6e066e4e90
|
提交：生成图片预警(多个)
|
2 months ago |
|
袁强
|
a5b383a285
|
提交
|
2 months ago |
