Commit Graph

2681 Commits

Author SHA1 Message Date
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
xiazengbin
459d2caf23 training2 2022-08-16 13:57:40 +08:00
xiazengbin
77c10de68d draft training2 数据库定义相关 2022-08-16 13:55:18 +08:00
f9f9c998ec 修改注解 2022-08-16 13:25:30 +08:00
d98fdd15cb 删除实训数据中的operaJson;增加Valuable新实现 2022-08-16 13:20:10 +08:00
cee7197c70 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-16 11:10:06 +08:00
45e5ad302b 新实训数据结构修改中 2022-08-16 11:09:52 +08:00
weizhihong
b1606676e2 【新增消息类型语音、文字】 2022-08-16 10:43:20 +08:00
weizhihong
8bf5a4b807 Merge branch 'test' into test-training2 2022-08-16 10:28:46 +08:00
1e69db5a5e 新实训数据结构修改中 2022-08-15 17:47:02 +08:00
tiger_zhou
f3df206427 修改:添加车辆停靠车站时,车门关闭后向前行驶一点的问题,因为车头偏移小于目标偏移(设定) 2022-08-15 17:19:01 +08:00
weizhihong
33203131b2 【增加Train_Drive命令,后续切换完成后,将Train_Trust删除】 2022-08-15 15:05:20 +08:00
weizhihong
e5db5e02f4 【切换为RM模式后,再次切换AM死循环问题】 2022-08-15 14:04:05 +08:00
73a1ad2e3d 新实训数据结构修改中 2022-08-15 10:58:45 +08:00
weizhihong
35236a831a 【回库折返轨判断】 2022-08-15 10:33:46 +08:00
18d9d72347 新实训数据结构修改中 2022-08-15 09:33:34 +08:00
8e1e491fca Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-12 16:45:12 +08:00
d600df6381 新实训数据结构修改中 2022-08-12 16:45:02 +08:00
ad6fd2ac37 Merge remote-tracking branch 'origin/test' into test 2022-08-12 15:48:07 +08:00
ebdcd4362c 信号按钮增加有无计数器字段 2022-08-12 15:47:43 +08:00
weizhihong
bc5f414193 【文字输入会话枚举类型BUG】 2022-08-12 15:28:15 +08:00
tiger_zhou
c4c803428c 进路延期取消的时候,不能手动取消进路 2022-08-12 14:24:20 +08:00
weizhihong
9cbfb97d98 【会话文件上传后增加返回结果】 2022-08-12 13:53:33 +08:00
tiger_zhou
ad180a4355 列车进路延时解锁时间180S,调车进路延时解锁为30S 2022-08-12 13:46:02 +08:00