|
|
821c31c446
|
仿真结构调整
|
2022-10-10 13:22:18 +08:00 |
|
weizhihong
|
13d2ac11dc
|
【minio链接修改为https】
|
2022-10-10 10:56:08 +08:00 |
|
xzb
|
122badc463
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-10 10:26:43 +08:00 |
|
xzb
|
575c58c739
|
paper
|
2022-10-10 10:26:13 +08:00 |
|
tiger_zhou
|
543584828e
|
mybatis 查询数据封装对象支持"驼峰"规范
|
2022-10-10 09:28:09 +08:00 |
|
tiger_zhou
|
5bb5c07031
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-10 08:52:08 +08:00 |
|
weizhihong
|
271e44e9b2
|
【本地配置修改为http】
|
2022-10-09 18:30:32 +08:00 |
|
weizhihong
|
4509440175
|
【配置文件提交】
|
2022-10-09 18:21:01 +08:00 |
|
xzb
|
ceadaccb3b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-09 18:03:48 +08:00 |
|
xzb
|
be1dc7de2e
|
paper
|
2022-10-09 18:03:24 +08:00 |
|
tiger_zhou
|
1e18878c67
|
已发布实训添加查询维度(名称，地图，类型，标签及组织)
|
2022-10-09 16:09:12 +08:00 |
|
|
|
0b266b2284
|
修改信号机开放主信号判断逻辑以兼容国赛场景
|
2022-10-09 15:45:02 +08:00 |
|
weizhihong
|
16b035d43b
|
【设备管理中项目Code修改为前端指定】
|
2022-10-09 15:14:12 +08:00 |
|
|
|
7112697216
|
修改剧本运行bug
|
2022-10-09 15:09:17 +08:00 |
|
tiger_zhou
|
75c0965797
|
理论试题管理代码调整
|
2022-10-09 13:51:28 +08:00 |
|
xzb
|
23b169bb3b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-09 13:34:55 +08:00 |
|
xzb
|
7c9e57cd16
|
paper
|
2022-10-09 13:34:28 +08:00 |
|
weizhihong
|
1cdef28ea3
|
【MINIO获取下载地址】
|
2022-10-09 13:27:11 +08:00 |
|
xzb
|
df77cfcc24
|
paper
|
2022-10-09 13:24:24 +08:00 |
|
xzb
|
12f91ba58c
|
paper
|
2022-10-09 13:21:38 +08:00 |
|
xzb
|
7da9d7cd36
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-09 13:12:45 +08:00 |
|
xzb
|
41ae0d9c14
|
paper
|
2022-10-09 13:12:24 +08:00 |
|
|
|
11d4f7b154
|
修改Pis循环逻辑bug
|
2022-10-09 13:06:20 +08:00 |
|
tiger_zhou
|
7a385e3b9f
|
理论试题管理代码调整
|
2022-10-09 13:04:49 +08:00 |
|
xzb
|
04f217b7bf
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-09 11:28:46 +08:00 |
|
xzb
|
d442e8cc3f
|
paper
|
2022-10-09 11:28:22 +08:00 |
|
tiger_zhou
|
4a450b40e7
|
理论试题管理代码调整
|
2022-10-09 11:25:51 +08:00 |
|
tiger_zhou
|
153fed2ef2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-09 11:23:41 +08:00 |
|
xzb
|
53ba942a1f
|
paper
|
2022-10-09 11:08:46 +08:00 |
|
xzb
|
be881f5694
|
paper
|
2022-10-09 10:57:30 +08:00 |
|
tiger_zhou
|
d648a44369
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-09 08:43:56 +08:00 |
|
|
|
3bf3ddab97
|
修改大铁实训生成bug；
|
2022-10-08 18:34:04 +08:00 |
|
|
|
703dd34635
|
修改大铁实训生成bug；生成课程考试时，如果无实训，则不生成课程与考试
|
2022-10-08 17:33:35 +08:00 |
|
xzb
|
276801b849
|
paper
|
2022-10-08 14:48:36 +08:00 |
|
xzb
|
6c9c214570
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-08 14:03:45 +08:00 |
|
xzb
|
cb6bf51096
|
paper
|
2022-10-08 14:03:19 +08:00 |
|
weizhihong
|
bf7d53e563
|
【登录时默认客户端处理】
|
2022-10-08 13:05:51 +08:00 |
|
xzb
|
21b1c6da99
|
调度命令
|
2022-10-08 11:14:12 +08:00 |
|
xzb
|
c915b0605e
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-08 11:10:04 +08:00 |
|
xzb
|
a148888e8e
|
调度命令、试卷
|
2022-10-08 11:09:39 +08:00 |
|
weizhihong
|
eb06ff4bac
|
【组织绑定项目编辑问题】
|
2022-10-08 10:11:59 +08:00 |
|
weizhihong
|
ea47f926be
|
【获取项目结构列表；登录机构接口调整】
|
2022-09-30 18:29:33 +08:00 |
|
xzb
|
051eaf4776
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-30 17:39:54 +08:00 |
|
xzb
|
5795139ad9
|
调度命令、试卷
|
2022-09-30 17:39:32 +08:00 |
|
|
|
689a6f433a
|
修改实训生成bug；修正加载实训时的角色选择逻辑
|
2022-09-30 17:32:24 +08:00 |
|
tiger_zhou
|
111b1f0de5
|
语音识别，合成重构调整
|
2022-09-30 16:48:02 +08:00 |
|
|
|
15780897a6
|
针对大铁线路修改排列/取消进路实训的生成逻辑
|
2022-09-30 16:28:53 +08:00 |
|
weizhihong
|
005c0ff34b
|
【路径修改】
|
2022-09-30 16:06:21 +08:00 |
|
weizhihong
|
7defb78dfa
|
【minio预处理路径接口】
|
2022-09-30 15:33:55 +08:00 |
|
tiger_zhou
|
0e2d8d9028
|
语音识别，合成重构 调整
|
2022-09-30 15:26:48 +08:00 |
|
weizhihong
|
1dd77a87b9
|
【MINIO上传的文件信息保存】
|
2022-09-30 14:57:34 +08:00 |
|
weizhihong
|
aadd300cb8
|
【MINIO上传文件信息保存接口，登录选组织信息操作】
|
2022-09-30 14:26:18 +08:00 |
|
|
|
b83f3eaee2
|
语音文件增加保存到本地逻辑（线下部署使用）
|
2022-09-30 13:36:59 +08:00 |
|
xzb
|
f97b92e6f8
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-30 13:15:29 +08:00 |
|
xzb
|
ee3e67046f
|
调度命令
|
2022-09-30 13:15:02 +08:00 |
|
weizhihong
|
92adde9c93
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-30 09:32:11 +08:00 |
|
weizhihong
|
84b542daa0
|
【增加非空判断，增加组织名称】
|
2022-09-30 09:32:05 +08:00 |
|
tiger_zhou
|
1db89def39
|
语音识别，合成重构 调整
|
2022-09-30 09:24:41 +08:00 |
|
weizhihong
|
e590b1b06d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-29 18:12:33 +08:00 |
|
weizhihong
|
01aad063c9
|
【组织、项目关联关系；登录获取项目的组织信息；选择登录组织】
|
2022-09-29 18:12:27 +08:00 |
|
xzb
|
080c29da23
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-29 17:58:10 +08:00 |
|
xzb
|
95b0ba6fd4
|
调度命令
|
2022-09-29 17:57:47 +08:00 |
|
tiger_zhou
|
2ad5ff7e8b
|
语音识别，合成重构 调整
|
2022-09-29 17:51:21 +08:00 |
|
tiger_zhou
|
480553625e
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-29 17:48:07 +08:00 |
|
tiger_zhou
|
21928877d8
|
语音识别，合成重构，
|
2022-09-29 17:47:48 +08:00 |
|
xzb
|
9b94c39826
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-29 17:36:33 +08:00 |
|
xzb
|
5c647108a7
|
paper composition rule
|
2022-09-29 17:36:05 +08:00 |
|
|
|
88434943e2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-29 16:50:34 +08:00 |
|
|
|
55f0856010
|
删除无用消息类型
|
2022-09-29 16:50:15 +08:00 |
|
weizhihong
|
c6abb97709
|
【添加项目View BUG】
|
2022-09-29 16:42:28 +08:00 |
|
tiger_zhou
|
db0222843f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-29 16:34:14 +08:00 |
|
weizhihong
|
794a86e690
|
【组织实体对象】
|
2022-09-29 16:32:53 +08:00 |
|
weizhihong
|
9e70e4d223
|
【登录时组织信息】
|
2022-09-29 16:31:52 +08:00 |
|
weizhihong
|
fde7baef6d
|
【空指针问题解决】
|
2022-09-29 16:30:33 +08:00 |
|
weizhihong
|
e82075281c
|
【增加项目信息】
|
2022-09-29 16:29:23 +08:00 |
|
weizhihong
|
a6470891a4
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-29 16:22:55 +08:00 |
|
weizhihong
|
5a7092360a
|
【增加顶级组织ID方法】
|
2022-09-29 16:22:46 +08:00 |
|
tiger_zhou
|
4f138401db
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-29 15:57:05 +08:00 |
|
|
|
435758678c
|
注释闸机状态代码
|
2022-09-29 15:10:42 +08:00 |
|
|
|
23d116c060
|
删除废代码
|
2022-09-29 15:08:40 +08:00 |
|
xzb
|
a6778a0a58
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-29 14:46:06 +08:00 |
|
xzb
|
b2adc808e3
|
paper
|
2022-09-29 14:45:41 +08:00 |
|
|
|
8ab5cf63f8
|
修改iscs消息发布的路径选择bug
|
2022-09-29 14:09:40 +08:00 |
|
weizhihong
|
c40ce1e2dd
|
【 项目查询增加名称、code筛选参数】
|
2022-09-29 10:26:35 +08:00 |
|
tiger_zhou
|
9dc4a55d17
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-29 09:00:18 +08:00 |
|
xzb
|
80b3106cfa
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-28 18:02:21 +08:00 |
|
xzb
|
5b8e0049e4
|
paper
|
2022-09-28 18:01:55 +08:00 |
|
|
|
d1f6e14f42
|
增加从仿真中获取iscs状态逻辑；增加闸机设备
|
2022-09-28 17:44:26 +08:00 |
|
weizhihong
|
d6f7618ba9
|
【项目查询列表全数据查询】
|
2022-09-28 17:36:36 +08:00 |
|
weizhihong
|
7b2e488882
|
[项目修改BUG]
|
2022-09-28 17:26:48 +08:00 |
|
weizhihong
|
bf4bad87b1
|
【项目描述字段调整】
|
2022-09-28 16:42:11 +08:00 |
|
xzb
|
ac5c1ed33d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-28 16:34:09 +08:00 |
|
xzb
|
65f46b48d4
|
paper
|
2022-09-28 16:33:52 +08:00 |
|
weizhihong
|
63f23cf14e
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-28 16:32:58 +08:00 |
|
weizhihong
|
bfbfcf4b3e
|
【项目结构调整，MINIO增加客户端管理服务类，项目project表结构变更sql】
|
2022-09-28 16:32:52 +08:00 |
|
xzb
|
29d9d76e7d
|
paper company id
|
2022-09-28 15:36:48 +08:00 |
|
xzb
|
69014b0c71
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-28 14:49:45 +08:00 |
|
xzb
|
b2086a4c81
|
paper
|
2022-09-28 14:49:24 +08:00 |
|
tiger_zhou
|
87de6cb800
|
语音识别，合成重构
|
2022-09-28 13:57:32 +08:00 |
|
weizhihong
|
42eaa75d65
|
【minio工具类增加全路径查询文件，修改返回值类型】
|
2022-09-28 13:37:10 +08:00 |
|
weizhihong
|
2e44fce9f4
|
【项目信息编辑属性修改】
|
2022-09-28 09:58:56 +08:00 |
|
weizhihong
|
cb6b6e6516
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-28 09:42:07 +08:00 |
|
weizhihong
|
6637a945fa
|
【minio 上传文件】
|
2022-09-28 09:42:01 +08:00 |
|
|
|
f5f6188ff5
|
修改PIS发布消息bug
|
2022-09-28 09:05:38 +08:00 |
|
xzb
|
4301c32b49
|
paper
|
2022-09-27 18:01:48 +08:00 |
|
xzb
|
91e23d36ae
|
paper
|
2022-09-27 17:59:16 +08:00 |
|
tiger_zhou
|
6d2faad0ae
|
理论试题管理代码调整
|
2022-09-27 15:33:47 +08:00 |
|
tiger_zhou
|
f28d92f793
|
Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/dao/paper/PaperQuestionDAO.java
# src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
|
2022-09-27 15:29:35 +08:00 |
|
tiger_zhou
|
66bf5f7549
|
理论试题管理代码调整
|
2022-09-27 15:28:57 +08:00 |
|
xzb
|
9fe24f7230
|
paper
|
2022-09-27 15:27:03 +08:00 |
|
xzb
|
7ae3346ad7
|
paper
|
2022-09-27 15:13:21 +08:00 |
|
xzb
|
7b6ab5608e
|
paper
|
2022-09-27 15:11:03 +08:00 |
|
xzb
|
6fcf7ca003
|
paper
|
2022-09-27 14:54:41 +08:00 |
|
xzb
|
1af3786341
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-27 14:53:29 +08:00 |
|
tiger_zhou
|
cbc12523bc
|
理论试题管理代码调整
|
2022-09-27 14:51:30 +08:00 |
|
tiger_zhou
|
b5497d4cd3
|
理论试题管理代码调整
|
2022-09-27 14:47:26 +08:00 |
|
xzb
|
c90d5d2394
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-27 14:22:10 +08:00 |
|
xzb
|
7c3ca92216
|
paper
|
2022-09-27 14:21:41 +08:00 |
|
tiger_zhou
|
9cbe835f2b
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-27 14:21:11 +08:00 |
|
tiger_zhou
|
3489df9245
|
理论试题管理代码调整
|
2022-09-27 14:20:29 +08:00 |
|
|
|
1441e973f1
|
Pis发布信息不再直接转语音；修改查询进路路径逻辑以排除掉空列表；修改沙盘订阅路径
|
2022-09-27 10:22:42 +08:00 |
|
|
|
dce23dbff7
|
地图数据处理接口增加对地图逻辑数据的处理
|
2022-09-27 09:14:40 +08:00 |
|
xzb
|
30386dc5f6
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-26 18:06:18 +08:00 |
|
xzb
|
f12ceb3fce
|
paper
|
2022-09-26 18:06:02 +08:00 |
|
weizhihong
|
40678cbc72
|
【清空步骤时，清空最后运行背景】
|
2022-09-26 13:21:03 +08:00 |
|
tiger_zhou
|
d8079d98f2
|
理论试题管理代码调整
|
2022-09-26 13:03:34 +08:00 |
|
weizhihong
|
e6721d69ac
|
【项目前端设置请求修改】
|
2022-09-26 11:19:30 +08:00 |
|
tiger_zhou
|
35fd58eb1d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-26 09:57:05 +08:00 |
|
tiger_zhou
|
293588d6cf
|
修改 project code 参数
|
2022-09-26 09:56:33 +08:00 |
|
weizhihong
|
17e3268667
|
【增加项目缓存读取、删除】
|
2022-09-26 09:52:05 +08:00 |
|
tiger_zhou
|
bfa9b06475
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapElement.java
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java
src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java
src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
src/main/java/club/joylink/rtss/websocket/interceptor/VSimpleInterceptor.java
|
2022-09-26 09:50:34 +08:00 |
|
tiger_zhou
|
77f02453f4
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-26 09:44:37 +08:00 |
|
tiger_zhou
|
ad8e8963c6
|
正式环境 ws config 对象属性 ISysUserService 造成循环依赖 添加lazy注解
|
2022-09-26 09:42:13 +08:00 |
|
xzb
|
f3e409d430
|
dis cmd注释
|
2022-09-26 09:16:37 +08:00 |
|
xzb
|
f48d48f121
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-23 18:01:31 +08:00 |
|
xzb
|
a4865e667a
|
paper
|
2022-09-23 18:01:07 +08:00 |
|
tiger_zhou
|
6ff6eeffec
|
理论试题管理代码调整
|
2022-09-23 17:31:22 +08:00 |
|
weizhihong
|
c1f81a6fdf
|
【创建仿真时，项目为空默认处理；调度台设备为空处理；】
|
2022-09-23 17:14:39 +08:00 |
|
weizhihong
|
b666ac0bd7
|
【将項目前端配置与后端配置分离，处理重新处理表结构】
|
2022-09-23 16:48:48 +08:00 |
|
tiger_zhou
|
1ecd05be32
|
理论试题管理代码调整
|
2022-09-23 16:19:21 +08:00 |
|
|
|
6a53fbd5a7
|
PA增加定时播放功能、PIS发布信息修改站台PIS文字
|
2022-09-23 15:13:31 +08:00 |
|
weizhihong
|
5524b4c043
|
【增加获取项目前端配置接口】
|
2022-09-23 14:01:26 +08:00 |
|
weizhihong
|
76f86bcc96
|
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/competition/question/QuestionBankController2.java
|
2022-09-23 13:28:36 +08:00 |
|
weizhihong
|
f482aa32aa
|
【项目配置信息修改，枚举相关修改为string】
|
2022-09-23 13:25:15 +08:00 |
|
tiger_zhou
|
0b8a0ca0d6
|
理论试题管理代码调整
|
2022-09-23 13:02:06 +08:00 |
|
tiger_zhou
|
f8efdbc965
|
理论试题管理代码调整
|
2022-09-22 17:43:12 +08:00 |
|
tiger_zhou
|
a6ccd7dc81
|
理论试题管理代码调整
|
2022-09-22 17:27:05 +08:00 |
|
tiger_zhou
|
8536894aaa
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-22 17:26:35 +08:00 |
|
xzb
|
4d04c643ae
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-22 17:25:29 +08:00 |
|
xzb
|
979ea72d52
|
paper
|
2022-09-22 17:25:12 +08:00 |
|
weizhihong
|
23f2494de7
|
【项目配置相关、实训操作参数对比】
|
2022-09-22 16:55:51 +08:00 |
|
tiger_zhou
|
48afcf791e
|
理论试题管理代码调整
|
2022-09-22 16:24:39 +08:00 |
|
tiger_zhou
|
8831a0515f
|
理论试题管理代码调整
|
2022-09-22 14:38:01 +08:00 |
|
tiger_zhou
|
2d2d0fc459
|
理论试题管理
|
2022-09-22 14:23:21 +08:00 |
|
weizhihong
|
3a2803bb5e
|
【项目配置管理接口】
|
2022-09-22 13:36:03 +08:00 |
|
xzb
|
e854308724
|
调度命令
|
2022-09-22 10:13:55 +08:00 |
|
xzb
|
c68142f798
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-21 17:39:31 +08:00 |
|
xzb
|
93f871da54
|
调度命令
|
2022-09-21 17:38:21 +08:00 |
|
tiger_zhou
|
226d5d62b1
|
理论试题管理
|
2022-09-21 17:26:58 +08:00 |
|
|
|
6d45e197c2
|
修改列车信息中的终点站更新逻辑；修改站台PIS的时间计算逻辑
|
2022-09-21 13:35:19 +08:00 |
|
|
|
b57f1977b0
|
修改PIS/PA ws消息发送bug
|
2022-09-20 18:17:09 +08:00 |
|
|
|
905eda42c4
|
修改小bug
|
2022-09-20 18:17:03 +08:00 |
|
|
|
c76b9cc104
|
修改PIS/PA ws消息发送bug
|
2022-09-20 18:15:02 +08:00 |
|
|
|
d819e8a190
|
修改小bug
|
2022-09-20 17:25:23 +08:00 |
|
tiger_zhou
|
542c7da98e
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-09-20 16:53:21 +08:00 |
|
tiger_zhou
|
9b5c3b2dbc
|
Merge branch 'test' into test-training2-zhouyin
# Conflicts:
# src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/NewAtsTrainLoadService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/TrainPositionService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/SimulationLifeCycleServiceImpl.java
# src/main/java/club/joylink/rtss/vo/client/factory/SocketMessageFactory.java
# src/main/java/club/joylink/rtss/vo/ws/TrainPosition.java
# src/main/java/club/joylink/rtss/websocket/WebSocketController.java
# src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
# src/main/java/club/joylink/rtss/websocket/client/StompClientManager.java
|
2022-09-20 16:48:27 +08:00 |
|
tiger_zhou
|
de0b411191
|
1
|
2022-09-20 16:41:34 +08:00 |
|
|
|
ffd71ef83c
|
PA/PIS功能
|
2022-09-20 16:29:01 +08:00 |
|
xzb
|
8b7f9ef947
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-19 18:09:44 +08:00 |
|
xzb
|
7f8b0394b6
|
调度命令
|
2022-09-19 18:09:26 +08:00 |
|
weizhihong
|
5a640d7b98
|
【当全部清除后，再次添加步骤时问题】
|
2022-09-19 15:49:07 +08:00 |
|
weizhihong
|
722532cf0f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-19 15:08:27 +08:00 |
|
weizhihong
|
da0d5d6953
|
【保存步骤时，处理已经删除的打分规则】
|
2022-09-19 15:08:08 +08:00 |
|
xzb
|
4015a5f2fd
|
通过地图逻辑数据存储调度台数据
|
2022-09-19 15:05:58 +08:00 |
|
|
|
a0b83e8749
|
Merge remote-tracking branch 'origin/test' into test
|
2022-09-19 09:16:00 +08:00 |
|
xzb
|
9c14994eec
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-16 17:03:25 +08:00 |
|
xzb
|
bb5fabbec0
|
调度命令-转发
|
2022-09-16 17:03:05 +08:00 |
|
tiger_zhou
|
37948d68fe
|
武汉8号线列车位置显示功能调整
|
2022-09-16 16:24:24 +08:00 |
|
tiger_zhou
|
361675fb9f
|
武汉8号线列车位置显示功能调整
|
2022-09-16 16:10:44 +08:00 |
|
weizhihong
|
7bc5c11e5d
|
【删除实训仿真暂停操作】
|
2022-09-16 15:57:36 +08:00 |
|
weizhihong
|
8d3d31c94f
|
【车站实训模式说明修改】
|
2022-09-16 13:51:13 +08:00 |
|
xzb
|
1741d5ed12
|
实训草稿发布优化
|
2022-09-16 10:24:47 +08:00 |
|
xzb
|
6293a2a54b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-15 17:40:43 +08:00 |
|
xzb
|
1e9d953c3b
|
调度命令-调度台调度
|
2022-09-15 17:40:28 +08:00 |
|
weizhihong
|
cc023f94fd
|
【实训结束时，获取分值bug】
|
2022-09-15 16:47:10 +08:00 |
|
xzb
|
07a476bcfe
|
调度命令-调度台调度
|
2022-09-15 16:13:37 +08:00 |
|
tiger_zhou
|
1bcc1063ed
|
武汉8号线列车位置显示功能调整
|
2022-09-15 15:47:10 +08:00 |
|
xzb
|
7b912b5027
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-15 15:13:15 +08:00 |
|
xzb
|
a5b0fde841
|
调度命令-地图添加调度台
|
2022-09-15 15:12:59 +08:00 |
|
weizhihong
|
d544413f50
|
【实训操作保存时，生成操作ID】
|
2022-09-15 15:10:00 +08:00 |
|
xzb
|
f0bbb332c0
|
调度命令-地图添加调度台；实训添加发布轨迹追踪；
|
2022-09-15 14:59:47 +08:00 |
|
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 |
|
tiger_zhou
|
6741341601
|
武汉8号线列车位置显示功能调整
|
2022-09-15 13:48:05 +08:00 |
|
|
|
a3f29142f8
|
重置密码、找回密码功能
|
2022-09-15 13:23:33 +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 |
|
tiger_zhou
|
b863f2c87d
|
武汉8号线列车位置支持订阅返回消息，用户名密码的支持
|
2022-09-14 14:41:05 +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 |
|
|
|
144f6fef4a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-09-13 15:39:31 +08:00 |
|
|
|
3f7cb3645e
|
WS路径统一
|
2022-09-13 15:39:03 +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 |
|
tiger_zhou
|
53c6aac14c
|
武汉8号线列车位置显示功能调整
|
2022-09-09 16:42:54 +08:00 |
|
tiger_zhou
|
114be10e1b
|
武汉8号线列车位置显示功能调整
|
2022-09-09 16:16:25 +08:00 |
|
weizhihong
|
952e8ea345
|
【调整实训提示消息结构】
|
2022-09-09 15:15:27 +08:00 |
|
tiger_zhou
|
b425e5b36b
|
武汉8号线列车位置显示功能调整
|
2022-09-09 13:45:04 +08:00 |
|
tiger_zhou
|
ed45ab1c71
|
Merge branch 'test-zhouyin' into test
|
2022-09-09 13:40:42 +08:00 |
|
tiger_zhou
|
e24bfbcafe
|
武汉8号线列车位置显示功能调整
|
2022-09-09 13:40:25 +08:00 |
|
tiger_zhou
|
88c0ac23b0
|
Merge branch 'test-zhouyin' into test
|
2022-09-09 13:33:49 +08:00 |
|
tiger_zhou
|
c6c26ff40a
|
武汉8号线列车位置显示功能调整
|
2022-09-09 13:33:29 +08:00 |
|
|
|
d57a288ae0
|
进路首区段占用时联锁等级只能到引导级
|
2022-09-09 11:03:33 +08:00 |
|
tiger_zhou
|
37063e02ed
|
Merge remote-tracking branch 'origin/test' into test
|
2022-09-09 10:17:58 +08:00 |
|
tiger_zhou
|
4d0205f578
|
同步站细功能
|
2022-09-09 10:17:26 +08:00 |
|
weizhihong
|
f2ab803993
|
【刷新仿真时，会话信息转VO问题出错】
|
2022-09-09 10:15:37 +08:00 |
|
weizhihong
|
d815c99f0f
|
【大铁实训语音校验逻辑修改】
|
2022-09-09 10:07:09 +08:00 |
|
|
|
b75dbe6b3d
|
Merge remote-tracking branch 'origin/master-huawei' into test
|
2022-09-09 09:20:29 +08:00 |
|
xzb
|
81698a389f
|
调度命令
|
2022-09-09 09:03:30 +08:00 |
|
tiger_zhou
|
eaf30840a1
|
武汉8号线列车位置显示功能调整
|
2022-09-09 08:51:33 +08:00 |
|
|
|
52625cce1d
|
红河财经现场部署
|
2022-09-08 23:23:10 +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 |
|
tiger_zhou
|
5d66e5ae09
|
武汉8号线列车位置显示功能调整
|
2022-09-08 18:04:05 +08:00 |
|
weizhihong
|
04b7a35a6b
|
【步骤为空时，保存出错】
|
2022-09-08 17:32:48 +08:00 |
|
tiger_zhou
|
a13eaceeee
|
武汉8号线列车位置显示功能调整
|
2022-09-08 17:09:31 +08:00 |
|
tiger_zhou
|
1363355e8f
|
武汉8号线列车位置显示功能调整，调整菜单
|
2022-09-08 15:36:26 +08:00 |
|
xzb
|
8ff182e6e7
|
调度命令
|
2022-09-08 15:15:24 +08:00 |
|
xzb
|
c9538a39be
|
调度命令
|
2022-09-08 15:14:23 +08:00 |
|
tiger_zhou
|
45ac716355
|
武汉8号线列车位置显示功能调整
|
2022-09-08 13:44:55 +08:00 |
|
tiger_zhou
|
9565b2f31a
|
武汉8号线列车位置显示功能调整
|
2022-09-08 13:13:59 +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 |
|
tiger_zhou
|
0194749610
|
武汉8号线列车位置显示功能
|
2022-09-07 18:35:17 +08:00 |
|
tiger_zhou
|
d3aea82953
|
武汉8号线列车位置显示功能
|
2022-09-07 18:30:19 +08:00 |
|
tiger_zhou
|
5916cd765e
|
武汉8号线列车位置显示功能
|
2022-09-07 18:12:32 +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
|
4df36e6ccf
|
武汉8号线列车位置显示功能
|
2022-09-07 17:17:35 +08:00 |
|
tiger_zhou
|
67be44750a
|
武汉8号线列车位置显示功能
|
2022-09-07 17:15:54 +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 |
|
weizhihong
|
eb84b0cf15
|
【实训指标计算】
|
2022-09-06 17:10:09 +08:00 |
|
xzb
|
e9cc4510b4
|
调度命令
|
2022-09-06 16:59:28 +08:00 |
|
xzb
|
8ac5de29eb
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-05 18:19:55 +08:00 |
|
xzb
|
335590cd0c
|
调度命令
|
2022-09-05 18:19:34 +08:00 |
|
weizhihong
|
6a76691b2c
|
【实训消息修改为事件触发、增加指标计算流程事件】
|
2022-09-05 16:53:28 +08:00 |
|
tiger_zhou
|
786e0e58a9
|
车务管理终端功能代码调整
|
2022-09-05 15:32:16 +08:00 |
|
tiger_zhou
|
67938c6597
|
武汉8号线区段添加公里标属性
|
2022-09-05 15:13:37 +08:00 |
|
xzb
|
a20441b1ec
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-05 13:06:43 +08:00 |
|
xzb
|
9d0677cf51
|
实训草稿发布重命名
|
2022-09-05 13:06:22 +08:00 |
|
tiger_zhou
|
fbdbd33e49
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-05 12:27:55 +08:00 |
|
tiger_zhou
|
5c4dc62ac8
|
车务管理终端功能代码调整
|
2022-09-05 12:25:30 +08:00 |
|
xzb
|
a1a6d69d8f
|
大铁调度命令-select
|
2022-09-05 11:18:01 +08:00 |
|
xzb
|
43898ba1f2
|
大铁调度命令-receiversManager
|
2022-09-05 09:24:12 +08:00 |
|
xzb
|
9c3b6487cd
|
大铁调度命令
|
2022-09-02 18:05:08 +08:00 |
|
xzb
|
71d735a7cb
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-02 18:04:45 +08:00 |
|
weizhihong
|
b0ed14c484
|
【区段故障类型反序列化问题】
|
2022-09-02 17:29:03 +08:00 |
|
weizhihong
|
84955a996b
|
【草稿同名检验、发布同名检验】
|
2022-09-02 16:48:43 +08:00 |
|
weizhihong
|
2486637175
|
【个人草稿添加时重名判断】
|
2022-09-02 15:59:05 +08:00 |
|
weizhihong
|
8d195c5367
|
【前端重复点击时、后端报错问题】
|
2022-09-02 11:10:22 +08:00 |
|
tiger_zhou
|
7411b52328
|
Merge branch 'test-training2-zhouyin' into test-training2
|
2022-09-02 09:31:59 +08:00 |
|
tiger_zhou
|
98742d923a
|
车务管理终端功能代码调整
|
2022-09-02 09:31:19 +08:00 |
|
weizhihong
|
8e6060eaa2
|
【优化实训加载速度，结束后直接获取下一步】
|
2022-09-01 18:39:33 +08:00 |
|
xzb
|
6922e2630e
|
大铁调度命令数据流转实现
|
2022-09-01 18:09:38 +08:00 |
|
tiger_zhou
|
5e4d85443d
|
车务管理终端功能代码调整
|
2022-09-01 18:03:06 +08:00 |
|
tiger_zhou
|
efb101d281
|
车务管理终端功能代码调整
|
2022-09-01 17:31:38 +08:00 |
|
tiger_zhou
|
9d1677128f
|
Merge branch 'test-zhouyin' into test-training2-zhouyin
|
2022-09-01 14:00:03 +08:00 |
|
tiger_zhou
|
e646435e04
|
车务管理终端功能代码调整及计划支持股道，出入口与站细不一致的支持
|
2022-09-01 13:57:43 +08:00 |
|
xzb
|
e643b7df9f
|
大铁调度命令数据流转实现
|
2022-09-01 10:39:49 +08:00 |
|
weizhihong
|
11095aa217
|
【保存实训最后运行状态】
|
2022-08-31 17:10:32 +08:00 |
|
weizhihong
|
da9355b9a7
|
【优化实训运行、增加步骤定位信息字段】
|
2022-08-31 16:53:34 +08:00 |
|
weizhihong
|
d55d038c06
|
【结束实训返回分数、保存步骤时保存人员信息、重新开始时重置仿真状态】
|
2022-08-31 13:34:03 +08:00 |
|
weizhihong
|
ea3667a80d
|
【再次加载实训没有背景BUG、判断完成条件BUG】
|
2022-08-31 11:03:20 +08:00 |
|
weizhihong
|
4ce9d4b885
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/services/training2/Training2Service.java
|
2022-08-31 10:49:30 +08:00 |
|
weizhihong
|
cc4463ef5f
|
【修改步骤、操作运行状态】
|
2022-08-31 10:44:29 +08:00 |
|
|
|
ff0827c811
|
实训评分规则数据及逻辑
|
2022-08-30 17:41:21 +08:00 |
|
xzb
|
bed5a7aa69
|
Training2DraftService优化
|
2022-08-30 14:31:20 +08:00 |
|
xzb
|
9a3cc981de
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-30 14:22:42 +08:00 |
|
xzb
|
a2d5c6b007
|
Training2DraftService优化
|
2022-08-30 14:21:35 +08:00 |
|
weizhihong
|
4ddf7b99d5
|
【增加实训无背景加载判断】
|
2022-08-30 14:21:11 +08:00 |
|
weizhihong
|
15a5cdf6c9
|
【实训再开始时，重新加载背景】
|
2022-08-30 13:40:35 +08:00 |
|
weizhihong
|
db4a3f10c8
|
【结束实训时，不存在实训BUG】
|
2022-08-30 13:18:19 +08:00 |
|
weizhihong
|
9e42a4ce68
|
Merge branch 'test' into test-training2
|
2022-08-29 18:15:02 +08:00 |
|
xzb
|
75f7d95285
|
Station 实训相关注解
|
2022-08-29 16:52:17 +08:00 |
|
xzb
|
8aaf7c6d34
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-29 15:57:24 +08:00 |
|
xzb
|
3221f12f37
|
ExpConditionMaterialSrcAnno 添加属性name
|
2022-08-29 15:57:04 +08:00 |
|
weizhihong
|
0f0cf18e13
|
【操作中增加运行状态】
|
2022-08-29 14:42:49 +08:00 |
|
weizhihong
|
a3ed402eba
|
【增加步骤执行状态】
|
2022-08-29 13:38:52 +08:00 |
|
tiger_zhou
|
a45f64d71c
|
车务管理终端功能代码调整
|
2022-08-29 13:34:48 +08:00 |
|
weizhihong
|
90d4acbdb5
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-29 10:37:21 +08:00 |
|
weizhihong
|
5b9423cf8e
|
【前端调用完成步骤中的操作】
|
2022-08-29 10:37:04 +08:00 |
|
|
|
68726b9939
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-29 10:32:41 +08:00 |
|
|
|
3b486e9016
|
实训评分规则数据结构和使用逻辑修改
|
2022-08-29 10:32:29 +08:00 |
|
weizhihong
|
8c3293ae68
|
【保存步骤时保存背景】
|
2022-08-29 10:29:56 +08:00 |
|
weizhihong
|
7a58ec24ab
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-29 10:23:51 +08:00 |
|
weizhihong
|
1e15bb8ee3
|
【修改步骤并保存仿真背景】
|
2022-08-29 10:23:45 +08:00 |
|
xzb
|
f6ba06871b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-29 10:22:23 +08:00 |
|
xzb
|
1c58b60417
|
实训添加字段final_scenes_json
|
2022-08-29 10:22:05 +08:00 |
|
tiger_zhou
|
feb4b1532c
|
车务管理终端功能代码调整
|
2022-08-29 09:56:18 +08:00 |
|
weizhihong
|
12dc16c0b5
|
【修改实训加载BUG】
|
2022-08-29 09:37:59 +08:00 |
|
|
|
a94b1ac3b0
|
实训评分规则使用逻辑
|
2022-08-26 17:10:32 +08:00 |
|
weizhihong
|
7669f34480
|
【修改客户端属性名称】
|
2022-08-26 15:48:53 +08:00 |
|
weizhihong
|
b1ab8e8bef
|
【客户端操作参数类型修改】
|
2022-08-26 13:57:04 +08:00 |
|
xzb
|
410deb28e3
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-26 11:30:37 +08:00 |
|
xzb
|
b0be1b4293
|
实训相关接口请求字段添加校验
|
2022-08-26 11:30:25 +08:00 |
|
weizhihong
|
46668187d1
|
【增加客户端操作参数】
|
2022-08-26 10:59:10 +08:00 |
|
weizhihong
|
ccea35cbc4
|
【无背景时加载BUG】
|
2022-08-26 10:14:34 +08:00 |
|
weizhihong
|
88fe625fc9
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-08-26 10:12:45 +08:00 |
|
weizhihong
|
e8df5e8ee6
|
【编辑车站条件属性注解】
|
2022-08-26 10:12:39 +08:00 |
|
|
|
eb1e3f35a1
|
实训评分规则定义
|
2022-08-26 10:00:01 +08:00 |
|
|
|
5349361450
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-26 09:51:46 +08:00 |
|
xzb
|
09699c5c09
|
Section 添加ExpConditionMaterialAnno
|
2022-08-26 09:42:16 +08:00 |
|
xzb
|
590aa51529
|
Route 添加ExpConditionMaterialAnno
|
2022-08-26 09:36:44 +08:00 |
|
xzb
|
1f9875b7fb
|
ExpConditionMaterialAnno完善注释
|
2022-08-26 09:17:08 +08:00 |
|
|
|
f06bfa9e4e
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Station.java
|
2022-08-25 17:50:45 +08:00 |
|
|
|
ba1dfb77a2
|
Merge remote-tracking branch 'origin/test' into test-training2
# Conflicts:
# pom.xml
|
2022-08-25 17:35:15 +08:00 |
|
xzb
|
622ac0338e
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-25 17:03:04 +08:00 |
|
xzb
|
a9bf1832bf
|
实训草稿条件表达式中“条件”的获取优化
|
2022-08-25 17:02:48 +08:00 |
|
weizhihong
|
de3c493c42
|
【实训属性条件注解增加】
|
2022-08-25 16:54:57 +08:00 |
|
|
|
308c9c1754
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-25 16:51:10 +08:00 |
|
|
|
fc1f4c5511
|
修改调车进路生成逻辑；增加长调车进路生成逻辑
|
2022-08-25 16:50:56 +08:00 |
|
tiger_zhou
|
d541f85aee
|
车务管理终端功能代码调整
|
2022-08-25 16:24:01 +08:00 |
|
xzb
|
653bf208b0
|
实训草稿条件表达式中“条件”的获取优化
|
2022-08-25 16:21:52 +08:00 |
|
xzb
|
02468a10b0
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-08-25 15:52:29 +08:00 |
|
xzb
|
aaf852db59
|
实训草稿条件表达式中“条件”的获取
|
2022-08-25 15:52:00 +08:00 |
|
tiger_zhou
|
9d1a8c2fa5
|
车务管理终端功能代码调整及径路更新，提交功能
|
2022-08-25 15:26:16 +08:00 |
|
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 |
|
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 |
|
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 |
|
|
|
e3fc0efeaf
|
新实训数据结构修改中
|
2022-08-12 11:04:00 +08:00 |
|
|
|
cc2c667e40
|
修改大铁通过进路生成的信号显示
|
2022-08-12 11:00:37 +08:00 |
|
|
|
782788e0e9
|
修改大铁通过进路生成的信号显示
|
2022-08-12 10:58:35 +08:00 |
|
|
|
0580471208
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 10:40:59 +08:00 |
|
|
|
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 |
|
|
|
6170ebc3f5
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-12 09:52:23 +08:00 |
|
|
|
8dcfce7354
|
增加<故障通知>信号按钮类型
|
2022-08-12 09:52:08 +08:00 |
|
|
|
7b9fba8412
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-12 09:50:28 +08:00 |
|
|
|
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 |
|
|
|
6a194ce09c
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-08-11 11:27:38 +08:00 |
|
|
|
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 |
|
|
|
0c824032c4
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-08-10 15:21:36 +08:00 |
|
|
|
26c5be81b0
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-10 15:21:07 +08:00 |
|
|
|
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 |
|
|
|
fb68e92e4d
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-08-10 10:03:44 +08:00 |
|
|
|
f42923f100
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:52:50 +08:00 |
|
|
|
1f3b7c65d2
|
修改大铁引导进路筛选逻辑
|
2022-08-10 09:20:51 +08:00 |
|
|
|
a90973fa2c
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-09 17:28:02 +08:00 |
|
tiger_zhou
|
50bb136082
|
Merge branch 'test-zhouyin' into test-training2
|
2022-08-09 17:21:32 +08:00 |
|
tiger_zhou
|
8131728783
|
修改操作类型的属性调整
|
2022-08-09 17:20:00 +08:00 |
|
|
|
f0ca9e9c77
|
Revert "Revert "增加大铁发车进路信号受离去区段占用影响逻辑与数据""
This reverts commit 4654dc4b71.
|
2022-08-09 17:10:00 +08:00 |
|
|
|
6ba11083eb
|
修改新实训数据结构
|
2022-08-09 13:49:16 +08:00 |
|
|
|
17fbc6ae51
|
定义新实训数据结构
|
2022-08-09 10:27:22 +08:00 |
|
tiger_zhou
|
71dadb5468
|
修改操作类型的属性调整
|
2022-08-09 10:00:36 +08:00 |
|
tiger_zhou
|
c89a2ba5e4
|
修改操作类型的属性
|
2022-08-09 09:46:20 +08:00 |
|
weizhihong
|
b2d7404f96
|
【行驶至操作】
|
2022-08-05 17:21:17 +08:00 |
|
weizhihong
|
162eedbcfd
|
【指令修改为操作】
|
2022-08-05 16:56:13 +08:00 |
|
|
|
b892606e76
|
修改local数据库配置
|
2022-08-05 16:13:26 +08:00 |
|
weizhihong
|
26f96fed02
|
【剧本信息保存实体修改】
|
2022-08-04 16:49:51 +08:00 |
|
weizhihong
|
bf22dac447
|
【保存剧本时，保存进路序列、占线板、路票、红色通行证、绿色通行证】
【股道区段用sectionCode】
【剧本会话动作删除】
|
2022-08-04 11:28:20 +08:00 |
|
|
|
4654dc4b71
|
Revert "增加大铁发车进路信号受离去区段占用影响逻辑与数据"
This reverts commit d294dfafe8.
|
2022-08-04 10:11:48 +08:00 |
|
|
|
7d9d14086a
|
修改生成大铁通过进路的逻辑
|
2022-08-03 16:38:23 +08:00 |
|
|
|
d294dfafe8
|
增加大铁发车进路信号受离去区段占用影响逻辑与数据
|
2022-08-03 13:50:25 +08:00 |
|
|
|
1f3173f393
|
会话接通消息中增加会话创建人id
|
2022-08-03 11:10:02 +08:00 |
|
xiazengbin
|
adace3d7e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-02 14:44:24 +08:00 |
|
xiazengbin
|
03b6cc1b20
|
添加段长
|
2022-08-02 14:44:14 +08:00 |
|
|
|
b9701a13ce
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-02 13:05:26 +08:00 |
|
|
|
4dcf64d9ff
|
大铁引导总锁失表道岔，可办理引导进路
|
2022-08-02 13:05:16 +08:00 |
|
weizhihong
|
97a8e522e7
|
【修改系统时间BUG修改】
|
2022-08-02 10:34:09 +08:00 |
|
weizhihong
|
c0dd13e3dd
|
【修改进路信息时，保存进路类型】
|
2022-08-02 09:42:59 +08:00 |
|
weizhihong
|
25a4c8911f
|
【接发箭头占用逻辑注释】
|
2022-08-01 17:27:27 +08:00 |
|
weizhihong
|
b159fb3ce2
|
【联锁接发车灯状态逻辑】
|
2022-08-01 17:19:40 +08:00 |
|
xiazengbin
|
b471ba466b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-01 17:12:40 +08:00 |
|
xiazengbin
|
c22c5b2691
|
fault offline
|
2022-08-01 17:12:32 +08:00 |
|
weizhihong
|
c1c734a17e
|
【进路类型保存】【站台轨分路不良状态BUG处理】
|
2022-08-01 16:42:41 +08:00 |
|
|
|
889e415ddd
|
修改大铁通过进路生成逻辑
|
2022-08-01 16:04:18 +08:00 |
|
|
|
9a757c4a7f
|
添加哈盈达大铁项目；机器人驾驶不再重复切手动位
|
2022-08-01 15:20:56 +08:00 |
|
|
|
33c89b1792
|
引导总锁状态不再禁止引导进路办理
|
2022-08-01 14:31:47 +08:00 |
|
xiazengbin
|
9ec80abc27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-08-01 13:41:29 +08:00 |
|
xiazengbin
|
0c71476026
|
脱线停车
|
2022-08-01 13:41:19 +08:00 |
|
|
|
45a4d6f5eb
|
修改bug
|
2022-08-01 13:19:21 +08:00 |
|
|
|
c56fbcf757
|
Merge remote-tracking branch 'origin/test' into test
|
2022-08-01 13:09:56 +08:00 |
|
|
|
156d876c73
|
修改驾驶操作限速不生效bug
|
2022-08-01 13:09:23 +08:00 |
|
xiazengbin
|
9b2411ed24
|
脱线故障停车
|
2022-08-01 13:02:25 +08:00 |
|
xiazengbin
|
ce2b3a8d7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test-xzb
|
2022-07-29 18:04:24 +08:00 |
|
xiazengbin
|
e66a0c204a
|
列车脱线
|
2022-07-29 17:49:29 +08:00 |
|
|
|
76652f4a4f
|
剧本不记录除驾驶、停车、换端外的所有列车驾驶相关操作
|
2022-07-29 16:51:41 +08:00 |
|
|
|
c862318813
|
自动驾驶忽略所有调车信号机
|
2022-07-29 15:29:57 +08:00 |
|
|
|
c98ff6035a
|
地图数据的表示状态增加switchCodes字段
|
2022-07-29 15:25:30 +08:00 |
|
weizhihong
|
2b2c251854
|
【区段占用，结束会话操作修改】
|
2022-07-29 11:13:24 +08:00 |
|
weizhihong
|
03760bffd3
|
【剧本会话参与者先挂电话后，会话不能结束BUG】
|
2022-07-28 17:28:24 +08:00 |
|
tiger_zhou
|
e540f54392
|
剧本司机变更不返回记录到剧本中调整
|
2022-07-28 14:48:27 +08:00 |
|
weizhihong
|
a4cfc79a30
|
【运行方向接发车灯不占用标识】
|
2022-07-28 13:34:06 +08:00 |
|
tiger_zhou
|
3b9d822f80
|
剧本司机变更不返回记录到剧本中
|
2022-07-28 11:55:31 +08:00 |
|
weizhihong
|
8e5a49628d
|
【如果会话中全部为机器人，则直接完成】
|
2022-07-28 10:55:09 +08:00 |
|
weizhihong
|
84b591ae9d
|
【在连续动作是机器人的情况下，如果音频播放完成，则动作立即结束】
|
2022-07-28 10:16:38 +08:00 |
|
|
|
38828b23e7
|
机器人驾驶、停车操作小改动
|
2022-07-27 23:02:40 +08:00 |
|
|
|
7075deb417
|
驾驶操作小改动
|
2022-07-27 22:43:19 +08:00 |
|
|
|
4eaa82ff7a
|
机器人驾驶和停车功能完善
|
2022-07-27 22:30:35 +08:00 |
|
|
|
76f10fd230
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-27 18:59:26 +08:00 |
|
|
|
280f4edd78
|
驾驶和停车操作
|
2022-07-27 18:58:17 +08:00 |
|
weizhihong
|
80301e670d
|
【移动运行方向至CI联锁文件夹】【移动行车日志至CTC文件夹】【增加进路是否调车进路属性】
|
2022-07-27 18:42:41 +08:00 |
|
weizhihong
|
06e8e2d5ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-27 15:28:38 +08:00 |
|
weizhihong
|
dd770b496b
|
【修改剧本执行时，无参数空指针BUG】
|
2022-07-27 15:28:28 +08:00 |
|
|
|
eee106a1c9
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-27 14:55:04 +08:00 |
|
|
|
7d53a5b138
|
修改剧本语音判断匹配率
|
2022-07-27 14:54:45 +08:00 |
|
weizhihong
|
fe7c8c324f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-27 14:49:42 +08:00 |
|
weizhihong
|
24517a1895
|
【行车日志反序列化BUG】
|
2022-07-27 14:49:26 +08:00 |
|
|
|
9ca26dcb00
|
百度语音接口错误码处理
|
2022-07-27 13:49:15 +08:00 |
|
xiazengbin
|
a7a047390d
|
添加配置：对信号机封锁操作，是否影响信号显示
|
2022-07-27 10:36:16 +08:00 |
|
|
|
266463eb4c
|
道岔钩锁操作联动
|
2022-07-26 15:28:52 +08:00 |
|
|
|
fc353a5fad
|
取消剧本删除动作条件
|
2022-07-26 15:08:24 +08:00 |
|
|
|
8471bd9d6e
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-26 13:22:28 +08:00 |
|
|
|
f1fc7012d9
|
增加线路配置[区故解是否只能解锁故障锁闭区段]；修改列车托管操作参数和逻辑
|
2022-07-26 13:22:10 +08:00 |
|
weizhihong
|
65aa127296
|
行车日志列车上线bug
|
2022-07-26 12:56:52 +08:00 |
|
weizhihong
|
2d9e5f2cea
|
【状态修改】
|
2022-07-26 12:24:56 +08:00 |
|
weizhihong
|
6ddc46f09d
|
【还原非通讯车占用逻辑】【行车日志添加列车时，判断是否已经上线，上线的不添加】
|
2022-07-26 12:23:22 +08:00 |
|
weizhihong
|
608631ff41
|
【设备管理员加车站属性】
|
2022-07-26 10:59:00 +08:00 |
|
weizhihong
|
6e60f7c5af
|
【修改加载剧本无行车日志BUG】
|
2022-07-26 10:02:43 +08:00 |
|
weizhihong
|
f6514cb7f1
|
角色名称置空
|
2022-07-26 09:42:52 +08:00 |
|
weizhihong
|
e3532ea8b4
|
【设备管理员】
|
2022-07-26 09:35:20 +08:00 |
|
|
|
15d7ebd7f1
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-25 18:09:08 +08:00 |
|
|
|
d6ff1c12f5
|
增加修改仿真时间接口；增加故障锁闭设置与取消
|
2022-07-25 18:08:54 +08:00 |
|
weizhihong
|
3404870ec7
|
【增加大铁角色默认列表】
|
2022-07-25 18:04:58 +08:00 |
|
weizhihong
|
808a87edb7
|
增加角色【站长、信号员、客运员、扳道员、引导员、工务工】
|
2022-07-25 16:30:19 +08:00 |
|
weizhihong
|
75f5c2b592
|
【剧本反序列化BUG】
|
2022-07-25 15:24:06 +08:00 |
|
weizhihong
|
ee5be65ad5
|
【修复反序列化CTC信息BUG】
|
2022-07-25 13:54:17 +08:00 |
|
weizhihong
|
8afd9b286f
|
【调度运行计划非空判断】
|
2022-07-25 09:29:21 +08:00 |
|
weizhihong
|
5fdcfc5fd7
|
【CTC信息剧本没有反序列化非空判断】
|
2022-07-25 09:25:50 +08:00 |
|
weizhihong
|
7ae2e6fa6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-22 19:46:45 +08:00 |
|
weizhihong
|
dcec7e339c
|
【剧本中出入口状态、行车日志信息保存】
|
2022-07-22 19:46:39 +08:00 |
|
|
|
073ad21844
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-22 16:31:34 +08:00 |
|
|
|
66995d5606
|
自动驾驶逻辑基于实体设备
|
2022-07-22 16:30:45 +08:00 |
|
|
|
66d21c1778
|
大铁增加点灯灭灯操作；大铁不执行根据信号机模式自动切换点灯灭灯状态逻辑；修改部分列车运行指令的寻路逻辑；修改停车指令结束条件；修改大铁自动驾驶寻路逻辑
|
2022-07-22 16:20:52 +08:00 |
|
weizhihong
|
0e3939b8f6
|
【闭塞后发车，列车占用显示异常解决】
|
2022-07-22 11:22:20 +08:00 |
|
|
|
ba0c05eb64
|
大铁进路人解进路去掉需要接近锁闭的条件
|
2022-07-22 09:49:35 +08:00 |
|
|
|
ad797fe758
|
大铁无计划车停站30s
|
2022-07-22 09:13:01 +08:00 |
|
|
|
5f4c20f20a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-21 17:46:55 +08:00 |
|
|
|
afbb57d1a8
|
增加大铁列车自动驾驶逻辑；将大铁不需要的仿真任务去除
|
2022-07-21 17:46:47 +08:00 |
|
weizhihong
|
ad904b95c9
|
【保存剧本时，栈溢出问题解决】
|
2022-07-21 17:36:20 +08:00 |
|
weizhihong
|
8e70759161
|
【大铁行驶过程中，检查是否还可以向前行驶】
|
2022-07-21 09:48:26 +08:00 |
|
|
|
8dcba7a311
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-20 14:10:52 +08:00 |
|
|
|
53c86eaba4
|
修改大铁进路自动触发逻辑
|
2022-07-20 14:07:48 +08:00 |
|
weizhihong
|
15e5b28c68
|
【道岔分路不良设置】
【删除多余属性】
|
2022-07-20 14:04:26 +08:00 |
|
weizhihong
|
43036bc6a5
|
【修改加车逻辑，删除多余代码】
|
2022-07-20 09:39:12 +08:00 |
|
weizhihong
|
21f02c218b
|
【行车日志变化后，回调占线板方法】
|
2022-07-19 17:12:12 +08:00 |
|
|
|
8b02960200
|
修改进路序列和股道视图以车站为单位重新生成
|
2022-07-19 17:01:10 +08:00 |
|
|
|
9d3dddb099
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-19 16:42:54 +08:00 |
|
|
|
e8a187d4bd
|
增加获取百度token接口；标记删除的阶段计划对应的进路序列和股道视图删除
|
2022-07-19 16:40:27 +08:00 |
|
weizhihong
|
18a18c78a7
|
【自动计划时间前5分钟增加列车】
|
2022-07-19 14:03:13 +08:00 |
|
weizhihong
|
bab45540de
|
【接发车口方向类型修改为字符串】
|
2022-07-19 13:40:05 +08:00 |
|
weizhihong
|
6440a36356
|
【始发计划下发后，自动接车】
|
2022-07-19 13:28:20 +08:00 |
|
|
|
2aefb71fed
|
修改大铁调车进路生成逻辑
|
2022-07-19 10:45:52 +08:00 |
|
weizhihong
|
84daf2379f
|
【去除运行日志初始消息，改为接口拉取】
|
2022-07-18 18:19:24 +08:00 |
|
|
|
987cb20325
|
修改地图功能配置的默认值
|
2022-07-18 16:40:41 +08:00 |
|
|
|
c2d04f684c
|
大铁：非常站控取消进路的自动触发逻辑；地图绘制增加配置，可配置线路是否有CTC/TDCS系统
|
2022-07-18 16:34:21 +08:00 |
|
weizhihong
|
32ae4fc71b
|
【CTC发送初始化消息去除synchronized关键字】
|
2022-07-18 16:00:11 +08:00 |
|
weizhihong
|
edb9f46753
|
【行车日志变化后回调占线板】
|
2022-07-18 15:01:14 +08:00 |
|
weizhihong
|
953e1fa6a3
|
注释
|
2022-07-18 14:23:43 +08:00 |
|
weizhihong
|
9e2022addd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-18 14:21:36 +08:00 |
|
weizhihong
|
c794758d09
|
【行车日志删除标识操作】
【行车计划同一车次限制】
|
2022-07-18 14:21:30 +08:00 |
|
|
|
8245b2f2e8
|
增加信号按钮类型枚举
|
2022-07-18 13:46:40 +08:00 |
|
|
|
e13d00e75b
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-18 13:19:19 +08:00 |
|
|
|
57ef0ec497
|
大铁线路，有CTC系统的默认自律控制
|
2022-07-18 13:19:00 +08:00 |
|
weizhihong
|
febb565223
|
【运行股道与基本径路不一致修改BUG】
|
2022-07-18 10:40:36 +08:00 |
|
weizhihong
|
6addd6d286
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-18 10:21:13 +08:00 |
|
weizhihong
|
f10a51493e
|
【总辅助抬起后，指示灯无效BUG】
|
2022-07-18 10:21:06 +08:00 |
|
|
|
a77da3cd84
|
修改进路序列路径筛选逻辑
|
2022-07-18 09:48:16 +08:00 |
|
|
|
4f0044be9c
|
修改进路序列查找进路逻辑
|
2022-07-15 18:16:06 +08:00 |
|
|
|
e683c3eb05
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-15 16:28:47 +08:00 |
|
|
|
e2cf5c630e
|
增加长兴技术学院项目
|
2022-07-15 16:28:33 +08:00 |
|
weizhihong
|
d5ab7eee4b
|
【辅助办理进路BUG】
|
2022-07-15 10:42:14 +08:00 |
|
|
|
d4f0b78154
|
Revert "修改：用户在实训平台能看到公开的课程、考试及自己所属组织下的课程、考试数据"
This reverts commit c4144e5f80.
|
2022-07-14 18:11:40 +08:00 |
|
|
|
abdf784bd9
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-14 18:02:28 +08:00 |
|
|
|
6f316da19b
|
修改实训平台的课程、考试查询结果
|
2022-07-14 18:02:14 +08:00 |
|
weizhihong
|
7f799ce302
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-14 17:22:53 +08:00 |
|
weizhihong
|
930638a0c6
|
【接发辅助限制条件、辅助状态下改变方向流程、修改辅助灯状态刷新逻辑】
|
2022-07-14 17:22:36 +08:00 |
|
|
|
1015f4217f
|
增加：创建考试时记录组织
|
2022-07-14 17:21:35 +08:00 |
|
|
|
35277606e8
|
增加返回值字段
|
2022-07-14 17:13:20 +08:00 |
|
|
|
87d93692e4
|
修改扫码登录bug
|
2022-07-14 16:26:51 +08:00 |
|
|
|
c4144e5f80
|
修改：用户在实训平台能看到公开的课程、考试及自己所属组织下的课程、考试数据
|
2022-07-14 16:22:25 +08:00 |
|
|
|
c6868d4e0a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-14 15:16:31 +08:00 |
|
weizhihong
|
9fe7bb8222
|
【改方、辅助状态限制】
|
2022-07-14 15:12:24 +08:00 |
|
|
|
9a2ffe1274
|
修改教学管理相关接口的考试、课程、评价规则的创建和查询逻辑
|
2022-07-14 14:59:31 +08:00 |
|
weizhihong
|
87f04ddb3e
|
【行车日志超限消息处理】
|
2022-07-14 13:40:25 +08:00 |
|
weizhihong
|
54a44f18e6
|
【行车日志新增运行计划时，班次BUG】
|
2022-07-14 13:15:34 +08:00 |
|
|
|
e1f1d8bc5e
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-14 10:16:29 +08:00 |
|
|
|
8b7f989a01
|
修改：mapFunctionConfig给默认值
|
2022-07-14 10:16:08 +08:00 |
|
weizhihong
|
6e40df6868
|
【总辅助验证条件增加】
|
2022-07-14 09:53:26 +08:00 |
|
weizhihong
|
11252f4f48
|
【辅助操作】
|
2022-07-13 17:48:51 +08:00 |
|
|
|
01c00e6bce
|
限制：修改组织名称不能和已有名称重复
|
2022-07-13 16:36:28 +08:00 |
|
|
|
7e5920dd4a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-13 16:28:55 +08:00 |
|
|
|
7ae3b64223
|
修改创建组织时限制关联项目不能重复bug
|
2022-07-13 16:28:38 +08:00 |
|
weizhihong
|
d7f2b1a3fc
|
【行车日志计划时间返回格式修改】
【行车计划增加参数验证】
【运行方向接发辅助准备状态处理】
|
2022-07-13 16:01:17 +08:00 |
|
|
|
c93f80ba57
|
通用教学。修改组织和项目为多对多关系（之前一对多）；修改由前一条引发的问题
|
2022-07-13 15:38:21 +08:00 |
|
|
|
e1f390fb6c
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-12 18:06:16 +08:00 |
|
|
|
49c5e27e98
|
增加通用教学项目、增加地图功能配置
|
2022-07-12 18:06:00 +08:00 |
|
weizhihong
|
5e29e187a5
|
【接辅助后续操作修改】
|
2022-07-12 17:10:59 +08:00 |
|
weizhihong
|
f335e07750
|
【行车日志设置任务】
【行车日志修改股道一致状态BUG】
|
2022-07-12 13:51:19 +08:00 |
|
|
|
d120fd12cc
|
修改进路序列小bug
|
2022-07-12 09:57:24 +08:00 |
|
weizhihong
|
18bdc532b1
|
【行车日志修改实际时间操作】
|
2022-07-11 17:42:30 +08:00 |
|
weizhihong
|
eb1e384654
|
【将运行计划发布修改为接收】
|
2022-07-11 15:40:44 +08:00 |
|
weizhihong
|
22d59b217f
|
【列车行驶时区段占用状态BUG】
【计划下发计划信息版本过滤】
|
2022-07-11 14:55:28 +08:00 |
|
|
|
c18ab99632
|
修改车务终端发送计划后有重复进路序列的bug
|
2022-07-11 10:15:39 +08:00 |
|
|
|
0d1161c334
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-08 17:30:15 +08:00 |
|
|
|
dca02becfc
|
修改股道视图删除数据bug
|
2022-07-08 17:29:57 +08:00 |
|
weizhihong
|
f8a8f5cc75
|
【超限等级设置、设置任务】
|
2022-07-08 17:01:26 +08:00 |
|
|
|
a8a5a4c884
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-08 16:39:48 +08:00 |
|
|
|
1d968dabc5
|
修改股道视图数据发送bug
|
2022-07-08 16:34:54 +08:00 |
|
|
|
f8a67b7182
|
发送调度命令增加参数校验
|
2022-07-08 16:26:23 +08:00 |
|
weizhihong
|
93345cccf2
|
【增加设置始发、终到、列车类型、运行类型、到达超限、出发超限】
|
2022-07-08 15:39:41 +08:00 |
|
weizhihong
|
5e5d10dd85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-08 11:30:17 +08:00 |
|
weizhihong
|
66e8758888
|
【行车计划任务返回消息】
【行车计划电力设置】
|
2022-07-08 11:30:10 +08:00 |
|
|
|
2bdaaa2eb6
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-08 11:16:44 +08:00 |
|
|
|
4c7f0e896b
|
小改动
|
2022-07-08 11:16:17 +08:00 |
|
weizhihong
|
0f06dce035
|
【调度台修改实际时间下发后，未变更的行车日志实际时间变化】
【增加计划下发非空判断】
|
2022-07-07 17:18:56 +08:00 |
|
|
|
db198ad99d
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-07 15:30:31 +08:00 |
|
|
|
8f2a5d2ccf
|
大铁调度命令
|
2022-07-07 15:29:11 +08:00 |
|
|
|
a137fa9c2f
|
地图数据增加画面显示配置
|
2022-07-07 15:28:48 +08:00 |
|
|
|
475f732121
|
增加百度语音识别接口实现
|
2022-07-07 15:26:34 +08:00 |
|
weizhihong
|
5a61a1f193
|
【行车日志后端增加保存计划信息、运行任务、设置军用、设置超限、设置重点列车、设置删除标识、设置进出口不一致、设置股道与计划不一致】
|
2022-07-07 15:22:45 +08:00 |
|
weizhihong
|
755da88a69
|
【运行计划列车类型】
【运行计划设置默认到达时间】
【运行计划增加完成标识、是否生效标识】
|
2022-07-07 13:20:14 +08:00 |
|
weizhihong
|
6c1c90bc81
|
【增加红闪限制条件】
|
2022-07-06 18:02:29 +08:00 |
|
weizhihong
|
2bb21db602
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-07-06 17:15:10 +08:00 |
|
weizhihong
|
fed97fa2a6
|
【大铁发车行驶至目标地区时，判断是否可以继续行驶】
【行车日志初始化BUG修复】
【行车计划修改日期报错修改】
|
2022-07-06 17:15:04 +08:00 |
|
|
|
3a9513cf21
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-06 16:10:43 +08:00 |
|
weizhihong
|
40e94ba1a8
|
【初始化异常问题】
|
2022-07-06 16:10:06 +08:00 |
|
|
|
7d129e7ba1
|
路票传递流程
|
2022-07-06 16:02:49 +08:00 |
|
weizhihong
|
3af7395bf0
|
【初始化时，将所有数据清空】
|
2022-07-06 15:44:00 +08:00 |
|
weizhihong
|
5c32173ea7
|
【修改股道后，再恢复时数据，下发计划不触发问题】
|
2022-07-06 15:16:44 +08:00 |
|
weizhihong
|
ef20e5201e
|
【车务终端发送计划】
【修改运行方向、股道】
|
2022-07-06 14:40:20 +08:00 |
|
weizhihong
|
0261d606d7
|
【车务管理终端数据结构修改】
|
2022-07-05 11:32:31 +08:00 |
|
|
|
984d1f03b8
|
修改语音通话自动回复逻辑
|
2022-07-05 11:17:16 +08:00 |
|
weizhihong
|
e02768821c
|
【大铁非通信车区段占用处理】
|
2022-07-05 11:09:17 +08:00 |
|
weizhihong
|
89926b72ee
|
【闭塞到达、出发时间置空】
|
2022-07-04 17:36:17 +08:00 |
|
weizhihong
|
9d47efa2ee
|
【发预增加时间】
【取消到达、出发时，将实际时间修改为计划时间】
【取消闭塞】
|
2022-07-04 16:47:04 +08:00 |
|
weizhihong
|
4134522daf
|
【增加行车日志红闪字段】
|
2022-07-04 15:41:07 +08:00 |
|
weizhihong
|
69a3cc8eaa
|
【运行计划时间修改】
【连通错办提示等】
|
2022-07-04 11:14:09 +08:00 |
|
|
|
2e42eeea75
|
修改IBP盘bug
|
2022-07-04 09:56:04 +08:00 |
|
weizhihong
|
ca3c30ebf5
|
【增加股道错办、超限不规范提醒接口】
|
2022-07-01 19:02:16 +08:00 |
|
|
|
3f2188ea88
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-01 17:50:57 +08:00 |
|
|
|
0e33fd4953
|
修改CTC进路防错办逻辑
|
2022-07-01 17:50:47 +08:00 |
|
weizhihong
|
c2fa922103
|
【修改、新增计划时调用占线板方法】
|
2022-07-01 17:16:06 +08:00 |
|
|
|
92135e2717
|
CTC进路防错办
|
2022-07-01 16:55:28 +08:00 |
|
|
|
ba33bc6449
|
调度命令发令人改为名称
|
2022-07-01 16:42:44 +08:00 |
|
|
|
69401d16c0
|
添加行车计划新增后生成对应进路序列和股道视图的接口
|
2022-07-01 16:31:50 +08:00 |
|
|
|
00976c99d2
|
修改行车日志数据更新循环逻辑bug
|
2022-07-01 15:33:27 +08:00 |
|
|
|
a482910e33
|
Merge remote-tracking branch 'origin/test' into test
|
2022-07-01 14:52:25 +08:00 |
|
|
|
71283bf2fa
|
修改股道视图消息bug
|
2022-07-01 14:52:18 +08:00 |
|
weizhihong
|
8d3a64c2de
|
【增加运行中的运行组信息】
|
2022-07-01 14:15:01 +08:00 |
|
|
|
383aa6edd1
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java
|
2022-07-01 09:31:38 +08:00 |
|
|
|
17231d1549
|
股道视图消息改为只发送变化的
|
2022-07-01 09:28:13 +08:00 |
|
weizhihong
|
56389d00b0
|
【下发计划删除时发送多余问题】
|
2022-06-30 17:24:55 +08:00 |
|
weizhihong
|
20339c9237
|
【新增计划先发布再删除，车务端阶段计划无变化操作】
【初始化邻站同意等内容不能初始化问题】
|
2022-06-30 16:49:14 +08:00 |
|
weizhihong
|
bc5207b6a7
|
【新增计划先发布再删除，车务端阶段计划无变化操作】
【初始化邻站同意等内容不能初始化问题】
|
2022-06-30 16:48:39 +08:00 |
|
|
|
280cafcf13
|
为了加快仿真创建，去掉遍历所有功能轨构建进路路径的逻辑
|
2022-06-30 16:31:21 +08:00 |
|
weizhihong
|
04a0a4b582
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-06-30 15:49:56 +08:00 |
|
weizhihong
|
5ffb796055
|
【发送预告BUG】
【初始化运行计划】
【去除地铁运行计划】
|
2022-06-30 15:48:44 +08:00 |
|
|
|
c369b355fd
|
修改调度命令反序列化问题
|
2022-06-30 15:19:42 +08:00 |
|
|
|
155401847b
|
Merge remote-tracking branch 'origin/test' into test
|
2022-06-30 14:43:08 +08:00 |
|
|
|
c4f7f391a6
|
行车簿册小bug
|
2022-06-30 14:42:58 +08:00 |
|
|
|
c1616093a1
|
修改local-test配置
|
2022-06-30 14:00:25 +08:00 |
|
weizhihong
|
70c4c99e6d
|
【方向为空时处理】
|
2022-06-29 17:45:05 +08:00 |
|
weizhihong
|
2af2d43a3b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-06-29 17:38:20 +08:00 |
|
weizhihong
|
c693b8dfcc
|
【调整行车日志创建逻辑】
【修改没有删除BUG】
|
2022-06-29 17:37:12 +08:00 |
|
|
|
93664a6a27
|
添加local-test
|
2022-06-29 17:09:32 +08:00 |
|
|
|
77cdd3fd29
|
消除报错
|
2022-06-29 16:21:37 +08:00 |
|
|
|
9c27f24b7f
|
小改动
|
2022-06-29 16:19:19 +08:00 |
|
|
|
e6d762e3cb
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/runplan/CtcStationRunPlanLogService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/CTC/CTCLogicLoop.java
# src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcRepository.java
|
2022-06-29 16:15:03 +08:00 |
|
weizhihong
|
9bee01f79c
|
【计划下发先修改为定时发送】
|
2022-06-29 15:35:32 +08:00 |
|
weizhihong
|
b1307659ee
|
【取消定时运行计划下发消息】
|
2022-06-29 15:19:31 +08:00 |
|
weizhihong
|
767e87cf39
|
【增加运行计划时，判断班次字段】
|
2022-06-29 15:08:41 +08:00 |
|
weizhihong
|
1c4f3aff7a
|
【计划时间转字符串】
|
2022-06-29 15:07:56 +08:00 |
|
weizhihong
|
ceacdf8abe
|
【消息数据类型】
|
2022-06-29 13:55:54 +08:00 |
|
weizhihong
|
28ad692056
|
【计划全量发布】
|
2022-06-29 13:06:53 +08:00 |
|
weizhihong
|
436fa36ac8
|
【删除多余消息类型以及代码】
【增加获取所有调度台运行计划接口】
|
2022-06-29 13:03:41 +08:00 |
|
|
|
536035c201
|
大铁路票相关功能
|
2022-06-29 10:14:16 +08:00 |
|
weizhihong
|
2d2c3d27b0
|
【更新计划以及空指针判断】
|
2022-06-28 16:28:57 +08:00 |
|
weizhihong
|
fc4524efb6
|
【车站向调度台申请股道】
【调度台确认申请信息】
|
2022-06-28 16:16:25 +08:00 |
|
weizhihong
|
6f7e27a13a
|
【修改计划时间类型】
|
2022-06-28 11:33:39 +08:00 |
|
weizhihong
|
0c47af0ec5
|
【阶段计划版本控制】
|
2022-06-28 10:54:35 +08:00 |
|
weizhihong
|
6692a29b0b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-06-28 10:35:49 +08:00 |
|
weizhihong
|
2c267ebd0c
|
【计划阶段消息结构变更】
|
2022-06-28 10:35:41 +08:00 |
|
|
|
78d458099e
|
消除报错
|
2022-06-28 10:07:26 +08:00 |
|
|
|
8369503753
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/runplan/CtcStationRunPlanLogService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/Simulation.java
|
2022-06-28 10:05:58 +08:00 |
|
|
|
a9019b55b4
|
增加调度命令和行车簿册相关功能
|
2022-06-28 10:04:23 +08:00 |
|
weizhihong
|
1909f79101
|
【阶段计划消息发送BUG修复】
|
2022-06-28 09:49:51 +08:00 |
|
weizhihong
|
1fd327136f
|
【修改阶段计划列表实体结构】
|
2022-06-28 08:41:19 +08:00 |
|
weizhihong
|
de3435cfd9
|
【调度台运行日志信息操作】
【运行日志签收】
【运行日志重置功能】
|
2022-06-27 16:58:26 +08:00 |
|
|
|
54e73fffe4
|
Merge remote-tracking branch 'origin/test' into test
|
2022-06-26 10:48:09 +08:00 |
|
|
|
94e3f38c79
|
云南财经IBP盘
|
2022-06-26 10:47:51 +08:00 |
|
weizhihong
|
5ca8aa366c
|
【增加操作枚举】
|
2022-06-24 18:47:17 +08:00 |
|
weizhihong
|
bf636ea51c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-06-24 18:35:04 +08:00 |
|
weizhihong
|
d3a810b63a
|
【调度台运行计划编辑信息变化】
【调度台发送消息功能】
【调度台下发计划】
【调度台签收计划】
|
2022-06-24 18:34:58 +08:00 |
|
|
|
e3f3d8c097
|
修改进路序列id生成方式；增加调度命令操作（未完）
|
2022-06-24 18:17:48 +08:00 |
|
|
|
493309b909
|
Merge remote-tracking branch 'origin/test' into test
|
2022-06-24 13:52:09 +08:00 |
|
|
|
a4546fdb2a
|
修改成工业增加统计相关接口bug
|
2022-06-24 13:52:02 +08:00 |
|
weizhihong
|
09c021f7c2
|
【增加运行计划计划时间】
|
2022-06-24 09:09:36 +08:00 |
|
|
|
d600123fe5
|
为成工业增加统计相关接口；修改CTC生成进路序列逻辑以避免无法进入仿真
|
2022-06-24 08:48:46 +08:00 |
|
weizhihong
|
f0e036c5b0
|
【集中站运行计划新增、删除、发布、签收操作】
|
2022-06-23 18:10:27 +08:00 |
|
weizhihong
|
87b108bf7c
|
【车务管理端消息发送BUG】
|
2022-06-23 17:05:59 +08:00 |
|
weizhihong
|
526b0972c9
|
【去除多余代码】
|
2022-06-23 15:43:00 +08:00 |
|
weizhihong
|
5525b8413e
|
【车务管理终端消息发送BUG】
|
2022-06-23 14:32:50 +08:00 |
|
weizhihong
|
19c42e44d0
|
【根据运行图手册中CTC基本结构图将数据修改为车站为单位数据】
|
2022-06-23 14:20:26 +08:00 |
|
weizhihong
|
ea928cb0e7
|
【车务管理终端去除区段参数，减少前端改动量】
|
2022-06-23 13:12:23 +08:00 |
|
weizhihong
|
f0cd5023dd
|
【增加行车区间实体类】
【行车计划增加“班别（车组）”字段，同车次问题】
【增加车务管理端版本等信息，修改方法信息，需要前端协助修改】
【增加调度台操作区间段行车计划方法、下发阶段计划后端功能】
|
2022-06-23 11:40:31 +08:00 |
|
weizhihong
|
49b6899df3
|
【修改行车日志实际时间】
|
2022-06-21 16:55:24 +08:00 |
|
weizhihong
|
56aefb9db4
|
【增加股道实体类】
【移动部分实体类】
|
2022-06-21 10:15:32 +08:00 |
|
|
|
76d9a0efbd
|
Merge remote-tracking branch 'origin/test' into test
|
2022-06-20 18:01:16 +08:00 |
|
|
|
eedf7198e2
|
系统账号表增加source（账号来源）字段；为成工业增加统计相关接口；增加众合-陕铁院项目
|
2022-06-20 18:01:03 +08:00 |
|
weizhihong
|
48721b53f8
|
【行车日志同意时填入时间修改】
【行车日志重置时，到达时间重置】
|
2022-06-20 17:00:28 +08:00 |
|
|
|
635cc04815
|
去掉综合演练权限需要至少3个的限制
|
2022-06-20 16:51:20 +08:00 |
|
|
|
9e23151199
|
Merge remote-tracking branch 'origin/test' into test
|
2022-06-17 13:04:40 +08:00 |
|
|
|
704b93887c
|
进路序列小bug
|
2022-06-17 13:04:30 +08:00 |
|
weizhihong
|
b2f464b606
|
【空指针判断】
|
2022-06-17 10:53:06 +08:00 |
|
weizhihong
|
1ca1b5372b
|
【运行日志参数修改】
|
2022-06-17 10:40:32 +08:00 |
|
weizhihong
|
3e16b48761
|
【行车日志任务状态修改】
|
2022-06-17 10:17:50 +08:00 |
|
|
|
2991922eb7
|
大铁CTC接发车功能
|
2022-06-16 18:54:27 +08:00 |
|
weizhihong
|
44a1d09e20
|
【车务管理终端默认股道设置】
|
2022-06-16 18:30:45 +08:00 |
|
weizhihong
|
bc1b146edb
|
【车务管理端消息主题调整】
|
2022-06-16 18:20:02 +08:00 |
|
weizhihong
|
8460cd425e
|
【运行方向改方后不能变回BUG】
|
2022-06-16 18:11:26 +08:00 |
|
weizhihong
|
c9d58dd14e
|
【大铁运行方向进路办理状态判断】
|
2022-06-16 16:40:57 +08:00 |
|
weizhihong
|
89a73519c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-06-16 10:40:32 +08:00 |
|
weizhihong
|
c6a005c31f
|
【车务管理端生效区的生效至车站】
|
2022-06-16 10:40:25 +08:00 |
|
|
|
99633887fd
|
Merge remote-tracking branch 'origin/test' into test
|
2022-06-15 18:52:02 +08:00 |
|
|
|
afc3f4077b
|
大铁CTC股道视图消息发送调整
|
2022-06-15 18:51:47 +08:00 |
|
weizhihong
|
7890dc9b70
|
【车务管理端运行计划发送逻辑】（存在问题）
|
2022-06-15 18:37:01 +08:00 |
|
weizhihong
|
07e700f064
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2022-06-15 16:28:41 +08:00 |
|
