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

2231 Commits

Author SHA1 Message Date
joylink_zhangsai
0ef764591a 修改大铁子系统生成名称 2022-08-23 11:25:23 +08:00
joylink_zhangsai
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
joylink_zhangsai
d510fb990b 区段增加停稳倒计时逻辑及状态 2022-08-17 13:24:09 +08:00
joylink_zhangsai
7a0ae0426b 修改操作计数逻辑；区段数据增加停稳倒计时显示位置 2022-08-17 13:23:10 +08:00
xzb
e57bf757ac 注掉华为voice 2022-08-17 11:21:34 +08:00
joylink_zhangsai
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
joylink_zhangsai
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
joylink_zhangsai
f9f9c998ec 修改注解 2022-08-16 13:25:30 +08:00
joylink_zhangsai
d98fdd15cb 删除实训数据中的operaJson；增加Valuable新实现 2022-08-16 13:20:10 +08:00
joylink_zhangsai
cee7197c70 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-16 11:10:06 +08:00
joylink_zhangsai
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
joylink_zhangsai
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
joylink_zhangsai
73a1ad2e3d 新实训数据结构修改中 2022-08-15 10:58:45 +08:00
weizhihong
35236a831a 【回库折返轨判断】 2022-08-15 10:33:46 +08:00
joylink_zhangsai
18d9d72347 新实训数据结构修改中 2022-08-15 09:33:34 +08:00
joylink_zhangsai
8e1e491fca Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-12 16:45:12 +08:00
joylink_zhangsai
d600df6381 新实训数据结构修改中 2022-08-12 16:45:02 +08:00
joylink_zhangsai
ad6fd2ac37 Merge remote-tracking branch 'origin/test' into test 2022-08-12 15:48:07 +08:00
joylink_zhangsai
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
weizhihong
2ba34056dc 【删除多余代码】 2022-08-12 13:33:27 +08:00
weizhihong
e865770a4b Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-08-12 13:27:22 +08:00
weizhihong
3dcc6b5a66 【语音操作改为Base64上传】 2022-08-12 13:27:17 +08:00
xiazengbin
8c1dee2202 组合进路-通过进路信号 2022-08-12 13:07:44 +08:00
xiazengbin
fbcf1e645e merge 2022-08-12 11:31:35 +08:00
xiazengbin
4fe596c803 组合进路 2022-08-12 11:11:49 +08:00
joylink_zhangsai
e3fc0efeaf 新实训数据结构修改中 2022-08-12 11:04:00 +08:00
joylink_zhangsai
cc2c667e40 修改大铁通过进路生成的信号显示 2022-08-12 11:00:37 +08:00
joylink_zhangsai
782788e0e9 修改大铁通过进路生成的信号显示 2022-08-12 10:58:35 +08:00
joylink_zhangsai
0580471208 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-12 10:40:59 +08:00
joylink_zhangsai
7dad6b1419 部分地图数据删除showConditions字段 2022-08-12 10:40:42 +08:00
weizhihong
4f9a12e7a7 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-08-12 10:20:23 +08:00
weizhihong
dc0982bc97 【电话操作】 2022-08-12 10:20:18 +08:00
joylink_zhangsai
6170ebc3f5 Merge remote-tracking branch 'origin/test' into test 2022-08-12 09:52:23 +08:00
joylink_zhangsai
8dcfce7354 增加<故障通知>信号按钮类型 2022-08-12 09:52:08 +08:00
joylink_zhangsai
7b9fba8412 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-12 09:50:28 +08:00
joylink_zhangsai
9c1e2cfc9d 增加<故障通知>信号按钮类型 2022-08-12 09:50:17 +08:00
weizhihong
5fd42ccf40 【电话会话操作、聊天会话操作】 2022-08-12 09:45:02 +08:00
tiger_zhou
f08f1e37ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zhouyin 2022-08-12 09:38:23 +08:00
tiger_zhou
214a4ae7d0 列车进路延时解锁时间180S,调车进路延时解锁为30S 2022-08-12 09:37:56 +08:00
xiazengbin
112ab6cbab 每次开始触发办理进路时设置开放信号显示 2022-08-11 17:56:34 +08:00
weizhihong
9a9171766b 【会话语音输入、文字输入操作】 2022-08-11 14:11:25 +08:00
weizhihong
efcdeaf26d Merge remote-tracking branch 'remotes/origin/test' into test-training2 2022-08-11 13:50:31 +08:00
weizhihong
a95076aac1 【分路不良状态问题】 2022-08-11 13:05:15 +08:00
joylink_zhangsai
6a194ce09c Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-08-11 11:27:38 +08:00
joylink_zhangsai
d6b327f8cc 新实训增加<表达式>数据结构、实训数据增加运行图id、评分规则增加仿真成员信息 2022-08-11 11:27:24 +08:00
xiazengbin
4073382b85 3.233 2022-08-11 11:20:13 +08:00
xiazengbin
f0fc1fed80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzbsignal 2022-08-11 11:09:35 +08:00
xiazengbin
5476db3db3 signal 2022-08-11 09:19:10 +08:00
weizhihong
c2394f3eb9 【重置时，分路不良状态改成false】 2022-08-11 09:12:51 +08:00
weizhihong
a809059e4a Merge remote-tracking branch 'remotes/origin/test' into test-training2 2022-08-11 08:50:59 +08:00
weizhihong
b25d0ab80d 【会话操作枚举】 2022-08-11 08:50:27 +08:00
weizhihong
54d617f77b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2022-08-11 08:48:46 +08:00
weizhihong
f754e6d07f 【行驶至前方站、进路闭塞行驶，合并入驾驶操作中】 2022-08-11 08:48:40 +08:00
joylink_zhangsai
0c824032c4 Merge remote-tracking branch 'origin/test' into test-training2 2022-08-10 15:21:36 +08:00
joylink_zhangsai
26c5be81b0 Merge remote-tracking branch 'origin/test' into test 2022-08-10 15:21:07 +08:00
joylink_zhangsai
5326a53baa 草稿进路更新功能增加<离去区段占用与信号对应关系> 2022-08-10 15:20:55 +08:00
weizhihong
1e4071d79c 【去除角色司机限制】 2022-08-10 13:37:47 +08:00
weizhihong
a5640fb52b 【删除越红灯行驶、越引导信号行驶、限速、驾驶至、大铁发车、停车操作】 2022-08-10 13:07:57 +08:00
joylink_zhangsai
fb68e92e4d Merge remote-tracking branch 'origin/test' into test-training2 2022-08-10 10:03:44 +08:00