Commit Graph

2329 Commits

Author SHA1 Message Date
xzb
e236c51863 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-15 14:14:36 +08:00
xzb
97d2dab3af 调度命令-地图添加调度台;实训添加发布轨迹追踪; 2022-09-15 14:14:11 +08:00
weizhihong
a13daf7c23 【修复实训第一次开始时背景消失BUG】 2022-09-15 13:53:06 +08:00
weizhihong
1ab2452c70 【状态类型为枚举时,判断做处理】 2022-09-15 10:52:30 +08:00
weizhihong
48a28cb7c4 【修改状态判定,解决列车触发条件不生效问题】 2022-09-15 09:09:52 +08:00
weizhihong
1e94f3ae5a 【用户无角色结束实训操作】 2022-09-14 16:11:53 +08:00
xzb
10f9ebc161 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-14 15:44:39 +08:00
xzb
cc73a5448f 调度命令 2022-09-14 15:43:38 +08:00
weizhihong
a86c734f44 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Switch.java
2022-09-14 14:55:15 +08:00
weizhihong
442f2e436b 【增加进路、区段、信号机、相关枚举描述属性字段;实训返回枚举描述信息】 2022-09-14 14:49:07 +08:00
xzb
4c5225e19d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-14 14:32:33 +08:00
xzb
d1e9c258f0 调度命令 2022-09-14 14:32:16 +08:00
6f3744f98b 调整部分设备状态注解 2022-09-14 14:31:38 +08:00
weizhihong
9e29a8f360 【修改火车设备状态属性选择】 2022-09-14 10:53:07 +08:00
xzb
8abff77bad 调度命令-回执 2022-09-14 10:28:28 +08:00
xzb
e26221f723 调度命令-消息推送 2022-09-14 09:54:29 +08:00
xzb
5d83ababdc 调度命令-代签 2022-09-13 18:11:22 +08:00
xzb
bf821d9ff8 调度命令-受令单位超时60秒未签收处理 2022-09-13 15:56:15 +08:00
xzb
fa140c96f4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-13 10:20:07 +08:00
xzb
6d05ce3d00 调度命令-调度命令操作接口(仅用于生成smart-doc) 2022-09-13 10:19:47 +08:00
xzb
379281a8a8 调度命令-接口注释完善 2022-09-13 10:18:43 +08:00
weizhihong
952e8ea345 【调整实训提示消息结构】 2022-09-09 15:15:27 +08:00
weizhihong
f2ab803993 【刷新仿真时,会话信息转VO问题出错】 2022-09-09 10:15:37 +08:00
weizhihong
d815c99f0f 【大铁实训语音校验逻辑修改】 2022-09-09 10:07:09 +08:00
xzb
81698a389f 调度命令 2022-09-09 09:03:30 +08:00
xzb
dbe7f90f3e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-08 18:14:59 +08:00
xzb
94bd30b06b 调度命令 2022-09-08 18:14:42 +08:00
weizhihong
04b7a35a6b 【步骤为空时,保存出错】 2022-09-08 17:32:48 +08:00
xzb
8ff182e6e7 调度命令 2022-09-08 15:15:24 +08:00
xzb
c9538a39be 调度命令 2022-09-08 15:14:23 +08:00
xzb
de2a86f34f 调度命令 2022-09-08 11:09:12 +08:00
xzb
507459e233 调度命令 2022-09-08 10:32:46 +08:00
xzb
0dcb7dc9b3 调度命令 2022-09-08 09:46:19 +08:00
xzb
f2d285f022 调度命令 2022-09-07 18:06:57 +08:00
xzb
6a05030c7a Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-07 17:43:06 +08:00
xzb
3387034a66 调度命令 2022-09-07 17:42:33 +08:00
tiger_zhou
b42794e45b Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-07 17:19:13 +08:00
tiger_zhou
41fe8bba1c 武汉8号线列车位置显示功能 2022-09-07 16:39:55 +08:00
weizhihong
faeef7a0ea 【实训重新开始时状态未初始化问题】 2022-09-07 15:04:17 +08:00
weizhihong
1308e569c1 【指标计算逻辑】 2022-09-07 14:10:10 +08:00
xzb
c80828e388 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-07 14:02:19 +08:00
xzb
f9eb48625f 调度命令 2022-09-07 14:01:06 +08:00
weizhihong
101956f8d6 【修改指标属性类型】 2022-09-07 10:48:28 +08:00
weizhihong
9b8080d5f3 【实训指标计算加入操作参数】 2022-09-07 10:41:06 +08:00
weizhihong
cc7d57a511 【指标操作对应,创建指标操作类,指标统计类型】 2022-09-07 10:28:19 +08:00
tiger_zhou
753c314292 武汉8号线列车位置显示功能 2022-09-07 10:01:58 +08:00
tiger_zhou
7065625895 Merge branch 'test' into test-training2-zhouyin 2022-09-07 08:58:05 +08:00
tiger_zhou
6a3c4ad645 武汉8号线列车位置显示功能 2022-09-07 08:57:34 +08:00
xzb
a7ff59fc91 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-06 18:03:11 +08:00
xzb
52ac4d1d63 调度命令 2022-09-06 18:02:56 +08:00