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

1025 Commits

Author SHA1 Message Date
joylink_zhangsai
604bfd0d20 大铁引导bug修改 2021-04-28 18:49:57 +08:00
joylink_zhangsai
5604630845 道岔初始化bug修改；接近锁闭判断条件修改； 2021-04-28 18:12:00 +08:00
walker-sheng
ecdd948079 Merge remote-tracking branch 'origin/test' into test 2021-04-28 17:29:02 +08:00
walker-sheng
66dcf3541c 大铁线路信号机接近区段数据构建 2021-04-28 17:28:47 +08:00
joylink_zhangsai
6c80e68b75 取消列车进入进路逻辑判断；引导信号颜色修改；进路初始化逻辑添加 2021-04-28 17:26:08 +08:00
joylink_zhangsai
88ec13709f Merge remote-tracking branch 'origin/test' into test 2021-04-28 15:40:34 +08:00
joylink_zhangsai
1505ff4604 大铁引导总锁和通过进路操作 2021-04-28 15:40:20 +08:00
walker-sheng
035f9fffdf 大铁线路进路数据构建bug修改，添加删除时更新敌对关系逻辑 2021-04-28 14:51:26 +08:00
walker-sheng
d9226d47b6 轨道交通仿真——srSignal状态初始化修改 2021-04-28 10:44:44 +08:00
walker-sheng
6b69b956b6 Merge remote-tracking branch 'origin/test' into test 2021-04-28 10:34:35 +08:00
walker-sheng
f26d4516e6 轨道交通仿真——仿真设备添加状态初始化 2021-04-28 10:34:15 +08:00
joylink_zhangsai
6d40a8c5d9 Merge remote-tracking branch 'origin/test' into test 2021-04-28 09:29:00 +08:00
joylink_zhangsai
c231bc5ead 大铁仿真操作实现中 2021-04-28 09:28:49 +08:00
walker-sheng
bd3b7b8087 轨道交通仿真——仿真设备添加状态初始化 2021-04-27 18:42:37 +08:00
walker-sheng
63fdbbfcaf 轨道交通仿真——处理报错 2021-04-27 17:11:31 +08:00
walker-sheng
04d42aff4f Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilSignal.java
 2021-04-27 17:10:29 +08:00
walker-sheng
4e553f67bd 轨道交通仿真——添加信号机故障注入、移除逻辑，信号机基础属性添加是否调车信号机字段 2021-04-27 17:09:40 +08:00
joylink_zhangsai
d2c9e3436a Merge remote-tracking branch 'origin/test' into test 2021-04-27 09:19:53 +08:00
joylink_zhangsai
9df81aecf4 大铁仿真操作实现中 2021-04-27 09:19:39 +08:00
walker-sheng
b894b414df 轨道交通仿真——添加计轴故障注入、移除逻辑完善 2021-04-26 18:39:24 +08:00
walker-sheng
bad2536d3f 仿真结构——添加仿真时间消息同步，仿真故障注入、移除通用接口和事件机制 
轨道交通仿真——添加道岔故障注入、移除逻辑
 2021-04-26 17:09:35 +08:00
joylink_zhangsai
48bc9bd59d 删除道岔、区段、信号机的Cil类中本应属于Common类的字段 2021-04-26 13:54:39 +08:00
joylink_zhangsai
1590a7cbcc 大铁仿真操作实现中 2021-04-26 13:25:46 +08:00
walker-sheng
71b5dcbf59 Merge remote-tracking branch 'origin/test' into test 2021-04-25 17:53:25 +08:00
walker-sheng
b0946a9baf 轨道交通仿真——通用数据repo构建 2021-04-25 17:53:06 +08:00
joylink_zhangsai
0331485a8b Merge remote-tracking branch 'origin/test' into test 2021-04-23 18:14:14 +08:00
joylink_zhangsai
71245dd6a2 新版仿真操作实现中 2021-04-23 18:13:47 +08:00
walker-sheng
d6c5cfaecf 消息推送——ATS消息构建调整 2021-04-23 18:12:20 +08:00
walker-sheng
a261c9e3e9 Merge remote-tracking branch 'origin/test' into test 2021-04-23 15:23:34 +08:00
walker-sheng
34f3c7a94b 消息推送——ATS构建下一发送消息问题修改 2021-04-23 15:23:08 +08:00
joylink_zhangsai
0e3ab8cac8 新版仿真进路与取消进路实现；子系统更新接口修改 2021-04-23 15:20:39 +08:00
walker-sheng
0f64c9b2c3 仿真公共接口添加初始化接口 2021-04-23 14:38:36 +08:00
walker-sheng
8912639885 仿真设备状态消息推送流程抽象 
轨道交通仿真——实现ATS消息推送流程
 2021-04-23 14:18:53 +08:00
walker-sheng
55300ffa1e 大铁通过多进路创建bug修改 2021-04-23 10:53:17 +08:00
joylink_zhangsai
a1a65a216a ats道岔消息构建添加更多字段 2021-04-22 17:50:13 +08:00
joylink_zhangsai
e15ed2db11 新版仿真ws消息推送实现 2021-04-22 16:04:28 +08:00
walker-sheng
303760220a 轨道交通仿真——创建过程添加初始化仿真成员和创建者扮演成员，调通操作调用 2021-04-22 14:40:20 +08:00
joylink_zhangsai
89d8c4b198 仿真创建时构建数据逻辑修改；地图子系统编辑添加对newApi的修改功能；添加生成单个子系统的接口（未测试） 2021-04-22 11:18:14 +08:00
joylink_zhangsai
828c618db7 Merge remote-tracking branch 'origin/test' into test 2021-04-22 11:05:53 +08:00
walker-sheng
a3b9a6c81f 轨道交通仿真——添加道岔转动三个操作 2021-04-22 11:01:09 +08:00
joylink_zhangsai
c23da105a0 新版仿真，添加创建仿真和获取仿真信息接口（构建数据的逻辑先去掉了，因为大铁线路数据不完整）；仿真消息发送功能实现中 2021-04-22 10:51:38 +08:00
walker-sheng
e7db868c99 轨道交通仿真仓库构建修改 2021-04-22 10:27:50 +08:00
walker-sheng
7b6cb60ba3 地图检查配置字段导入导出添加 2021-04-22 09:06:08 +08:00
walker-sheng
79cc4b43b4 地图绘制添加检查配置和发布时是否检查逻辑 
地图数据添加相关配置字段
 2021-04-21 16:02:10 +08:00
walker-sheng
78459f3a1b 大铁进路生成逻辑bug修改 
地图绘制添加检查配置
 2021-04-21 14:56:32 +08:00
walker-sheng
e4cbf34b01 大铁进路生成逻辑bug修改 2021-04-21 09:47:25 +08:00
walker-sheng
d9ed6eea4e Merge remote-tracking branch 'origin/test' into test 2021-04-19 17:24:56 +08:00
walker-sheng
a81d9f1677 新仿真通用对象构建添加侧防 
大铁进路生成添加敌对进路关系构建和重复code检查逻辑
 2021-04-19 17:24:35 +08:00
joylink_zhangsai
57deb846f1 信号按钮添加字段 2021-04-19 16:35:50 +08:00
walker-sheng
1d2157db49 Merge remote-tracking branch 'origin/test' into test 2021-04-19 16:02:04 +08:00
walker-sheng
13b6581f09 新仿真通用对象构建添加进路、延续保护进路 2021-04-19 16:01:46 +08:00
joylink_zhangsai
d50157321a 信号机类型添加调车信号机 2021-04-19 13:49:35 +08:00
joylink_zhangsai
cd521791fc Merge remote-tracking branch 'origin/test' into test 2021-04-16 18:31:06 +08:00
joylink_zhangsai
f9d95dba62 新版仿真进路办理及道岔转动逻辑初步实现 2021-04-16 18:30:54 +08:00
walker-sheng
dbd2d0f22e 添加仿真通用对象构建 
大铁进路创建接口和生成逻辑开发
地图数据检查重新实现（未完成）
 2021-04-16 18:12:28 +08:00
DU
b0ecb17cf2 导入地图数据修改 2021-04-16 11:05:04 +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
ce39d404b1 地图分组导入bug修改 2021-04-13 15:37:01 +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
DU
3cc7c1c548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-04-06 18:14:32 +08:00
DU
1fa4451a2d 运行图校验 2021-04-06 18:14:20 +08:00
joylink_zhangsai
2bad6177d1 Merge remote-tracking branch 'origin/test' into test 2021-04-06 13:38:21 +08:00
joylink_zhangsai
59891464a1 更新地图版本时不再生成默认交路 2021-04-06 13:38:06 +08:00
walker-sheng
9f2d67de6a Merge remote-tracking branch 'origin/test' into test 2021-04-02 19:41:48 +08:00
walker-sheng
6798b74964 侧防锁闭逻辑bug修改 
新仿真逻辑——CI功能开发
 2021-04-02 19:41:34 +08:00
joylink_zhangsai
8d3cfc90ba 移动授权计算bug修改 2021-04-02 18:54:47 +08:00
joylink_zhangsai
28f992fb7c Merge remote-tracking branch 'origin/test' into test 2021-04-02 18:07:17 +08:00
joylink_zhangsai
9ef0bb210d 屏蔽门关门后，如果线路选择了自动调整运行，延时6秒发车 2021-04-02 18:07:04 +08:00
walker-sheng
a166f3e4be 侧防锁闭逻辑问题修改 2021-04-02 17:07:03 +08:00
walker-sheng
5965385be5 联锁进路信号机级别、重复封锁、开放进路后联锁条件检查等流程修改 2021-04-02 16:23:12 +08:00
joylink_zhangsai
2f0e64a231 Merge remote-tracking branch 'origin/test' into test 2021-04-02 16:19:41 +08:00
joylink_zhangsai
04a49c1f2d 补充真实设备的故障状态重置 2021-04-02 16:19:32 +08:00
walker-sheng
6c247db987 三维课程数据接口bug修改 2021-04-02 15:34:56 +08:00
walker-sheng
085383bb5f 三维课程数据接口bug修改 2021-04-02 15:32:19 +08:00
joylink_zhangsai
4f6e140a31 Merge remote-tracking branch 'origin/test' into test 2021-04-02 14:22:38 +08:00
joylink_zhangsai
277eb6e244 移动授权计算逻辑修改 2021-04-02 14:22:19 +08:00
walker-sheng
a3465dc020 新仿真逻辑——CI联锁系统逻辑开发 2021-04-02 11:22:40 +08:00
walker-sheng
7027712908 添加信号机新字段存储对象逻辑 2021-04-02 11:21:14 +08:00
walker-sheng
d90288429d Merge remote-tracking branch 'origin/test' into test 2021-04-02 11:18:03 +08:00
walker-sheng
3fbe678a5d 进路侧防逻辑调整，添加侧防为信号机时，禁止信号机进路办理逻辑 2021-04-02 11:17:41 +08:00
joylink_zhangsai
47d5ad0bb0 修改因组织和项目改为一对多关系导致的bug 2021-04-02 10:51:49 +08:00
joylink_zhangsai
707d23e2cc 修改接口地址 2021-04-02 09:06:18 +08:00
joylink_zhangsai
376c4c6a54 Merge remote-tracking branch 'origin/test' into test 2021-04-02 08:53:35 +08:00
joylink_zhangsai
733c06b191 用户表添加org_id，导入的学生与组织永远关联；组织和项目改为一对多 2021-04-01 16:30:01 +08:00
walker-sheng
1278ab42e1 Merge remote-tracking branch 'origin/test' into test 2021-03-31 18:07:19 +08:00
walker-sheng
d52faf40e7 开发三维课程数据增删改查接口 2021-03-31 18:06:59 +08:00
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
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