Commit Graph

  • *
  • *
  • *
  • |\
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • | |\
  • | | *
  • | | |\
  • | | * |
  • * | | |
  • |\| | |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\ \
  • | | * | |
  • | * | | |
  • | |\ \ \ \
  • | | | |/ /
  • | | |/| |
  • | | * | |
  • | | |\| |
  • | | | |/
  • | | |/|
  • | | | *
  • | * | |
  • | |\| |
  • | | * |
  • | | |/
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\ \
  • | | * | |
  • | * | | |
  • | |\ \ \ \
  • | | | |/ /
  • | | |/| |
  • | | * | |
  • | * | | |
  • | |\| | |
  • | | * | |
  • | | |/ /
  • | * | |
  • | |\| |
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | | | *
  • | | | |\
  • | | | |/
  • | | |/|
  • | * | |
  • | |\| |
  • | | * |
  • | | | *
  • | | |/
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |/
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\|
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • de8b5f7 (refs/pull/284/head) 同步机场平台修改机场平台地址和url by chengwang 2023-08-17 09:17:43 +0800
  • 1641055 更新oidc对接租户禁用相关信息提示 by xiaoying 2023-07-05 13:43:48 +0800
  • faf820c (refs/pull/283/head) Merge branch 'release' of gitadmin/tuoheng_freeway into master by chengwang 2023-04-12 17:33:34 +0800
  • 19f4c50 (refs/pull/282/head) Merge branch 'master' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-12 17:25:04 +0800
  • b158ff2 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-12 16:20:09 +0800
  • fca10dc (refs/pull/279/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by chengwang 2023-04-12 16:15:52 +0800
  • f28223a type更新为1 by chengwang 2023-04-12 16:15:42 +0800
  • 3ee9239 (tag: v1.2.0, refs/pull/281/head, refs/pull/280/head) Merge branch 'release' of gitadmin/tuoheng_freeway into master by wanjing 2023-04-12 15:43:55 +0800
  • 62aa60a (refs/pull/278/head) Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-12 15:01:58 +0800
  • bb7b918 (refs/pull/277/head) 修改事故卡片图片显示问题 by wanjing 2023-04-12 15:01:30 +0800
  • c4e3e03 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-12 14:45:48 +0800
  • daa42a5 (refs/pull/276/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-04-12 14:45:11 +0800
  • 5c3450e 修改事故核实查找坐标代码 by wanjing 2023-04-12 14:44:59 +0800
  • 290d893 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-12 12:02:37 +0800
  • e3b644f (refs/pull/275/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-04-12 12:00:50 +0800
  • 77c9c28 修改dsp服务实例id by chengwang 2023-04-12 12:00:11 +0800
  • 5efa576 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-12 10:49:26 +0800
  • 24fabdb (refs/pull/274/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-04-12 10:48:56 +0800
  • 279757d 事故告警提示增加问题类型等字段 by wanjing 2023-04-12 10:48:44 +0800
  • 469d3e3 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-11 17:48:53 +0800
  • 21a55f9 (refs/pull/273/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-04-11 17:47:53 +0800
  • 95e0143 mark值判断添加else判断 by chengwang 2023-04-11 17:47:40 +0800
  • b40b14d Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-11 12:03:45 +0800
  • 9f00d1f (refs/pull/272/head) Merge branch 'feature_v1.0' into develop by chengwang 2023-04-11 12:02:38 +0800
  • 1698c6a 修改dsp服务实例id by chengwang 2023-04-11 12:02:26 +0800
  • d28265a Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-10 17:21:14 +0800
  • 7c2a300 (refs/pull/271/head) mapper文件对应的sql添加mark字段 by chengwang 2023-04-10 17:20:40 +0800
  • 24de17f Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-10 17:04:40 +0800
  • 72eb10e (refs/pull/270/head) mapper文件对应的sql添加mark字段 by chengwang 2023-04-10 17:03:52 +0800
  • c1e7fd3 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-10 16:51:37 +0800
  • 9cbcbb0 (refs/pull/269/head) 修改根据问题类型修改问题mark值 by chengwang 2023-04-10 16:49:38 +0800
  • 76c69f6 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-10 16:18:12 +0800
  • f94128a (refs/pull/268/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-04-10 16:16:44 +0800
  • 1336620 修改根据问题类型修改问题mark值 by chengwang 2023-04-10 16:16:29 +0800
  • d536eed Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-07 11:46:34 +0800
  • 4cb6afe (refs/pull/267/head) 修改应急任务状态 by wanjing 2023-04-07 11:46:05 +0800
  • 0e98bff Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-07 11:16:25 +0800
  • 2994977 (refs/pull/266/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-04-07 11:15:43 +0800
  • 26448f6 修改应急任务状态,添加日志 by wanjing 2023-04-07 11:14:21 +0800
  • 9bad6a7 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by xuziqing 2023-04-07 08:36:06 +0800
  • 7fa22dd (refs/pull/265/head) Merge remote-tracking branch 'origin/develop' into develop by xiaoying 2023-04-06 18:38:06 +0800
  • 739009e Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-04-06 15:23:29 +0800
  • b12eb2f (refs/pull/264/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-04-06 15:21:25 +0800
  • 5db0913 机场回调修改任务状态,修改应急任务状态 by wanjing 2023-04-06 15:21:00 +0800
  • 2027baf Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-06 14:34:12 +0800
  • 6fc656e (refs/pull/263/head) 文件编号范围 by chengwang 2023-04-06 14:33:03 +0800
  • a16957b Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-06 13:47:45 +0800
  • af5f32c (refs/pull/262/head) 修改dsp服务实例id by chengwang 2023-04-06 13:45:59 +0800
  • 9650c18 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-04 10:57:40 +0800
  • 6a3661a (refs/pull/261/head) 添加问题类型字段 by chengwang 2023-04-04 10:56:50 +0800
  • 56a9d01 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-04 09:18:39 +0800
  • cfb5ece (refs/pull/260/head) 添加问题类型字段 by chengwang 2023-04-04 09:17:44 +0800
  • feae9e3 问题类型增加是否事故问题字段 by wanjing 2023-04-04 08:57:50 +0800
  • 5c2fa44 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-03 13:30:27 +0800
  • 1585160 (refs/pull/259/head) 修改现场情况描述字段 by chengwang 2023-04-03 13:29:34 +0800
  • 638530f Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-04-03 11:42:29 +0800
  • 28ebd6f (refs/pull/258/head) 根据机场获取直播接口添加异常校验 by chengwang 2023-04-03 11:41:10 +0800
  • 1ecf5de Merge remote-tracking branch 'origin/develop' into develop by xiaoying 2023-04-03 09:48:45 +0800
  • ce34e1b Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-30 15:10:56 +0800
  • 1634156 (refs/pull/257/head, bv_1.3.0) 修改3766 应急记录列表,区分租户 by wanjing 2023-03-30 15:10:31 +0800
  • 0425a96 新增对接飞手服务时传参username by xiaoying 2023-03-30 14:20:37 +0800
  • 0ef7187 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-30 11:23:43 +0800
  • 99aa3e2 (refs/pull/256/head) 获取事故卡片,过滤掉应急任务产生的事故 by wanjing 2023-03-30 11:23:19 +0800
  • be9f787 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-30 09:57:36 +0800
  • 2fc45ea (refs/pull/255/head) 应急任务,无人机回舱,修改应急任务状态为已完成 by wanjing 2023-03-30 09:56:52 +0800
  • 339f21f Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-29 14:39:22 +0800
  • e382bda (refs/pull/254/head) 查询任务分页列表过滤应急任务 by wanjing 2023-03-29 14:38:49 +0800
  • 23e53f5 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-29 14:28:08 +0800
  • d4998ed (refs/pull/253/head) 去掉accident_task字段 by wanjing 2023-03-29 11:41:33 +0800
  • 98ff567 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-29 10:52:09 +0800
  • d8faa6b (refs/pull/252/head) 事故完成,应急任务状态改为已完成 by wanjing 2023-03-29 10:51:35 +0800
  • aa33b23 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-29 10:08:29 +0800
  • 3e08eb6 (refs/pull/251/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-03-29 10:07:59 +0800
  • 75de1a0 事故核实,原巡检任务状态改为已完成 by wanjing 2023-03-29 10:07:54 +0800
  • 97efe7b Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-03-28 18:06:05 +0800
  • 521fdfa (refs/pull/250/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-03-28 18:04:54 +0800
  • 72daecc 对accidentIdList是否为空做校验 by chengwang 2023-03-28 18:04:43 +0800
  • a52db13 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-28 17:02:04 +0800
  • 17c21b9 (refs/pull/249/head) 1、修改事故核实代码;2、修改dsp回调添加日志 by wanjing 2023-03-28 17:01:35 +0800
  • a4b21bc Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-28 16:29:09 +0800
  • ea91aeb (refs/pull/248/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-03-28 16:27:55 +0800
  • 2a590df 修改事故核实,如果该任务已经被一个事故核实,不能在被其他事故核实 by wanjing 2023-03-28 16:27:49 +0800
  • 6d781f4 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-03-28 15:30:31 +0800
  • 7b96e58 (refs/pull/247/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-03-28 15:29:35 +0800
  • 85681b8 事故卡片对应的事故列表返回对应的任务状态 by chengwang 2023-03-28 15:29:21 +0800
  • 62ae27b Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-03-28 15:18:56 +0800
  • f56cae6 (refs/pull/246/head) 修改应急列表返回时间字段,添加秒 by wanjing 2023-03-28 15:17:25 +0800
  • f9d8b35 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-27 18:14:43 +0800
  • 1be33a0 (refs/pull/245/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-03-27 18:14:04 +0800
  • b37db74 修改获取任务分页列表,增加返回droneId字段 by wanjing 2023-03-27 18:13:59 +0800
  • 202bcfd Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-03-27 15:58:23 +0800
  • 824d5a8 (refs/pull/244/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-03-27 15:57:34 +0800
  • 91029e9 事故卡片对应的事故列表返回对应的任务状态 by chengwang 2023-03-27 15:57:23 +0800
  • 4bf9f1d Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-27 15:50:23 +0800
  • 57d8835 (refs/pull/243/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by wanjing 2023-03-27 15:50:01 +0800
  • a35530f 事故核实,添加任务已完成和失败不能在核实 by wanjing 2023-03-27 15:49:56 +0800
  • b2fe6eb Merge branch 'develop' of gitadmin/tuoheng_freeway into release by chengwang 2023-03-27 15:04:53 +0800
  • d9ff281 (refs/pull/242/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by chengwang 2023-03-27 15:03:38 +0800
  • 4b00286 直播接口返回正在直播的任务 by chengwang 2023-03-27 15:03:24 +0800
  • a8d1725 Merge branch 'develop' of gitadmin/tuoheng_freeway into release by wanjing 2023-03-27 14:13:56 +0800