a7c2b17
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-20 14:35:01 +0800
3b32593
(refs/pull/362/head)
小程序修改日志配置 by
2023-12-20 14:34:32 +0800
db5a6f6
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-20 13:58:04 +0800
25fe585
(refs/pull/361/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-12-20 13:57:30 +0800
6354fa2
小程序取出航线名称字段,改为自动获取 by
2023-12-20 13:57:24 +0800
1fc16f4
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-18 12:33:08 +0800
0af50d6
(refs/pull/360/head)
立即执行-删除有关“name”的判断 by
2023-12-18 12:32:12 +0800
6272e74
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-18 11:01:23 +0800
6e94506
(refs/pull/359/head)
定时任务:查询任务开始一小时后状态仍为 待执行5和准备中6 并修改状态为任务失败 by
2023-12-18 10:53:39 +0800
9d7a61a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-16 13:55:35 +0800
e0e04c5
(refs/pull/358/head)
修改任务字段 by
2023-12-16 13:52:17 +0800
9b377ef
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-16 13:18:02 +0800
20232f7
(refs/pull/357/head)
修改sql片段 删除resumbitInspectionService里面的name by
2023-12-16 13:16:51 +0800
04a64a6
添加sql片段Base_Column_list by
2023-12-16 11:20:16 +0800
e398759
Merge remote-tracking branch 'origin/develop' into develop by
2023-12-16 10:23:43 +0800
9e7ea42
修改单次任务的分页查询的vo构建:查出name by
2023-12-16 10:18:59 +0800
5f035f4
修改单次任务的分页查询的xml文件 删除 1、name的映射 2、sql语句片段处select xx_name by
2023-12-16 10:06:30 +0800
2b7c628
删除单次任务新增编辑时的关于name的参数的判断(某些功能里vo所需的name值可能为空) by
2023-12-16 09:59:37 +0800
82e2712
修改执行记录接口 删除单次/周期任务新增编辑时的关于name的参数的判断 by
2023-12-16 09:51:05 +0800
9ee3bf8
修改任务分页列表,处理公路名称、路段范围、机场名称、航线名称字段 by
2023-12-15 17:21:17 +0800
7f2d9c2
Merge branch 'develop' of gitadmin/tuoheng_freeway into master by
2023-12-15 17:20:54 +0800
fb49940
(refs/pull/356/head)
任务表中去掉公路名称、路段范围、机场名称、航线名称字段 by
2023-12-15 17:06:14 +0800
d3797fc
Merge remote-tracking branch 'origin/develop' into develop by
2023-12-15 16:22:44 +0800
db21823
新增根据机场ID获取航线列表接口 by
2023-12-15 16:17:48 +0800
0cc9295
接口: 任务·已取消 by
2023-12-15 16:02:04 +0800
b5d1fb4
任务新增飞行距离,飞行时长字段 by
2023-12-15 15:37:56 +0800
c538e49
修改任务执行逻辑,先调用机场创建任务,在根据机场返回的机场任务Id执行 by
2023-12-15 15:19:04 +0800
e70303b
1、提交创建周期性任务子任务代码;2、修改单次任务code编码;3、修改应急任务code编码; by
2023-12-15 14:08:28 +0800
fc92e58
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-13 16:42:43 +0800
5e969e2
(refs/pull/355/head)
修改application-local.yml的 airport-url 查询第三方的航线平台的(开发-->测试)环境的数据库 by
2023-12-13 16:41:52 +0800
25d51ed
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-13 14:28:36 +0800
1e3a599
(refs/pull/354/head)
修改周期任务分页查询结果VO 添加缺少字段:roadId和sectionID 添加航线预览接口 和根据droneID查询航线列表 by
2023-12-13 13:24:49 +0800
e39f004
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-11 16:00:36 +0800
8d6fb65
(refs/pull/353/head)
String username = SecurityUserUtils.username(); by
2023-12-11 15:59:06 +0800
995e66f
周期任务 by
2023-12-09 16:09:26 +0800
b84f38a
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2023-12-08 11:46:46 +0800
a7b9a47
(refs/pull/352/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-08 11:45:48 +0800
0ea8c77
(refs/pull/351/head)
解决飞手任务没有回放问题 by
2023-12-08 11:45:20 +0800
adc67de
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-08 11:41:37 +0800
48c865c
(refs/pull/350/head)
解决飞手任务没有回放问题 by
2023-12-08 11:41:11 +0800
09949c3
(tag: V1.3.3)
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2023-12-07 10:54:25 +0800
bc8386e
(refs/pull/349/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-06 10:27:45 +0800
f446391
(refs/pull/348/head)
修改导出问题清单代码 by
2023-12-06 10:27:09 +0800
b541d03
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-05 16:49:04 +0800
4d1ae2d
(refs/pull/347/head)
修改导出问题清单问题传参 by
2023-12-05 16:48:02 +0800
49872eb
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-05 15:58:27 +0800
cdf62f3
(refs/pull/346/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-12-05 15:58:02 +0800
979d19a
修改物联设备分页列表 by
2023-12-05 15:57:58 +0800
b80e9a1
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-05 15:27:34 +0800
04d5332
(refs/pull/345/head)
Merge remote-tracking branch 'origin/develop' into develop by
2023-12-05 15:26:21 +0800
a820df3
改bug:重新编辑其他数据保存时,设备编码校验错误 未改变设备编码时,应不需要重复校验代码 by
2023-12-05 15:22:53 +0800
bb022f1
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-05 13:43:50 +0800
2c37bbe
(refs/pull/344/head)
修改导出问题清单接口为post by
2023-12-05 13:43:18 +0800
8805d0f
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-05 10:54:09 +0800
376a235
(refs/pull/343/head)
修改导出问题清单代码 by
2023-12-05 10:53:25 +0800
1237cc1
解决物联设备分页列表数据权限问题 by
2023-12-05 10:41:47 +0800
ff3b4c8
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-04 15:22:14 +0800
f832618
(refs/pull/342/head)
用户真实姓名使用createUsername by
2023-12-04 15:13:36 +0800
b87c4e2
Merge remote-tracking branch 'origin/develop' into develop by
2023-12-04 14:49:53 +0800
7773147
返回数据模型新增字段:路段范围sectionRange 和 用户名username by
2023-12-04 14:49:09 +0800
819f357
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-04 09:35:03 +0800
5c57d44
(refs/pull/341/head)
解决工作台物联设备数量展示不正确问题 by
2023-12-04 09:34:08 +0800
e9941ad
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-01 17:20:57 +0800
72ce988
(refs/pull/340/head)
修改获取问题列表查询条件 by
2023-12-01 17:20:33 +0800
5d8be1c
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-01 14:17:27 +0800
b9f4587
(refs/pull/339/head)
修改导出问题清单代码 by
2023-12-01 14:16:51 +0800
74f7321
修改日志配置文件 by
2023-12-01 10:12:52 +0800
d33fb0a
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-11-30 16:45:23 +0800
8bdd3cb
提交自动生成报告 by
2023-11-30 16:45:18 +0800
5fa36b7
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-30 10:37:08 +0800
23c106d
(refs/pull/338/head)
Merge remote-tracking branch 'origin/develop' into develop by
2023-11-30 10:31:02 +0800
9452d11
修改启用/禁用状态接口 by
2023-11-30 10:26:59 +0800
b9aac23
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-29 18:32:23 +0800
56b2612
(refs/pull/337/head)
新增根据任务ID查询问题列表接口 by
2023-11-29 18:31:48 +0800
cfeb508
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-29 16:32:41 +0800
2791e1b
(refs/pull/336/head)
String username = SecurityUserUtils.username(); by
2023-11-29 10:57:27 +0800
1f3f473
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-28 16:16:00 +0800
afa422c
(refs/pull/335/head)
request.tenantId和request.deptIdList by
2023-11-28 15:27:46 +0800
e4f3467
request.tenantId和request.deptId by
2023-11-28 15:20:46 +0800
77fac3f
使用真实token by
2023-11-28 15:12:26 +0800
1d186f0
修改和新增的controller层添加缺失注解@RequestBody by
2023-11-28 15:08:10 +0800
0b63041
修改查询物联设备列表接口 by
2023-11-28 11:25:29 +0800
151ea91
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-28 11:14:44 +0800
9d1dc56
(refs/pull/334/head)
修改导出问题清单代码 by
2023-11-28 11:14:07 +0800
8e82e80
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-28 10:17:59 +0800
9dda793
(refs/pull/333/head)
1、问题清单导出代码;2、工作台获取机场详细信息;3、sql脚本; by
2023-11-28 10:17:23 +0800
395165e
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-27 17:19:01 +0800
d40d8f6
(refs/pull/332/head)
1、修改任务分页列表中编辑,执行代码;2、删除问题代码; by
2023-11-27 17:17:22 +0800
847c637
1、物联设备相关代码;2、问题删除、导出代码;3、请求第三方平台使用restTemplate方式;4、修改日志配置文件; by
2023-11-27 14:36:39 +0800
1c1f984
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-11-27 11:42:12 +0800
f0762f2
修改用户中心创建租户时,传clientId问题 by
2023-11-27 11:42:06 +0800
4cc898a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-27 11:29:50 +0800
c41b883
(refs/pull/331/head)
Merge remote-tracking branch 'origin/develop' into develop by
2023-11-27 11:29:18 +0800
b8631b8
更新创建菜单\权限相关对应角色 by
2023-11-27 11:29:14 +0800
3245520
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-20 14:10:06 +0800
708c338
(refs/pull/330/head)
修改添加部门代码 by
2023-11-20 14:09:18 +0800
90c1460
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-20 13:42:38 +0800
23be470
(refs/pull/329/head)
修改添加部门代码 by
2023-11-20 13:42:09 +0800
6a82597
(dev_sq)
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2023-11-20 10:12:02 +0800
a5982a8
(refs/pull/328/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-11-20 10:11:31 +0800