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
|
11 months ago |
suqin
|
9e7ea42d21
|
修改单次任务的分页查询的vo构建:查出name
|
11 months ago |
suqin
|
5f035f41b2
|
修改单次任务的分页查询的xml文件 删除 1、name的映射 2、sql语句片段处select xx_name
|
11 months ago |
suqin
|
2b7c628055
|
删除单次任务新增编辑时的关于name的参数的判断(某些功能里vo所需的name值可能为空)
|
11 months ago |
suqin
|
82e27123f0
|
修改执行记录接口 删除单次/周期任务新增编辑时的关于name的参数的判断
|
11 months ago |
wanjing
|
9ee3bf80d5
|
修改任务分页列表,处理公路名称、路段范围、机场名称、航线名称字段
|
11 months ago |
wanjing
|
fb4994033b
|
任务表中去掉公路名称、路段范围、机场名称、航线名称字段
|
11 months ago |
suqin
|
d3797fc8eb
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 months ago |
wanjing
|
db21823dd4
|
新增根据机场ID获取航线列表接口
|
11 months ago |
suqin
|
0cc929530c
|
接口: 任务·已取消
|
11 months ago |
wanjing
|
b5d1fb423e
|
任务新增飞行距离,飞行时长字段
|
11 months ago |
wanjing
|
c538e49b04
|
修改任务执行逻辑,先调用机场创建任务,在根据机场返回的机场任务Id执行
|
11 months ago |
wanjing
|
e70303b31c
|
1、提交创建周期性任务子任务代码;2、修改单次任务code编码;3、修改应急任务code编码;
|
11 months ago |
suqin
|
5e969e2723
|
修改application-local.yml的 airport-url
查询第三方的航线平台的(开发-->测试)环境的数据库
|
11 months ago |
suqin
|
1e3a599240
|
修改周期任务分页查询结果VO 添加缺少字段:roadId和sectionID 添加航线预览接口 和根据droneID查询航线列表
|
11 months ago |
suqin
|
8d6fb657d4
|
String username = SecurityUserUtils.username();
|
11 months ago |
suqin
|
995e66fbfd
|
周期任务
|
11 months ago |
wanjing
|
0ea8c77fcf
|
解决飞手任务没有回放问题
|
11 months ago |
wanjing
|
48c865c85c
|
解决飞手任务没有回放问题
|
11 months ago |
wanjing
|
f446391bda
|
修改导出问题清单代码
|
11 months ago |
wanjing
|
4d1ae2d5b6
|
修改导出问题清单问题传参
|
11 months ago |
wanjing
|
cdf62f3995
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop
|
11 months ago |
wanjing
|
979d19a2e3
|
修改物联设备分页列表
|
11 months ago |
suqin
|
04d53321ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 months ago |
suqin
|
a820df349a
|
改bug:重新编辑其他数据保存时,设备编码校验错误 未改变设备编码时,应不需要重复校验代码
|
11 months ago |
wanjing
|
2c37bbe60b
|
修改导出问题清单接口为post
|
11 months ago |
wanjing
|
376a235c5d
|
修改导出问题清单代码
|
11 months ago |
wanjing
|
1237cc1b2d
|
解决物联设备分页列表数据权限问题
|
11 months ago |
suqin
|
f832618fc9
|
用户真实姓名使用createUsername
|
11 months ago |
suqin
|
b87c4e2938
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 months ago |
suqin
|
7773147229
|
返回数据模型新增字段:路段范围sectionRange 和 用户名username
|
11 months ago |
wanjing
|
5c57d446b1
|
解决工作台物联设备数量展示不正确问题
|
11 months ago |
wanjing
|
72ce988261
|
修改获取问题列表查询条件
|
11 months ago |
wanjing
|
b9f4587ddf
|
修改导出问题清单代码
|
11 months ago |
wanjing
|
74f7321c7c
|
修改日志配置文件
|
11 months ago |
wanjing
|
d33fb0a9b3
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop
|
11 months ago |
wanjing
|
8bdd3cb0c7
|
提交自动生成报告
|
11 months ago |
suqin
|
23c106d817
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 months ago |
suqin
|
9452d11bf2
|
修改启用/禁用状态接口
|
11 months ago |
wanjing
|
56b26125d1
|
新增根据任务ID查询问题列表接口
|
11 months ago |
suqin
|
2791e1b5bf
|
String username = SecurityUserUtils.username();
|
11 months ago |
suqin
|
afa422cc6a
|
request.tenantId和request.deptIdList
|
11 months ago |
suqin
|
e4f34675f0
|
request.tenantId和request.deptId
|
11 months ago |
suqin
|
77fac3fc59
|
使用真实token
|
11 months ago |
suqin
|
1d186f0561
|
修改和新增的controller层添加缺失注解@RequestBody
|
11 months ago |
wanjing
|
0b63041b56
|
修改查询物联设备列表接口
|
11 months ago |
wanjing
|
9d1dc56cae
|
修改导出问题清单代码
|
11 months ago |
wanjing
|
9dda793de6
|
1、问题清单导出代码;2、工作台获取机场详细信息;3、sql脚本;
|
11 months ago |
wanjing
|
d40d8f6a8f
|
1、修改任务分页列表中编辑,执行代码;2、删除问题代码;
|
11 months ago |
wanjing
|
847c6372d4
|
1、物联设备相关代码;2、问题删除、导出代码;3、请求第三方平台使用restTemplate方式;4、修改日志配置文件;
|
11 months ago |