Commit Graph

760 Commits

Author SHA1 Message Date
walker-sheng 0a57061303 Merge remote-tracking branch 'origin/test' into test 2021-04-15 17:02:20 +08:00
walker-sheng 09e4421405 docker构建修改,使用openjdk11镜像 2021-04-15 17:01:53 +08:00
joylink_zhangsai 8f0199b6a3 Merge remote-tracking branch 'origin/test' into test 2021-04-13 18:31:09 +08:00
joylink_zhangsai a0d99564e4 地图数据添加信号按钮 2021-04-13 18:30:59 +08:00
DU c540da932a 删除测试代码 2021-04-13 17:06:06 +08:00
DU 011ffd5ccf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2021-04-13 16:59:55 +08:00
DU 4220a2881d 测试语音 2021-04-13 16:59:46 +08:00
joylink_zhangsai f90726cacf 扫码登录也根据登录项目设置组织信息 2021-04-13 16:08:44 +08:00
DU ea0bde8feb 删除vm参数指定TSL1.2 2021-04-13 15:39:41 +08:00
DU ce39d404b1 地图分组导入bug修改 2021-04-13 15:37:01 +08:00
DU bbc32cc2ad 添加jar 2021-04-13 11:38:30 +08:00
DU 0eb5d121a8 删除jar 2021-04-13 11:37:57 +08:00
DU 40e092e968 语音包引入 2021-04-13 11:09:12 +08:00
DU 485f37d06c 华为语音jar引入 2021-04-13 10:03:24 +08:00
DU 3bd9cb71a7 地图组管理修改 2021-04-13 10:00:29 +08:00
DU 997773136f 先删除华为语音相关 2021-04-12 19:01:57 +08:00
joylink_zhangsai 87aab8ab15 Merge remote-tracking branch 'origin/test' into test 2021-04-12 18:49:42 +08:00
DU cc8d28295c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2021-04-12 18:48:50 +08:00
joylink_zhangsai a46c3c9805 目的地码构建代码调整 2021-04-12 18:48:49 +08:00
DU 250de1dc73 地图数据归类,huawei语音调试 2021-04-12 18:48:41 +08:00
joylink_zhangsai 7b426cbf45 目的地码数据构建bug修改 2021-04-12 17:36:38 +08:00
joylink_zhangsai 783db4fa0f 目的地码数据构建速度优化 2021-04-12 16:09:07 +08:00
walker-sheng b03c41705e 包调整 2021-04-12 11:36:36 +08:00
walker-sheng 986fc71d60 包调整 2021-04-12 11:35:21 +08:00
walker-sheng 7f0a9284fe Merge remote-tracking branch 'origin/test' into test 2021-04-12 11:31:58 +08:00
walker-sheng 6d7ff4b6fd 修改包名 2021-04-12 11:31:41 +08:00
joylink_zhangsai c4de48a386 华为语音识别回滚 2021-04-12 11:21:29 +08:00
DU 776955fbdb 华为语音包依赖 2021-04-12 11:17:26 +08:00
DU d7cadb46b7 语音识别修改 2021-04-12 11:14:38 +08:00
joylink_zhangsai d681f9c29a 华为语音识别回滚 2021-04-12 11:11:29 +08:00
DU 83d7238b11 Merge remote-tracking branch 'origin/test' into test1 2021-04-12 11:04:31 +08:00
DU 80349d14c0 Revert "Revert "删除表sql""
语音识别改用百度接口
2021-04-12 11:02:42 +08:00
walker-sheng 1582188a39 Merge remote-tracking branch 'origin/test' into test 2021-04-12 11:01:48 +08:00
walker-sheng de1858889a 交路生成过滤掉少于两个站台轨的交路的构建 2021-04-12 11:01:30 +08:00
joylink_zhangsai 08f06554bb 仿真权限校验逻辑修改 2021-04-12 10:57:07 +08:00
joylink_zhangsai cc0a01aebb Revert "Revert "改用华为语音识别服务""
This reverts commit bec904c7
2021-04-12 10:11:10 +08:00
joylink_zhangsai 249c8c1eb7 Merge remote-tracking branch 'origin/test' into test 2021-04-09 18:24:48 +08:00
joylink_zhangsai 5485c27c3b 泰雷兹操作调试 2021-04-09 18:24:39 +08:00
walker-sheng f8f4352008 新仿真逻辑开发 2021-04-09 18:23:34 +08:00
DU b5e3e5d2e5 宁波三导入修改 2021-04-09 11:05:09 +08:00
DU bf109450e5 运行图校验修改 宁波三导入备车变更车次回库外加一个服务车次 2021-04-09 10:23:00 +08:00
DU 6aee4ce7e9 运行图中间出库调整 2021-04-08 16:39:44 +08:00
DU 34b5be2c29 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-04-07 18:27:27 +08:00
DU f242c3ca26 运行图出库首站/入库末站在环路上,校验增加出入库,编辑操作去掉出入库设置 2021-04-07 18:27:19 +08:00
joylink_zhangsai 6e06be24fe Merge remote-tracking branch 'origin/test' into test 2021-04-07 17:59:31 +08:00
joylink_zhangsai 2a28c4f48e 转换轨列车不发车bug修改 2021-04-07 17:58:54 +08:00
DU d0e68bf84e 校验修改 2021-04-06 19:40:38 +08:00
DU c9c491848b 校验修改 2021-04-06 19:18:32 +08:00
DU d81ec9f650 修改运行图校验 2021-04-06 18:46:56 +08:00
DU 34e1388120 运行图生成 2021-04-06 18:16:32 +08:00