joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity
1,037 Commits 12 Branches 10 Tags 54 MiB
e8373fc6e6
Commit Graph

994 Commits

Author SHA1 Message Date
joylink_zhangsai
06f9914f1a 修改课程查询接口 2021-03-30 15:24:35 +08:00
joylink_zhangsai
4793a5a21a 查询排课报错 2021-03-30 15:10:58 +08:00
joylink_zhangsai
740cded8d8 修改教学管理功能及bug 2021-03-30 14:39:03 +08:00
joylink_zhangsai
13afe241fa 课程和考试的重名检测不过滤下架的数据 2021-03-30 13:22:54 +08:00
joylink_zhangsai
fccd063da8 Merge remote-tracking branch 'origin/test' into test 2021-03-30 13:05:39 +08:00
joylink_zhangsai
0333bb4a2d 评价规则bug修改 2021-03-30 13:05:25 +08:00
DU
e757d5c50e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-30 09:38:39 +08:00
DU
40e5ea3af8 默认运行等级 变成70~50km/h 2021-03-30 09:38:31 +08:00
walker-sheng
e7099f59af Merge remote-tracking branch 'origin/test' into test 2021-03-29 18:30:19 +08:00
walker-sheng
a6485ca3e8 新仿真对象逻辑调整 
新仿真逻辑——CI联锁系统逻辑开发
 2021-03-29 18:30:08 +08:00
joylink_zhangsai
2b0cb91e55 小bug修改 2021-03-29 18:25:57 +08:00
joylink_zhangsai
a658bd7312 课程名修改添加同名校验；评价规则应用到sql修改 2021-03-29 18:19:23 +08:00
joylink_zhangsai
ad71bfb0df 修改教学管理课程删除后创建同名课程依然报错bug；修改创建试卷报错bug 2021-03-29 17:14:17 +08:00
joylink_zhangsai
038f3b3ecd 拷贝地图功能中，拷贝考试逻辑修改 2021-03-29 16:25:56 +08:00
joylink_zhangsai
d3c9626947 修改<将评价规则应用到><查询评价规则能应用到>接口bug 2021-03-29 15:53:55 +08:00
joylink_zhangsai
0ac681ed53 考试不和课程关联 2021-03-29 15:04:13 +08:00
joylink_zhangsai
1fa81de61f Merge remote-tracking branch 'origin/test' into test 2021-03-26 18:43:04 +08:00
joylink_zhangsai
de57624817 考试改为不和课程关联 2021-03-26 18:42:52 +08:00
DU
1a4351a084 回库修改 2021-03-26 17:20:53 +08:00
joylink_zhangsai
d6fe4e75fb Merge remote-tracking branch 'origin/temp' into test 2021-03-26 17:13:40 +08:00
walker-sheng
40956d2c52 Merge remote-tracking branch 'origin/test' into test 2021-03-26 17:08:39 +08:00
joylink_zhangsai
5167575dde 暂时提交 2021-03-26 17:08:06 +08:00
DU
9752b2b21f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-26 16:44:29 +08:00
DU
d1b8fcea3d 删除文件 2021-03-26 16:44:21 +08:00
DU
72a6546297 生成bug修改 2021-03-26 16:43:18 +08:00
joylink_zhangsai
4801d11b3b 教学管理bug修改 2021-03-25 20:42:19 +08:00
joylink_zhangsai
4e478b95a2 教学管理功能修改 2021-03-25 19:46:34 +08:00
joylink_zhangsai
7fba696238 Merge remote-tracking branch 'origin/test' into test 2021-03-25 19:06:29 +08:00
joylink_zhangsai
8383ec0336 教学管理功能修改 2021-03-25 19:06:08 +08:00
walker-sheng
98fed5f681 新仿真运行流程调整 
新仿真逻辑——计算机联锁模块数据构建.
 2021-03-25 18:23:24 +08:00
DU
7a0fe8f683 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-25 18:18:46 +08:00
DU
f53cfefb8c 运行图接口问题修改 2021-03-25 18:18:38 +08:00
joylink_zhangsai
354f676238 sql修改 2021-03-25 15:40:36 +08:00
joylink_zhangsai
7e425787d9 Merge remote-tracking branch 'origin/test' into test 2021-03-25 15:03:53 +08:00
joylink_zhangsai
38da216a31 修改教学管理功能 2021-03-25 15:03:43 +08:00
DU
0c3a311323 运行图生成时间问题修改 2021-03-24 15:07:41 +08:00
DU
7fbc880d5d 运行图编辑问题修改 2021-03-24 13:34:20 +08:00
DU
9e20930f4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-24 09:43:58 +08:00
DU
87f3296a90 运行图生成发车时间调整 2021-03-24 09:43:49 +08:00
walker-sheng
ca2ea3a606 Merge remote-tracking branch 'origin/test' into test 2021-03-23 18:27:45 +08:00
walker-sheng
1e82fe9b97 联锁生成——延续保护添加信号机字段保存 2021-03-23 18:27:31 +08:00
joylink_zhangsai
2eb8cae79a 运行线添加必经进路（逻辑未实现，只是添加数据） 2021-03-23 16:53:43 +08:00
joylink_zhangsai
e5282d6c0d 修改教学管理-评价规则功能；组织删除改为逻辑删除（未完善） 2021-03-23 16:47:56 +08:00
joylink_zhangsai
bd5d1e9d4b 目的地码生成逻辑报错消除 2021-03-23 13:24:45 +08:00
joylink_zhangsai
bda5126e4b Merge remote-tracking branch 'origin/test' into test 2021-03-23 11:19:27 +08:00
joylink_zhangsai
d930f18d52 车站预复位逻辑修改 2021-03-23 11:18:44 +08:00
walker-sheng
064e46b47a Merge remote-tracking branch 'origin/test' into test 2021-03-23 09:22:41 +08:00
walker-sheng
f0b8f3f754 地图绘制数据处理——逻辑区段是否站台轨处理 2021-03-23 09:22:24 +08:00
joylink_zhangsai
ced64ef381 Merge remote-tracking branch 'origin/test' into test 2021-03-23 09:02:19 +08:00
walker-sheng
7681690896 数据校验添加区段是否站台轨、转换轨校验逻辑 2021-03-22 16:47:42 +08:00
joylink_zhangsai
270ef43603 添加按集中站获取区段的接口 2021-03-22 14:52:11 +08:00
walker-sheng
3ce3360226 联锁生成——重构交路生成逻辑bug修改 2021-03-22 14:20:48 +08:00
walker-sheng
b26ef44213 Merge remote-tracking branch 'origin/test' into test 2021-03-22 11:23:58 +08:00
walker-sheng
ca9bb496c6 联锁生成——重构交路生成逻辑（现只生成一个方向交路，不再生成折返可能反向的交路）,删除生成交路车站列表字段 2021-03-22 11:23:37 +08:00
DU
914141c280 与系统默认交路相同的也可自定义创建 2021-03-22 11:19:51 +08:00
walker-sheng
3d97dfc4af Merge remote-tracking branch 'origin/test' into test 2021-03-19 18:27:10 +08:00
walker-sheng
0553287cdb 客流策略计算bug修改 2021-03-19 18:26:55 +08:00
joylink_zhangsai
c406d1fb36 考试评分bug修改 2021-03-19 18:21:25 +08:00
joylink_zhangsai
8192e0be98 评价规则权重使用方式修改 2021-03-19 17:46:45 +08:00
joylink_zhangsai
63d7af8064 小bug修改 2021-03-19 16:14:30 +08:00
joylink_zhangsai
279ae5194b Merge remote-tracking branch 'origin/test' into test 2021-03-19 15:57:06 +08:00
joylink_zhangsai
cce2b9aef6 教学管理功能修改 2021-03-19 15:56:52 +08:00
DU
f56f08f0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-19 11:38:40 +08:00
DU
6ef313cfa9 运行图生成修改 2021-03-19 11:38:31 +08:00
thesai
db9ee015bd Merge remote-tracking branch 'origin/test' into test 2021-03-18 18:58:49 +08:00
thesai
0f81295f3f 添加检查站台状态以取消列车扣车状态的循环逻辑 2021-03-18 18:58:31 +08:00
DU
1b72bc695e 修改运行图生成问题 2021-03-18 18:49:29 +08:00
DU
5a1f1bdb72 运行图生成自动铺画出入库 2021-03-18 14:31:04 +08:00
DU
8adda9b160 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-17 17:08:13 +08:00
DU
310d5c7f7b 生成系统交路问题修改 2021-03-17 17:07:56 +08:00
walker-sheng
3f86f1fc6c 联锁生成——修改交路生成逻辑问题，兼容站台轨无出站信号机情况 2021-03-17 16:02:05 +08:00
walker-sheng
c521b9dcd6 Merge remote-tracking branch 'origin/test' into test 2021-03-16 13:30:44 +08:00
walker-sheng
413a9c1c37 修改ATS进路触发接近区段检查逻辑问题，改为使用列车所在物理区段检查 2021-03-16 13:30:25 +08:00
DU
6cdc61151e 转换轨相邻车站交路生成修改 2021-03-15 17:03:40 +08:00
walker-sheng
e7ab43038a 项目域名接口开发 2021-03-15 16:53:39 +08:00
walker-sheng
5782b50944 Merge remote-tracking branch 'origin/test' into test 2021-03-15 16:24:56 +08:00
DU
d3f45b1b5e 生成时发车问题修改 2021-03-15 14:06:49 +08:00
DU
94b679893f 运行图问题修改 2021-03-15 13:07:32 +08:00
DU
a2a8f1f296 运行图问题修改 2021-03-15 13:05:04 +08:00
DU
5a8c4950c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-15 11:04:06 +08:00
DU
c8f52f5141 运行图交路相关修改 2021-03-15 11:03:57 +08:00
joylink_zhangsai
b3c5c4c4f8 白名单修改 2021-03-15 10:39:10 +08:00
walker-sheng
1f94e0ff6d Merge remote-tracking branch 'origin/test' into test 2021-03-12 18:54:30 +08:00
walker-sheng
7c72507527 新仿真逻辑——计算机联锁模块开发 
仿真发布消息逻辑调整
 2021-03-12 18:54:14 +08:00
joylink_zhangsai
228ae47d1c Merge remote-tracking branch 'origin/test' into test 2021-03-12 18:45:14 +08:00
joylink_zhangsai
30a1685935 南铁院岔心设置计轴故障/预复位 2021-03-12 17:44:50 +08:00
DU
4a7817cccb 修改 2021-03-12 16:55:03 +08:00
DU
16509551ee Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-12 16:50:19 +08:00
DU
4c27f18a69 交路名称修改 2021-03-12 16:49:58 +08:00
joylink_zhangsai
f9f7564a0f Merge remote-tracking branch 'origin/test' into test 2021-03-12 16:43:43 +08:00
DU
c6b8227823 运行图编制交路设置修改 2021-03-12 15:07:50 +08:00
DU
6505702a13 运行图编制修改 2021-03-12 11:38:03 +08:00
joylink_zhangsai
0b2dce823e cgy添加使用记录 2021-03-12 11:03:10 +08:00
DU
5a6f87f401 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-12 09:10:39 +08:00
DU
775437150b 恢复交路自动生成默认交路，运行图编制可使用生成的交路。 2021-03-12 09:10:33 +08:00
walker-sheng
8da937e941 新仿真逻辑——虚拟真实设备逻辑开发 2021-03-11 13:26:48 +08:00
joylink_zhangsai
7e96b047c2 ISCS查询接口添加校验 2021-03-11 10:44:46 +08:00
joylink_zhangsai
9681255916 将进路路径构建时的迭代次数改为由调用者传入 2021-03-11 10:26:55 +08:00
joylink_zhangsai
37c306ac27 Merge remote-tracking branch 'origin/test' into test 2021-03-10 19:58:29 +08:00
joylink_zhangsai
a5cbd9b07c 运行线添加筛选进路列表逻辑 2021-03-10 19:42:20 +08:00
joylink_zhangsai
2faf256501 泰雷兹排列进路到操作修改 2021-03-10 19:40:35 +08:00
DU
0a126f41a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-10 17:58:39 +08:00
DU
1434f23db7 生成运行图问题修改 2021-03-10 17:58:30 +08:00
walker-sheng
c0f1035f0e Merge remote-tracking branch 'origin/test' into test 2021-03-10 16:58:49 +08:00
walker-sheng
7fdb0dd16b 按计划行车，转换轨列车加载问题修改 2021-03-10 16:58:27 +08:00
joylink_zhangsai
8ef6553a20 Merge remote-tracking branch 'origin/test' into test 2021-03-09 18:05:58 +08:00
joylink_zhangsai
34c1b72d2e 道岔转动恢复失表故障的概率改为1/3 2021-03-09 18:05:39 +08:00
DU
f2baa1b51f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-09 17:58:07 +08:00
DU
39441c9a37 折返时间根据交路加默认值 2021-03-09 17:57:56 +08:00
joylink_zhangsai
cf6cc759e9 Merge remote-tracking branch 'origin/test' into test 2021-03-09 17:25:16 +08:00
joylink_zhangsai
104f50793d 南铁院问题修改 2021-03-09 17:24:49 +08:00
DU
1a4092577e 运行图修改 2021-03-09 15:01:33 +08:00
DU
c099a49ac3 信号机所属车站数据构建 2021-03-09 10:04:53 +08:00
walker-sheng
415e92b4da 新仿真结构下的虚拟真实设备逻辑完善 2021-03-09 09:30:08 +08:00
joylink_zhangsai
512d49e763 Merge remote-tracking branch 'origin/test' into test 2021-03-08 14:48:15 +08:00
joylink_zhangsai
38e5af449b 添加<生成目的地码>连锁配置及生成逻辑 2021-03-08 14:45:35 +08:00
DU
e6a6184ed0 运行图修改 2021-03-08 11:46:30 +08:00
DU
bfd278017a 运行图交路定义修改，增加车站折返时间配置 2021-03-08 11:39:55 +08:00
joylink_zhangsai
15ec7c7b3b Merge remote-tracking branch 'origin/test' into test 2021-03-05 17:48:54 +08:00
walker-sheng
8edf518f95 客流车站参数管理接口开发 2021-03-05 17:46:56 +08:00
walker-sheng
6ee4d141c9 Merge remote-tracking branch 'origin/test' into test 2021-03-05 16:35:31 +08:00
walker-sheng
6abd8254b6 仿真结构抽象(仿真主线程逻辑调整) 
虚拟真实设备逻辑开发
 2021-03-05 16:34:54 +08:00
joylink_zhangsai
5fa74769c8 由于会导致备用车和北京一自动信号机前的列车不能运行，去掉对<未进路锁闭的区段>的检查 2021-03-05 14:58:54 +08:00
joylink_zhangsai
97a3baedb7 运行线逻辑完善 2021-03-05 13:54:55 +08:00
joylink_zhangsai
e091dac76a 修改cgy留言板数据时间修改接口 2021-03-04 21:27:41 +08:00
joylink_zhangsai
8c9093c530 修改cgy留言板数据时间修改接口 2021-03-04 21:22:14 +08:00
joylink_zhangsai
16bd531cd9 添加cgy留言板数据时间修改接口 2021-03-04 21:07:28 +08:00
joylink_zhangsai
6b0db15a6d 针对成工院修改留言板 2021-03-03 21:30:38 +08:00
walker-sheng
fb7f3fa70c 仿真结构抽象(仿真数据仓库抽象，一些逻辑调整) 2021-03-03 19:22:31 +08:00
walker-sheng
e8bb268287 Merge remote-tracking branch 'origin/test' into test 2021-03-03 16:56:50 +08:00
walker-sheng
8876292193 仿真结构抽象(操作分发调整，用户订阅/取消订阅逻辑框架构建，添加固定频率任务接口) 2021-03-03 16:56:32 +08:00
joylink_zhangsai
a397a1c195 修改浙大网新停车/发车操作指令 2021-03-02 17:29:46 +08:00
joylink_zhangsai
b02db4209e 添加浙大网新停车/发车操作指令 2021-03-02 16:02:00 +08:00
joylink_zhangsai
dd1e5b7705 Merge remote-tracking branch 'origin/test' into test 2021-03-02 13:31:27 +08:00
joylink_zhangsai
1a5bb58354 修改目的地码数据以兼容宁波三运行线逻辑；修改头码车目标到站逻辑；修改列车扣车操作逻辑以兼容浙大网新列车扣车逻辑 2021-03-02 13:30:46 +08:00
DU
09298761bf 实训修改，教学成绩导出学号修改 2021-03-01 19:09:24 +08:00
DU
e3a44e76f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-01 17:36:14 +08:00
DU
4b4b30ad9b 下架默认课程不显示 2021-03-01 17:36:05 +08:00
joylink_zhangsai
ada9bc6fd8 添加日志 2021-03-01 16:41:11 +08:00
walker-sheng
fe2892dad0 Merge remote-tracking branch 'origin/test' into test 2021-02-26 18:45:17 +08:00
walker-sheng
3265507232 仿真结构抽象(操作分发部分实现) 2021-02-26 18:44:55 +08:00
DU
0961ec7453 组织查询bug 2021-02-26 18:37:22 +08:00
DU
411cf5008d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-26 18:07:43 +08:00
DU
3c3a13030f 学院账号绑定顶级组织code，账号登陆验证组织绑定项目 2021-02-26 18:07:33 +08:00
joylink_zhangsai
98a6a509d4 CGY取消权限校验 2021-02-26 14:27:38 +08:00
DU
745a4c2999 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-26 10:49:47 +08:00
DU
825a870d8e 课程表加默认字段 2021-02-26 10:49:37 +08:00
joylink_zhangsai
88720cd004 Merge remote-tracking branch 'origin/test' into test 2021-02-26 10:15:24 +08:00
DU
68e9264d60 学院名称不显示bug 2021-02-25 16:33:02 +08:00
DU
05306ac91c 导入学员信息bug 2021-02-25 16:24:02 +08:00
joylink_zhangsai
56f6c82f02 Merge remote-tracking branch 'origin/test' into test 2021-02-25 15:20:56 +08:00
walker-sheng
029764eb07 Merge remote-tracking branch 'origin/test' into test 2021-02-24 18:45:45 +08:00
walker-sheng
afdbde3753 添加validation依赖，修复@Validated实训问题 
添加注册接口（邮箱）
仿真结构抽象
 2021-02-24 18:45:33 +08:00
DU
e6390321ae 控制权限转移修改 2021-02-24 18:43:44 +08:00
joylink_zhangsai
f289618709 添加<区段开放/关闭>操作 2021-02-24 15:40:47 +08:00
joylink_zhangsai
aa7e69f7dd 设置自动通过进路根据配置设置背景 2021-02-24 10:03:30 +08:00
joylink_zhangsai
cf2e10b9db 恢复车站的计轴预复位取消操作 2021-02-23 19:43:04 +08:00
joylink_zhangsai
0db6131fc8 添加计轴复位操作并将宁波一的IBP盘复位按钮改为调用此操作 2021-02-23 17:10:55 +08:00
joylink_zhangsai
3d8564ae84 Merge remote-tracking branch 'origin/test' into test 2021-02-23 15:59:37 +08:00
joylink_zhangsai
a733559ea0 强制点灯bug修改 2021-02-23 15:59:20 +08:00
DU
8d424521af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-23 14:11:09 +08:00
joylink_zhangsai
653a37b1a9 IBP盘预复位逻辑完善；添加配置；宁波三部分操作添加 2021-02-23 14:03:36 +08:00
DU
abc0b200e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 
 Conflicts:
	src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java
 2021-02-23 13:30:48 +08:00
DU
1544add3a7 实训修改 泰雷兹跳停操作 2021-02-23 13:30:20 +08:00
joylink_zhangsai
70e60808ac 仿真背景保存添加车站的新字段；IBP盘加新按钮类型；IBP盘按按钮接口修改；添加接口查询车站下的区段和地图下的区段 2021-02-23 09:50:42 +08:00
joylink_zhangsai
74c5ba1a2e 车站状态发送修改 2021-02-22 16:48:24 +08:00
joylink_zhangsai
d89363e880 泰雷兹道岔封锁操作逻辑实现 2021-02-22 13:46:49 +08:00
joylink_zhangsai
71ac99cb50 车站预复位字段修改 2021-02-22 10:55:55 +08:00
joylink_zhangsai
b895017e9c Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsStationService.java
 2021-02-22 10:02:02 +08:00
DU
c3fd300248 自动折返现地实训背景bug，站台状态重置修改 2021-02-20 16:44:07 +08:00
DU
f3b9ebf4a7 车站控制权 2021-02-20 15:35:58 +08:00
joylink_zhangsai
8d218f15bd 添加车站预复位操作 2021-02-20 14:48:52 +08:00
DU
ede2afc019 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-20 13:40:52 +08:00
DU
b121560787 系统扣车，车站授权 2021-02-20 13:40:42 +08:00
joylink_zhangsai
572f4f1b6d 添加请求区域控制权(区域选择)相关属性、操作、逻辑；添加泰雷兹<道岔/命令>操作及相关属性、逻辑（未完） 2021-02-20 13:34:25 +08:00
joylink_zhangsai
0a84cbb690 对未锁闭的区段执行区故解去掉报错 2021-02-19 14:01:48 +08:00
joylink_zhangsai
71ddb49505 列车模型数据修改；添加<办理引导前是否需要信号机接近锁闭>配置项；人解引导进路时走取消引导逻辑 2021-02-19 13:16:28 +08:00
joylink_zhangsai
8ce8504521 订单创建类添加以分为单位的价格；列车添加运行类型；修改<全站取消自动通过进路功能无效>bug；倒车限速改为5km/h 2021-02-19 09:44:18 +08:00
walker-sheng
e2bd029771 仿真结构抽象 2021-02-18 18:26:55 +08:00
joylink_zhangsai
bec904c711 Revert "改用华为语音识别服务" 
This reverts commit c977e4c9
 2021-02-18 11:33:04 +08:00
joylink_zhangsai
321605663f Merge branch 'nb1' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
 2021-02-18 11:31:04 +08:00
joylink_zhangsai
a3b89f9125 设置/取消强制点灯操作合并 2021-02-18 11:29:57 +08:00
joylink_zhangsai
d96e44f896 仿真子系统添加<运行图编制工作站>；<新建单位rootId字段没有值>bug修改 2021-02-18 11:10:14 +08:00
walker-sheng
983cff6af8 Merge branch 'restruct' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/services/ISysUserService.java
#	src/main/java/club/joylink/rtss/services/SysUserService.java
 2021-02-18 10:33:27 +08:00
joylink_zhangsai
e37ee81e86 微信支付回调接口修改 2021-02-18 09:08:38 +08:00
joylink_zhangsai
8e3a551ab4 一个小失误 2021-02-05 18:09:00 +08:00
joylink_zhangsai
c977e4c90d 改用华为语音识别服务 2021-02-05 18:06:11 +08:00
joylink_zhangsai
7c259ce136 针对宁波一问题的修改 2021-02-05 18:04:40 +08:00
walker-sheng
6435f5f844 客流策略计算频率注释恢复 2021-02-05 17:42:06 +08:00
walker-sheng
e65005a61a 客流策略指标定义修改，新指标计算逻辑实现 2021-02-05 17:41:33 +08:00
walker-sheng
5081c580ec Merge remote-tracking branch 'origin/test' into test 2021-02-05 16:42:07 +08:00
walker-sheng
f3411c77c4 修改ATS进路触发办理折返处判断逻辑bug 2021-02-05 16:41:52 +08:00
DU
68041fa54b 实训修改 2021-02-05 15:14:56 +08:00
joylink_zhangsai
eb6d51c22b Merge remote-tracking branch 'origin/test' into test 2021-02-05 13:37:28 +08:00
joylink_zhangsai
e37fa24c31 修改<未锁闭的区段>移动授权终点判定条件 2021-02-05 13:37:18 +08:00
walker-sheng
55449d3a67 修改站间运行时间计算预计离开时间有时空指针的bug 2021-02-05 09:51:48 +08:00
walker-sheng
d9f9ce640e Merge remote-tracking branch 'origin/test' into test 2021-02-05 09:50:25 +08:00
walker-sheng
a87ca75d37 修改站间运行时间计算预计离开时间有时空指针的bug 2021-02-05 09:50:13 +08:00
DU
38fd5a14a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-04 18:33:55 +08:00
DU
6f17bc3089 drawWay字段删除，数据库同步删除 2021-02-04 18:33:46 +08:00
joylink_zhangsai
33ade9bc31 修改<未锁闭的区段>移动授权终点判定条件 2021-02-04 18:25:22 +08:00
joylink_zhangsai
5f8c2039c5 Merge remote-tracking branch 'origin/test' into test 2021-02-04 18:14:22 +08:00
joylink_zhangsai
51e88d488d 修改<未锁闭的区段>移动授权终点判定条件 2021-02-04 18:14:08 +08:00
walker-sheng
3f35c48cb3 Merge remote-tracking branch 'origin/test' into test 2021-02-04 18:02:28 +08:00
walker-sheng
5695af9fac 客流消息添加单独订阅路径 
客流订阅事件处理
客流计算逻辑调整-跳停考虑跳站规则
策略消息推送对象修改
 2021-02-04 18:02:11 +08:00
joylink_zhangsai
64e71ed9ea 线段加俩参数 2021-02-04 17:55:50 +08:00
joylink_zhangsai
0e8e394d04 Merge remote-tracking branch 'origin/test' into test 2021-02-04 17:39:59 +08:00
joylink_zhangsai
e0b6209e91 封锁信号机时去掉重复封锁逻辑 2021-02-04 17:39:51 +08:00
DU
74dd554a9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-04 17:27:05 +08:00
DU
1635c356ed 实训补充修改 2021-02-04 17:26:53 +08:00
joylink_zhangsai
06e3ab8b6e 移动授权终点添加<未锁闭或延时解锁的区段>；延时解锁进路的始端信号机重开时取消延时解锁；取消进路后，始端信号机锁闭进路字段置为null 2021-02-04 17:18:15 +08:00
joylink_zhangsai
40791540e2 添加<ATS自动调整运行>配置 2021-02-04 11:10:56 +08:00
joylink_zhangsai
cc9aba942c Merge remote-tracking branch 'origin/test' into test 2021-02-03 18:35:32 +08:00
joylink_zhangsai
ee2922f84a 泰雷兹操作（未测试）；边缘车站可以跳停；进路延时解锁时无法取消进路；根据运行时间计算ATO速度逻辑修改 2021-02-03 18:34:40 +08:00
walker-sheng
54c5ec595c 空指针异常屏蔽 2021-02-03 18:24:30 +08:00
walker-sheng
f843b9ace0 修改停站时间计算和站间运行时间计算逻辑 
修改ATS进路排列触发——折返计划与出库计划冲突bug
 2021-02-03 16:28:53 +08:00
walker-sheng
e9d03da5e0 Merge remote-tracking branch 'origin/test' into test 2021-02-03 14:49:42 +08:00
walker-sheng
546f558397 添加仿真延时任务对象和逻辑 2021-02-03 14:48:48 +08:00
DU
4aed94d481 实训计轴预复位修改 2021-02-03 11:33:13 +08:00
walker-sheng
cb695a9be5 Merge remote-tracking branch 'origin/test' into test 2021-02-03 10:48:53 +08:00
walker-sheng
c7460ae397 添加跳停+停站时间策略对象 2021-02-03 10:48:33 +08:00
DU
418c9dff1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-03 10:12:42 +08:00
DU
fcce73733a 连锁控实训 2021-02-03 10:12:32 +08:00
walker-sheng
616ce791fd Merge remote-tracking branch 'origin/test' into test 2021-02-03 09:41:37 +08:00
walker-sheng
35426622ff 客流策略消息推送添加到topic 2021-02-03 09:41:20 +08:00
DU
acec4fcddc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-02 18:40:46 +08:00
DU
d2e3a42304 实训修改 2021-02-02 18:40:37 +08:00
walker-sheng
b5c3d1867e Merge remote-tracking branch 'origin/test' into test 2021-02-02 18:35:59 +08:00
walker-sheng
99ddf2db15 客流策略——跳停策略逻辑开发 2021-02-02 18:35:41 +08:00
DU
f504f457ed 操作参数化 2021-02-02 11:31:58 +08:00
DU
12b6bca36a 车站实训修改 2021-02-02 10:29:53 +08:00
DU
cfac9c6d9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-02-02 09:28:28 +08:00
DU
a39bc85eaf 实训修改 2021-02-02 09:28:16 +08:00
walker-sheng
44965d8054 修改进路办理超时失败时间为20秒 2021-02-01 13:57:32 +08:00
walker-sheng
202e0bb01f 进路逻辑bug修改 2021-02-01 13:53:35 +08:00
joylink_zhangsai
dd434fe399 Merge remote-tracking branch 'origin/test' into test 2021-01-29 18:07:14 +08:00
joylink_zhangsai
7419a859cf 修改国赛权限价格 2021-01-29 18:06:24 +08:00
walker-sheng
e9976772de 客流策略调整 2021-01-29 18:04:30 +08:00
joylink_zhangsai
d3d8bd7f0d Merge remote-tracking branch 'origin/test' into test 2021-01-29 17:49:16 +08:00
joylink_zhangsai
cf5e1238d7 添加国赛购买流程 2021-01-29 17:49:11 +08:00
walker-sheng
637908fd94 Merge remote-tracking branch 'origin/test' into test 2021-01-29 16:44:51 +08:00
walker-sheng
298fb9a1a3 转换轨列车添加停站流程 
修改由转换轨列车流程导致的ATS进路触发逻辑问题
修改进路延续保护道岔锁闭逻辑bug
修改转换轨列车初始化加载逻辑
 2021-01-29 16:44:35 +08:00
DU
3c69dcaf30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-29 14:21:31 +08:00
DU
2d811766ff 实训修改 2021-01-29 14:21:22 +08:00
walker-sheng
dd4a72b130 联锁生成添加信号机接近区段不跨过前方同向信号机配置和逻辑 2021-01-29 11:23:07 +08:00
walker-sheng
a268d69305 修改区段非通信车占用判断逻辑 2021-01-29 10:20:37 +08:00
walker-sheng
fb343bba80 修改侧防锁闭条件 2021-01-29 09:53:04 +08:00
walker-sheng
1f3d9a6f3a 按计划行车列车加载位置bug修改 2021-01-29 09:19:21 +08:00
walker-sheng
917705eea8 ZC非通信车占用移动授权逻辑bug修改 2021-01-28 19:08:40 +08:00
DU
a89d0735f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-28 18:16:19 +08:00
DU
a6cae4e14c 实训修改 2021-01-28 18:16:11 +08:00
walker-sheng
aca0b3ebc6 Merge remote-tracking branch 'origin/test' into test 2021-01-28 18:10:16 +08:00
walker-sheng
bffa883703 加载列车——构建列车监控信息，站间情况判断调整为列车位置是否在进路路径中 2021-01-28 18:09:50 +08:00
DU
32972e5697 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-28 17:57:48 +08:00
DU
2fdda0a4d1 自动进路和折返 按钮实训生成 2021-01-28 17:57:38 +08:00
walker-sheng
3316c11fed 调整ZC非通信车占用逻辑忽略道岔区段 2021-01-28 17:47:08 +08:00
walker-sheng
d669bb2d4c 进路路径查询方法哈尔滨ATP进路逻辑调整 2021-01-28 17:43:52 +08:00
walker-sheng
05ab248b18 进路路径对象调整 
进路路径查询方法重写
按计划行车加载列车逻辑调整
进路延续保护侧防逻辑问题修改
 2021-01-28 16:36:07 +08:00
walker-sheng
6531a09c60 Merge remote-tracking branch 'origin/test' into test 2021-01-28 09:10:01 +08:00
walker-sheng
a1e2e9dc8c 客流策略计算结构调整 2021-01-28 09:09:46 +08:00
joylink_zhangsai
447b0e861a 运行图发布后删除旧的派班计划 2021-01-27 19:18:18 +08:00
joylink_zhangsai
ec71cf4c20 Merge remote-tracking branch 'origin/test' into test 2021-01-27 19:05:33 +08:00
joylink_zhangsai
467cae3d01 运行图发布后删除缓存 2021-01-27 19:05:20 +08:00
DU
62edf56871 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-27 18:17:43 +08:00
DU
e1ef8cf549 运行图编制修改，加载列车位置修改，ato bug修改 2021-01-27 18:17:34 +08:00
walker-sheng
f6814f8e04 客流模拟仿真逻辑调整 
修改停站时间策略逻辑bug
添加跳停策略和计算服务对象，未实现
 2021-01-27 15:33:59 +08:00
joylink_zhangsai
2ddedd3134 Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:41:56 +08:00
joylink_zhangsai
bf326074ad 修改取消进路时延时解锁条件 2021-01-26 18:41:51 +08:00
walker-sheng
927b5bb83c Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:39:22 +08:00
walker-sheng
51285bf767 客流策略流程和停站时间策略逻辑开发 2021-01-26 18:39:05 +08:00
DU
bf3bf28fad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 16:21:45 +08:00
DU
44a7972427 实训生成修改 2021-01-26 16:21:32 +08:00
walker-sheng
4322ed671e Merge remote-tracking branch 'origin/test' into test 2021-01-26 14:32:29 +08:00
walker-sheng
e92867a2bc 添加项目枚举 2021-01-26 14:32:08 +08:00
joylink_zhangsai
b678d3e103 Merge remote-tracking branch 'origin/test' into test 2021-01-26 13:18:17 +08:00
joylink_zhangsai
17abe86959 列车初始化bug修改；取消进路延时解锁条件修改；设头码车时查询路径逻辑修改 2021-01-26 13:18:10 +08:00
DU
d491b56ef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 10:01:19 +08:00
DU
bd75dd9b3e 站间距计算修改 2021-01-26 10:01:08 +08:00
walker-sheng
bb8a694132 Merge remote-tracking branch 'origin/test' into test 2021-01-26 09:12:20 +08:00
walker-sheng
0aae6b66fc Merge remote-tracking branch 'origin/passenger' into test 2021-01-26 09:01:51 +08:00
joylink_zhangsai
8911cfa6b1 Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:44:37 +08:00
joylink_zhangsai
7d30ceb7de 列车添加倒车最大速度，列车运行逻辑对应修改 2021-01-25 19:44:32 +08:00
DU
d8897d80d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 19:26:42 +08:00
DU
8deceb2a2c 站间距根据精确到停车点； 
折返按钮状态保存
 2021-01-25 19:26:31 +08:00
joylink_zhangsai
c159f9a8c1 Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:13:35 +08:00
joylink_zhangsai
f4c16da685 碰撞检测bug修改 2021-01-25 19:13:23 +08:00
walker-sheng
1f88489d3b Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:05:43 +08:00
walker-sheng
1527a8ccf1 信号重复封锁逻辑修改 2021-01-25 19:05:30 +08:00
joylink_zhangsai
02d4d12933 Merge remote-tracking branch 'origin/test' into test 2021-01-25 18:45:46 +08:00
joylink_zhangsai
8459f38fc3 添加列车<倒车限速><碰撞检测逻辑> 2021-01-25 18:45:36 +08:00
walker-sheng
5a53001eaf 信号重复封锁逻辑修改 2021-01-25 18:31:28 +08:00
DU
15462ece3a 站间距离修改 2021-01-25 17:48:06 +08:00
joylink_zhangsai
ebb8cfd55e Merge remote-tracking branch 'origin/test' into test 2021-01-25 17:45:46 +08:00
DU
c26fb273e8 折返站的设置折返实训 2021-01-25 17:16:01 +08:00
DU
96acf9671b 运行等级的站间距离根据地图重新更新 2021-01-25 17:11:02 +08:00
DU
f3eb9096c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 16:17:48 +08:00
joylink_zhangsai
4da39b13f2 Merge remote-tracking branch 'origin/test' into test 2021-01-25 16:14:23 +08:00
joylink_zhangsai
f05398e33c 信号重复封锁的检查区段改为第一个逻辑区段；<延续保护未锁闭>的移动授权改为<延续保护前100m|延续保护前一个区段距离更远的那个端点> 2021-01-25 16:13:57 +08:00
walker-sheng
e5fe7c4dd3 联锁生成——延续保护和侧防生成道岔相关逻辑调整 
仿真初始化进路状态添加侧防元素转换锁闭逻辑
进路服务修改侧防锁闭，道岔预先锁闭等逻辑
 2021-01-25 16:13:21 +08:00
DU
e33afe5a10 更新站间运行等级也可修改距离 2021-01-25 15:44:10 +08:00
DU
a4e4dd92cf 西安二号线 车站设置折返线 实训 2021-01-25 15:19:54 +08:00
DU
36b509ff40 更新站间数据 2021-01-25 14:47:57 +08:00
joylink_zhangsai
5e2c83d565 信号重开逻辑修改 2021-01-25 14:47:46 +08:00
DU
04eb086254 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 14:12:00 +08:00
DU
3d99582eb1 组织用户关系更改 2021-01-25 14:11:45 +08:00
DU
7120e303be 成都三现地信号机自动控和人工控实训名字 2021-01-25 14:00:47 +08:00
joylink_zhangsai
4a4c5fa92f 修改车站字段类型 2021-01-25 13:29:32 +08:00
joylink_zhangsai
642fc17de5 列车移动授权计算对<屏蔽门开启>情况的处理逻辑修改；道岔、车站添加字段 2021-01-25 13:13:42 +08:00
walker-sheng
2a8e87ce14 Merge remote-tracking branch 'origin/test' into test 2021-01-25 11:24:39 +08:00
walker-sheng
68e57fa9b0 添加进路延续保护侧防锁闭和解锁逻辑 2021-01-25 11:24:20 +08:00
joylink_zhangsai
e351662dcc 添加挤岔恢复指令 2021-01-22 21:12:01 +08:00
walker-sheng
efeda41423 Merge remote-tracking branch 'origin/test' into test 2021-01-22 20:48:27 +08:00
walker-sheng
face2acfac 进路信号封锁联锁检查和开放逻辑修改 2021-01-22 20:48:14 +08:00
joylink_zhangsai
39af42d875 添加道岔计轴预复位的状态及处理逻辑 2021-01-22 20:38:36 +08:00
walker-sheng
6e6e0a9ca7 Merge remote-tracking branch 'origin/test' into test 2021-01-22 18:58:29 +08:00
walker-sheng
8a4e459b3e 客流停站时间策略逻辑开发 2021-01-22 18:58:14 +08:00
joylink_zhangsai
4e85d158e4 岔心强解bug修改 2021-01-22 18:26:26 +08:00
joylink_zhangsai
808d7c3ee9 修改道岔计轴区段的非通信车占用逻辑（ARB那里） 2021-01-22 18:15:10 +08:00
joylink_zhangsai
70b01e3f5f 修改开放引导信号时的判断信号机接近区段占用逻辑 2021-01-22 17:29:50 +08:00
joylink_zhangsai
8cc9e9f3d2 Merge remote-tracking branch 'origin/test' into test 2021-01-22 16:29:46 +08:00
walker-sheng
dc6fc9345c Merge remote-tracking branch 'origin/test' into test 2021-01-22 16:28:07 +08:00
walker-sheng
8c9392bf14 修改ATS进路触发逻辑 
修改进路排列如果进路已经锁闭直接返回
修改道岔单操逻辑bug
 2021-01-22 16:27:46 +08:00
joylink_zhangsai
411d276baa 实现<区段预复位>操作 2021-01-22 15:10:21 +08:00
joylink_zhangsai
5eb20f669c 取消进路同时取消追踪模式；岔心关联区段锁闭时，岔心区段也锁闭 2021-01-21 19:30:18 +08:00
joylink_zhangsai
88331d6b72 道岔添加<挤岔>故障及逻辑；修改区故解和道岔区故解逻辑 2021-01-21 17:11:15 +08:00
joylink_zhangsai
f67542a5c2 Merge remote-tracking branch 'origin/test' into test 2021-01-21 16:16:45 +08:00
walker-sheng
c747a67d59 ATS进路触发bug修改，添加进路服务日志 2021-01-21 16:09:38 +08:00
joylink_zhangsai
ff2e0e6f71 修改<进路交自动控><进路收人工控><办理引导>的逻辑；修改引导信号开启时间为30秒 2021-01-21 11:24:00 +08:00
joylink_zhangsai
6b843ad147 取消<区段占用进路不排列配置项>；修改<区段强解>逻辑；<查询需要排列的进路>逻辑中添加<触发进路检查>逻辑 2021-01-20 19:37:21 +08:00
walker-sheng
da922a6e31 Merge remote-tracking branch 'origin/test' into test 2021-01-20 18:56:06 +08:00
walker-sheng
c2d0137c28 添加进路排列检查失败日志打印 
大客流策略流程
 2021-01-20 18:55:53 +08:00
joylink_zhangsai
e0d549600d Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsSectionService.java
 2021-01-20 16:40:45 +08:00
joylink_zhangsai
0f5932e1c1 修改实训生成bug；针对南京线路添加配置和逻辑 2021-01-20 16:03:55 +08:00
Jade
6f6a323d8d 客流列车到站上车调整 2021-01-20 15:23:46 +08:00
DU
df250b5c71 Merge 2021-01-20 09:55:00 +08:00
DU
d0c2ed8544 应答器逻辑修改 2021-01-20 09:13:33 +08:00
walker-sheng
fef9896703 Merge remote-tracking branch 'origin/test' into test 2021-01-19 19:42:36 +08:00
walker-sheng
60e7960728 联锁生成——延续保护解锁时间添加根据解锁区段长度计算的逻辑 2021-01-19 19:42:19 +08:00
joylink_zhangsai
a4e4884721 传输信号机不构建地图数据 2021-01-19 18:55:56 +08:00
joylink_zhangsai
e00262ceb9 传输信号机不生成联锁数据 2021-01-19 18:41:17 +08:00
joylink_zhangsai
52986aa9a2 将传输信号机联锁数据校验逻辑与其它信号机区分，添加传输信号机的构建逻辑 2021-01-19 18:11:44 +08:00
walker-sheng
bad7cca595 进路正常解锁相关道岔解锁逻辑 2021-01-19 17:09:48 +08:00
walker-sheng
fa3a17c63e Merge remote-tracking branch 'origin/test' into test 2021-01-19 17:02:30 +08:00
joylink_zhangsai
3742523aee 实现<强扳道岔>操作；进路正常解锁道岔时，添加<尝试解锁联动道岔和计轴关联道岔>逻辑 2021-01-19 17:01:34 +08:00
joylink_zhangsai
d6a5120ccb 去掉<进路关联屏蔽门开门时关闭始端信号机>的逻辑 2021-01-19 14:34:17 +08:00
joylink_zhangsai
a60106dedc 屏蔽门关门去掉对信号机状态的检查 2021-01-19 13:32:25 +08:00
joylink_zhangsai
f0b8778bfb 去掉进路办理时对非CBTC进路的延续保护锁闭状态检查；添加<取消设置>操作；添加<传输信号机>绘图数据 2021-01-19 11:19:24 +08:00
walker-sheng
25e16b83ea Merge remote-tracking branch 'origin/test' into test 2021-01-19 10:37:07 +08:00
walker-sheng
c2e1bca38c ATS出库和折返进路触发问题修改 2021-01-19 10:36:48 +08:00
joylink_zhangsai
3b99e3f5ea 恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查 2021-01-18 17:24:06 +08:00
joylink_zhangsai
ad529992af 信号机添加<所属车站>绘图属性；交出控制权添加<控制权所属校验> 2021-01-18 16:22:19 +08:00
joylink_zhangsai
35409a3901 进路封锁操作，取消<进路锁闭的区段不处理>的逻辑 2021-01-18 13:38:37 +08:00
walker-sheng
426ae9f775 Merge remote-tracking branch 'origin/test' into test 2021-01-15 18:40:11 +08:00
walker-sheng
843e2c94a5 联锁生成逻辑在生成侧防时，进路道岔生成bug修改 
仿真（西门子）联锁逻辑完善，和调试
 2021-01-15 18:39:57 +08:00
DU
1f82cf3deb 应答器逻辑补充 2021-01-15 17:06:58 +08:00
walker-sheng
cfe95ad538 Merge remote-tracking branch 'origin/test' into test 2021-01-15 13:00:09 +08:00
DU
d399df63de 岔心校验bug 2021-01-15 11:11:24 +08:00
walker-sheng
d65a01fcd9 Merge remote-tracking branch 'origin/test' into test 2021-01-15 11:04:42 +08:00
DU
413a025023 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-15 10:40:56 +08:00
DU
6b03677e54 岔心 应答器数据对象，应答器逻辑未完 2021-01-15 10:39:46 +08:00
joylink_zhangsai
45c349dff8 Merge remote-tracking branch 'origin/test' into test 2021-01-15 09:59:27 +08:00
joylink_zhangsai
1567647be2 微信支付 2021-01-15 09:59:01 +08:00
walker-sheng
f29fadfbc6 Merge remote-tracking branch 'origin/test' into test 2021-01-14 19:07:51 +08:00
walker-sheng
eeeec1db01 联锁侧防数据生成、保存、仿真构建流程调试修改 
联锁进路控制添加侧防逻辑（延续保护侧防逻辑还没有加），触发区段使用逻辑区段
联锁进路信号机添加 "级别" 概念和逻辑
 2021-01-14 19:07:32 +08:00
walker-sheng
8eb906de23 联锁侧防数据生成、保存、仿真构建 2021-01-13 18:42:17 +08:00
DU
13f5dd8142 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-13 10:41:49 +08:00
DU
8f4d4cd9ea 地图草稿添加岔心 应答器； 
点赞数据推送修db改
 2021-01-13 10:41:26 +08:00
sheng
ca313ad48c Merge remote-tracking branch 'origin/test' into test 2021-01-12 23:53:15 +08:00
sheng
edcdca23c5 添加侧防生成逻辑 2021-01-12 23:52:58 +08:00
thesai
0faa785f90 创建考试时的权限校验逻辑修改 2021-01-12 20:47:35 +08:00
DU
02078eb039 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-12 18:52:03 +08:00
DU
37c0cee2ae 考试创建同规则删除 2021-01-12 18:51:53 +08:00
thesai
4c23708d14 添加考试的权限校验 2021-01-12 18:12:50 +08:00
thesai
62739021be 仿真权限校验bug修改 2021-01-12 16:12:38 +08:00
thesai
2e77fd784c 仿真修改权限校验逻辑 2021-01-12 14:58:08 +08:00
DU
ca4caa64f9 单位增加关联项目code 2021-01-12 14:02:32 +08:00
DU
e0c23c1e2c 删除考试代码bug 2021-01-12 13:34:10 +08:00
DU
15d4702873 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-12 11:45:03 +08:00
DU
015adfcc95 教学相关修改 2021-01-12 11:44:35 +08:00
thesai
92a2d39318 Merge remote-tracking branch 'origin/test' into test 2021-01-11 20:09:59 +08:00
thesai
b6c1672542 列车移动曲线计算兼容逻辑区段限速 2021-01-11 20:09:52 +08:00
DU
ec6cb89ce0 教学bug 2021-01-11 20:02:12 +08:00
DU
d72beb1e93 Merge remote-tracking branch 'origin/test' into test1 2021-01-11 17:37:49 +08:00
DU
d0284659d8 课程考试关联班级修改 2021-01-11 17:32:24 +08:00
DU
d0907a8d06 Revert "Revert "默认课程考试不分是否所属单位始终展示"" 
This reverts commit 537d2a68
 2021-01-11 17:31:48 +08:00
DU
88c79ab763 Revert "Revert "单位部门成员数据管理关联课程考试"" 
This reverts commit f9a541f4
 2021-01-11 17:31:28 +08:00
thesai
4f950543dd 用戶连接司机视角后发送一次列车完整hmi数据，否则第一次进司机视角列车状态显示不正确 2021-01-11 16:37:42 +08:00
thesai
2618913522 修改<从发布地图新建草稿没有复制目的地码数据>bug 2021-01-11 11:27:28 +08:00
thesai
f5f8df1e28 苏电院初始化时关闭响铃 2021-01-10 20:35:40 +08:00
thesai
cbde7f7e40 苏电院真实设备逻辑修改 2021-01-10 16:23:31 +08:00
thesai
f9a541f492 Revert "单位部门成员数据管理关联课程考试" 
This reverts commit c6f0df8b
 2021-01-09 20:16:18 +08:00
thesai
537d2a68f5 Revert "默认课程考试不分是否所属单位始终展示" 
This reverts commit 5d65b4d5
 2021-01-09 20:15:50 +08:00
thesai
6caf775a8e Merge remote-tracking branch 'origin/test' into master-huawei 2021-01-09 19:51:21 +08:00
thesai
1d3409fb45 苏电院修改响铃时长 2021-01-09 19:47:54 +08:00
thesai
f49d344553 Merge remote-tracking branch 'origin/test' into test 2021-01-09 19:26:57 +08:00
thesai
88de80d11b 苏电院真实设备逻辑修改 2021-01-09 19:26:41 +08:00
DU
5d65b4d50d 默认课程考试不分是否所属单位始终展示 2021-01-08 18:09:47 +08:00
DU
c6f0df8b18 单位部门成员数据管理关联课程考试 2021-01-08 18:00:51 +08:00
sheng
fdd51383f4 Merge remote-tracking branch 'origin/test' into test 2021-01-08 15:32:06 +08:00
DU
8b64fde956 仿真会话bug修复 2021-01-07 19:33:01 +08:00