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

748 Commits

Author SHA1 Message Date
joylink_zhangsai
14d168b88f 添加管理员查询组织树接口 2021-03-31 15:32:27 +08:00
walker-sheng
0e2d9e339a Merge remote-tracking branch 'origin/test' into test 2021-03-31 14:23:06 +08:00
walker-sheng
9c62b15593 新仿真逻辑——CI联锁系统逻辑开发 2021-03-31 14:22:43 +08:00
joylink_zhangsai
d1c27dc910 打开的屏蔽门ma计算bug修改 2021-03-31 09:53:38 +08:00
joylink_zhangsai
ad506486c0 教学管理考试查询bug修改 2021-03-30 18:27:44 +08:00
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