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

2837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joylink_zhangsai
912c6b8612 Merge remote-tracking branch 'origin/test' into test 2022-04-26 14:20:14 +08:00
joylink_zhangsai
75fc0d0915 大铁线路2增加进路路径生成逻辑（因为没有站间运行等级和交路数据） 2022-04-26 14:19:55 +08:00
weizhihong
4d12f520d1 【改方时列车换端操作】 2022-04-25 10:15:41 +08:00
weizhihong
f83fbf0002 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2022-04-24 16:54:16 +08:00
joylink_zhangsai
af36dd547d 大铁CTC去掉ATS进路触发功能；修改CTC股道视图计划生成逻辑 2022-04-24 16:54:11 +08:00
weizhihong
53cb44174c 【改方BUG修复，空指针判断】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 16:49:27 +08:00
joylink_zhangsai
67ac1683c4 Merge remote-tracking branch 'origin/test' into test 2022-04-24 15:20:20 +08:00
joylink_zhangsai
318ccb915e 修改大铁CTC流程 2022-04-24 15:20:11 +08:00
weizhihong
4f697b19fc 【去除车站判断逻辑】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 14:23:28 +08:00
joylink_zhangsai
d95dbe982f 修改大铁CTC流程 2022-04-24 13:49:44 +08:00
weizhihong
3d59d32db7 【指示灯逻辑】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 13:45:08 +08:00
weizhihong
25413f0f58 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2022-04-24 13:03:03 +08:00
weizhihong
ce25b8458d 【草稿发布功能修改】 
【仿真数据加载逻辑修改】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 13:02:08 +08:00
joylink_zhangsai
19befb0909 修改大铁CTCbug 2022-04-24 11:12:37 +08:00
joylink_zhangsai
5e437a9751 Merge remote-tracking branch 'origin/test' into test 2022-04-22 19:27:52 +08:00
joylink_zhangsai
7cda8ad471 大铁CTC逻辑 2022-04-22 19:27:46 +08:00
weizhihong
9d7a9422d0 【指示灯状态逻辑】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 19:27:33 +08:00
weizhihong
8abe421380 【改方按钮状态修改】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 17:49:40 +08:00
weizhihong
b5bd2b4035 【去除多余操作指令，多余代码】 
【修改点灯操作与按钮亮灯操作一致】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 17:24:19 +08:00
weizhihong
83b92094c5 【增加邻站进路办理】 
【修改指示灯状态不变化BUG】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 15:37:51 +08:00
weizhihong
739ac78060 【邻站办理发车进路】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 13:53:49 +08:00
weizhihong
d8425c80a5 Merge remote-tracking branch 'origin/test' into test 2022-04-22 13:51:32 +08:00
joylink_zhangsai
0c1e5f2268 大铁CTC逻辑（未完） 2022-04-22 13:47:39 +08:00
weizhihong
cbc42825f8 【修改改方逻辑问题】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 10:05:01 +08:00
weizhihong
fedf7b2e3f 【处理区间灯关联区间信息】 
【仿真信息加载时，加入指示灯、按钮逻辑数据】
【增加指示灯、按钮状态变化消息实体】
【修改车站关联指示灯、按钮为空问题】
【增加指示灯类型过滤，减少循环】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-21 18:11:50 +08:00
weizhihong
abe24e0079 【刷新指示灯信息】BUG修复 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-21 12:15:48 +08:00
weizhihong
17edb388d8 【修改车站获取指示灯列表BUG】 
【增加按钮枚举类型】
【指示灯、按钮初始化类型筛选】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-21 11:06:11 +08:00
joylink_zhangsai
4cbb439634 消除大铁CTC线路仿真数据错误提示 2022-04-21 10:35:36 +08:00
joylink_zhangsai
3500e6a2fe 修改大铁进路数据（临时）处理接口 2022-04-21 09:23:13 +08:00
joylink_zhangsai
453c8a3eaa 修改进路构建逻辑 2022-04-20 18:47:21 +08:00
joylink_zhangsai
e26821c0eb Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
 2022-04-20 18:20:49 +08:00
joylink_zhangsai
a5f787c0f4 大铁进路生成逻辑修改；大铁CTC（未完） 2022-04-20 18:16:50 +08:00
weizhihong
1f85d75588 删除多余代码，修改【指示灯、按钮】初始化逻辑 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 16:37:07 +08:00
weizhihong
4a3e4d985a 【指示灯、操作按钮】初始化 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 15:31:45 +08:00
weizhihong
81c9ceb2aa 【指示灯信息】查询列表问题修复 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 11:10:13 +08:00
weizhihong
923db614cd 【指示灯、按钮】管理接口BUG修复 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 10:52:11 +08:00
weizhihong
2a14147c6a 【指示灯、按钮关联关系】管理接口 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 10:25:05 +08:00
joylink_zhangsai
61ba7c0e3d 运行图不检查有CTC系统（大铁）的线路的出入库交路 2022-04-19 17:47:35 +08:00
joylink_zhangsai
b65610a349 创建用户交路时根据地图配置决定检不检查线路基础数据 2022-04-19 16:59:35 +08:00
joylink_zhangsai
abfd140ae9 Merge remote-tracking branch 'origin/test' into test 2022-04-19 15:58:16 +08:00
joylink_zhangsai
e34852eb65 大铁进路路径生成逻辑修改 2022-04-19 15:58:00 +08:00
weizhihong
5c4bdf41dc 修改【指示灯关联实体类】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-19 15:40:41 +08:00
weizhihong
23f738cbc1 增加【按钮与站台关联、指示灯与进路关联】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-19 15:08:40 +08:00
weizhihong
56b099f39f 大铁【改方操作】【接发指示灯】功能 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-19 13:48:27 +08:00
joylink_zhangsai
b808c220a8 教学统计 2022-04-18 19:01:54 +08:00
joylink_zhangsai
6f0aa02eb6 大铁CTC（未完） 2022-04-18 14:48:20 +08:00
joylink_zhangsai
c65998e861 Merge remote-tracking branch 'origin/test' into dev 2022-04-18 14:35:46 +08:00
joylink_zhangsai
cb561da228 学生考试成绩曲线接口 2022-04-15 18:52:22 +08:00
joylink_zhangsai
48d3d6fb1d 大铁CTC 2022-04-15 18:51:26 +08:00
joylink_zhangsai
682beda268 处理大铁无ZC的问题：车站关联的zc没有用到，所以车站不再关联zc 2022-04-15 10:23:14 +08:00