wanjing
|
db5a6f63b2
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
25fe585295
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop
|
9 months ago |
wanjing
|
6354fa2df7
|
小程序取出航线名称字段,改为自动获取
|
9 months ago |
suqin
|
1fc16f4b29
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
0af50d6af7
|
立即执行-删除有关“name”的判断
|
9 months ago |
suqin
|
6272e74f58
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
6e94506b32
|
定时任务:查询任务开始一小时后状态仍为 待执行5和准备中6
并修改状态为任务失败
|
9 months ago |
suqin
|
9d7a61aa23
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
e0e04c579c
|
修改任务字段
|
9 months ago |
suqin
|
9b377ef7a3
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
20232f7341
|
修改sql片段 删除resumbitInspectionService里面的name
|
9 months ago |
suqin
|
04a64a661c
|
添加sql片段Base_Column_list
|
9 months ago |
suqin
|
e398759152
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Inspection.java
# tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionPageListService.java
# tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml
|
9 months ago |
suqin
|
9e7ea42d21
|
修改单次任务的分页查询的vo构建:查出name
|
9 months ago |
suqin
|
5f035f41b2
|
修改单次任务的分页查询的xml文件 删除 1、name的映射 2、sql语句片段处select xx_name
|
9 months ago |
suqin
|
2b7c628055
|
删除单次任务新增编辑时的关于name的参数的判断(某些功能里vo所需的name值可能为空)
|
9 months ago |
suqin
|
82e27123f0
|
修改执行记录接口 删除单次/周期任务新增编辑时的关于name的参数的判断
|
9 months ago |
wanjing
|
9ee3bf80d5
|
修改任务分页列表,处理公路名称、路段范围、机场名称、航线名称字段
|
9 months ago |
wanjing
|
fb4994033b
|
任务表中去掉公路名称、路段范围、机场名称、航线名称字段
|
9 months ago |
suqin
|
d3797fc8eb
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
wanjing
|
db21823dd4
|
新增根据机场ID获取航线列表接口
|
9 months ago |
suqin
|
0cc929530c
|
接口: 任务·已取消
|
9 months ago |
wanjing
|
b5d1fb423e
|
任务新增飞行距离,飞行时长字段
|
9 months ago |
wanjing
|
c538e49b04
|
修改任务执行逻辑,先调用机场创建任务,在根据机场返回的机场任务Id执行
|
9 months ago |
wanjing
|
e70303b31c
|
1、提交创建周期性任务子任务代码;2、修改单次任务code编码;3、修改应急任务code编码;
|
9 months ago |
suqin
|
fc92e58068
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
5e969e2723
|
修改application-local.yml的 airport-url
查询第三方的航线平台的(开发-->测试)环境的数据库
|
9 months ago |
suqin
|
25d51edf6d
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
1e3a599240
|
修改周期任务分页查询结果VO 添加缺少字段:roadId和sectionID 添加航线预览接口 和根据droneID查询航线列表
|
9 months ago |
suqin
|
e39f004c1e
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
8d6fb657d4
|
String username = SecurityUserUtils.username();
|
9 months ago |
suqin
|
995e66fbfd
|
周期任务
|
9 months ago |
wanjing
|
a7b9a473b5
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
0ea8c77fcf
|
解决飞手任务没有回放问题
|
9 months ago |
wanjing
|
adc67de16c
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
48c865c85c
|
解决飞手任务没有回放问题
|
9 months ago |
wanjing
|
bc8386ed63
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
f446391bda
|
修改导出问题清单代码
|
9 months ago |
wanjing
|
b541d0365a
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
4d1ae2d5b6
|
修改导出问题清单问题传参
|
9 months ago |
wanjing
|
49872eb4f0
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
cdf62f3995
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop
|
9 months ago |
wanjing
|
979d19a2e3
|
修改物联设备分页列表
|
9 months ago |
suqin
|
b80e9a1675
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
suqin
|
04d53321ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
suqin
|
a820df349a
|
改bug:重新编辑其他数据保存时,设备编码校验错误 未改变设备编码时,应不需要重复校验代码
|
9 months ago |
wanjing
|
bb022f1bd4
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
2c37bbe60b
|
修改导出问题清单接口为post
|
9 months ago |
wanjing
|
8805d0fcbf
|
Merge branch 'develop' of gitadmin/tuoheng_freeway into release
|
9 months ago |
wanjing
|
376a235c5d
|
修改导出问题清单代码
|
9 months ago |