Commit Graph

2303 Commits

Author SHA1 Message Date
weizhihong
a3e9d7faf0 【修改表达式数据格式】 2022-08-25 14:22:47 +08:00
tiger_zhou
37a8451173 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin 2022-08-25 08:56:56 +08:00
33217b868f 大铁生成子系统增加综合演练 2022-08-24 18:35:19 +08:00
tiger_zhou
d8eb3dd50f 车务管理终端功能代码调整 2022-08-24 18:03:46 +08:00
weizhihong
36def8ce7a 【仿真加载实训】 2022-08-24 16:39:45 +08:00
xzb
b1a5415720 实训草稿分页查询添加过滤条件mapId 2022-08-24 16:07:33 +08:00
xzb
a784fc278b routepath 筛选异常时打印 2022-08-24 15:56:21 +08:00
7f870d52ce Merge remote-tracking branch 'origin/test' into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
2022-08-24 15:26:18 +08:00
b4470f92c9 修改大铁调车进路生成逻辑 2022-08-24 13:57:14 +08:00
0e4f0b7b83 增加武汉项目 2022-08-24 11:14:10 +08:00
tiger_zhou
ab8f0d3556 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin 2022-08-24 09:07:31 +08:00
xzb
41c7130489 已发布实训管理 2022-08-23 16:22:42 +08:00
xzb
dd9996a895 实训草稿保存、保存草稿地图定位;已发布实训根据mapId获取、根据已发布实训id或实训完整信息 2022-08-23 13:20:18 +08:00
0ef764591a 修改大铁子系统生成名称 2022-08-23 11:25:23 +08:00
0433273f35 修改停稳倒计时实现逻辑 2022-08-23 10:04:17 +08:00
xzb
5d4bb2a63d PageQueryVO.pageNum添加注释 2022-08-23 09:37:19 +08:00
tiger_zhou
6e862173b8 车务管理终端功能代码调整 2022-08-22 16:36:23 +08:00
weizhihong
aa1f8021c3 【实训参演角色设置】 2022-08-22 16:00:39 +08:00
weizhihong
f27e2dab8a 【实训运行逻辑修改,增加单操时角色的默认选定】 2022-08-22 14:55:09 +08:00
xzb
c687f0a322 删除获取所有实训草稿信息的接口 2022-08-22 13:07:01 +08:00
xzb
fd43bbcc30 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-08-22 12:16:09 +08:00
xzb
a831d0cccf 添加实训修改背景接口 2022-08-22 12:15:47 +08:00
weizhihong
74317a0744 【单操角色设置】 2022-08-22 10:45:13 +08:00
weizhihong
f9276e2632 【实训步骤对象】 2022-08-22 09:08:35 +08:00
tiger_zhou
bd45e46e80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin
 Conflicts:
	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
2022-08-19 17:53:03 +08:00
tiger_zhou
59b92ea0c3 车务管理终端功能 2022-08-19 17:50:38 +08:00
weizhihong
b6fd23d036 【实训步骤、操作基本流程逻辑】 2022-08-19 14:53:41 +08:00
weizhihong
8243193972 【实训预览操作】 2022-08-18 16:03:43 +08:00
xzb
51d1a2f665 已发布实训管理接口-删除实训 2022-08-18 14:43:40 +08:00
xzb
281b1acdf3 已发布实训管理接口实现 2022-08-18 14:08:11 +08:00
xzb
c7047614ca 已发布实训管理接口定义 2022-08-18 10:45:59 +08:00
xzb
b50142cdd4 实训草稿发布业务 2022-08-17 18:05:56 +08:00
xzb
f2fcd2f6ea 实训发布表生成的实体、dao、xml 2022-08-17 16:29:18 +08:00
xzb
b9222c262f 实训草稿分页获取,更新草稿分更新基础信息和更新大字段信息 2022-08-17 15:24:56 +08:00
d510fb990b 区段增加停稳倒计时逻辑及状态 2022-08-17 13:24:09 +08:00
7a0ae0426b 修改操作计数逻辑;区段数据增加停稳倒计时显示位置 2022-08-17 13:23:10 +08:00
xzb
e57bf757ac 注掉华为voice 2022-08-17 11:21:34 +08:00
6ff50fa08c 增加引导总锁后办理引导直接开放信号及取消引导总锁后关闭信号逻辑;修改驾驶操作越引导无效bug 2022-08-17 10:33:21 +08:00
xzb
cc2e07d24a 获取当前用户的某个实训草稿的所有信息 2022-08-17 10:29:36 +08:00
xiazengbin
39549dd426 training2 2022-08-17 09:07:46 +08:00
xiazengbin
fbe1b0b891 实训草稿基本操作 2022-08-16 18:03:51 +08:00
aaa7e414bc 车站中增加计数器;仿真Members和Users改为有序Map 2022-08-16 17:10:02 +08:00
weizhihong
ed441f7b06 【步骤成员ID】 2022-08-16 16:55:51 +08:00
weizhihong
11b124efc6 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/controller/training2/TrainingDraftV2Controller.java
#	src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
2022-08-16 16:12:27 +08:00
weizhihong
f4457f737b Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/controller/training2/TrainingV2Controller.java
#	src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
2022-08-16 16:10:18 +08:00
xiazengbin
54868de8c2 创建实训草稿 2022-08-16 16:07:18 +08:00
weizhihong
07454c3a0b 【实训步骤编辑、查询】 2022-08-16 15:52:31 +08:00
xiazengbin
8440643eab training2 2022-08-16 15:42:49 +08:00
xiazengbin
3ba7fa5916 training2 2022-08-16 14:54:15 +08:00
xiazengbin
f4c7f29df1 training2 table 2022-08-16 14:32:37 +08:00