|
|
e0d549600d
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsSectionService.java
|
2021-01-20 16:40:45 +08:00 |
|
|
|
0f5932e1c1
|
修改实训生成bug；针对南京线路添加配置和逻辑
|
2021-01-20 16:03:55 +08:00 |
|
Jade
|
6f6a323d8d
|
客流列车到站上车调整
|
2021-01-20 15:23:46 +08:00 |
|
DU
|
df250b5c71
|
Merge
|
2021-01-20 09:55:00 +08:00 |
|
DU
|
d0c2ed8544
|
应答器逻辑修改
|
2021-01-20 09:13:33 +08:00 |
|
|
|
fef9896703
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 19:42:36 +08:00 |
|
|
|
60e7960728
|
联锁生成——延续保护解锁时间添加根据解锁区段长度计算的逻辑
|
2021-01-19 19:42:19 +08:00 |
|
|
|
a4e4884721
|
传输信号机不构建地图数据
|
2021-01-19 18:55:56 +08:00 |
|
|
|
e00262ceb9
|
传输信号机不生成联锁数据
|
2021-01-19 18:41:17 +08:00 |
|
|
|
52986aa9a2
|
将传输信号机联锁数据校验逻辑与其它信号机区分，添加传输信号机的构建逻辑
|
2021-01-19 18:11:44 +08:00 |
|
|
|
bad7cca595
|
进路正常解锁相关道岔解锁逻辑
|
2021-01-19 17:09:48 +08:00 |
|
|
|
fa3a17c63e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 17:02:30 +08:00 |
|
|
|
3742523aee
|
实现<强扳道岔>操作；进路正常解锁道岔时，添加<尝试解锁联动道岔和计轴关联道岔>逻辑
|
2021-01-19 17:01:34 +08:00 |
|
|
|
d6a5120ccb
|
去掉<进路关联屏蔽门开门时关闭始端信号机>的逻辑
|
2021-01-19 14:34:17 +08:00 |
|
|
|
a60106dedc
|
屏蔽门关门去掉对信号机状态的检查
|
2021-01-19 13:32:25 +08:00 |
|
|
|
f0b8778bfb
|
去掉进路办理时对非CBTC进路的延续保护锁闭状态检查；添加<取消设置>操作；添加<传输信号机>绘图数据
|
2021-01-19 11:19:24 +08:00 |
|
|
|
25e16b83ea
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 10:37:07 +08:00 |
|
|
|
c2e1bca38c
|
ATS出库和折返进路触发问题修改
|
2021-01-19 10:36:48 +08:00 |
|
|
|
3b99e3f5ea
|
恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查
|
2021-01-18 17:24:06 +08:00 |
|
|
|
ad529992af
|
信号机添加<所属车站>绘图属性；交出控制权添加<控制权所属校验>
|
2021-01-18 16:22:19 +08:00 |
|
|
|
35409a3901
|
进路封锁操作，取消<进路锁闭的区段不处理>的逻辑
|
2021-01-18 13:38:37 +08:00 |
|
|
|
426ae9f775
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 18:40:11 +08:00 |
|
|
|
843e2c94a5
|
联锁生成逻辑在生成侧防时，进路道岔生成bug修改
仿真（西门子）联锁逻辑完善，和调试
|
2021-01-15 18:39:57 +08:00 |
|
DU
|
1f82cf3deb
|
应答器逻辑补充
|
2021-01-15 17:06:58 +08:00 |
|
|
|
cfe95ad538
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 13:00:09 +08:00 |
|
DU
|
d399df63de
|
岔心校验bug
|
2021-01-15 11:11:24 +08:00 |
|
|
|
d65a01fcd9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 11:04:42 +08:00 |
|
DU
|
413a025023
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-15 10:40:56 +08:00 |
|
DU
|
6b03677e54
|
岔心 应答器数据对象，应答器逻辑未完
|
2021-01-15 10:39:46 +08:00 |
|
|
|
45c349dff8
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 09:59:27 +08:00 |
|
|
|
1567647be2
|
微信支付
|
2021-01-15 09:59:01 +08:00 |
|
|
|
f29fadfbc6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-14 19:07:51 +08:00 |
|
|
|
eeeec1db01
|
联锁侧防数据生成、保存、仿真构建流程调试修改
联锁进路控制添加侧防逻辑（延续保护侧防逻辑还没有加），触发区段使用逻辑区段
联锁进路信号机添加 "级别" 概念和逻辑
|
2021-01-14 19:07:32 +08:00 |
|
|
|
8eb906de23
|
联锁侧防数据生成、保存、仿真构建
|
2021-01-13 18:42:17 +08:00 |
|
DU
|
13f5dd8142
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-13 10:41:49 +08:00 |
|
DU
|
8f4d4cd9ea
|
地图草稿添加岔心 应答器；
点赞数据推送修db改
|
2021-01-13 10:41:26 +08:00 |
|
|
|
ca313ad48c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-12 23:53:15 +08:00 |
|
|
|
edcdca23c5
|
添加侧防生成逻辑
|
2021-01-12 23:52:58 +08:00 |
|
|
|
0faa785f90
|
创建考试时的权限校验逻辑修改
|
2021-01-12 20:47:35 +08:00 |
|
DU
|
02078eb039
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-12 18:52:03 +08:00 |
|
DU
|
37c0cee2ae
|
考试创建同规则删除
|
2021-01-12 18:51:53 +08:00 |
|
|
|
4c23708d14
|
添加考试的权限校验
|
2021-01-12 18:12:50 +08:00 |
|
|
|
62739021be
|
仿真权限校验bug修改
|
2021-01-12 16:12:38 +08:00 |
|
|
|
2e77fd784c
|
仿真修改权限校验逻辑
|
2021-01-12 14:58:08 +08:00 |
|
DU
|
ca4caa64f9
|
单位增加关联项目code
|
2021-01-12 14:02:32 +08:00 |
|
DU
|
e0c23c1e2c
|
删除考试代码bug
|
2021-01-12 13:34:10 +08:00 |
|
DU
|
15d4702873
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-12 11:45:03 +08:00 |
|
DU
|
015adfcc95
|
教学相关修改
|
2021-01-12 11:44:35 +08:00 |
|
|
|
92a2d39318
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-11 20:09:59 +08:00 |
|
|
|
b6c1672542
|
列车移动曲线计算兼容逻辑区段限速
|
2021-01-11 20:09:52 +08:00 |
|
DU
|
ec6cb89ce0
|
教学bug
|
2021-01-11 20:02:12 +08:00 |
|
DU
|
d72beb1e93
|
Merge remote-tracking branch 'origin/test' into test1
|
2021-01-11 17:37:49 +08:00 |
|
DU
|
d0284659d8
|
课程考试关联班级修改
|
2021-01-11 17:32:24 +08:00 |
|
DU
|
d0907a8d06
|
Revert "Revert "默认课程考试不分是否所属单位始终展示""
This reverts commit 537d2a68
|
2021-01-11 17:31:48 +08:00 |
|
DU
|
88c79ab763
|
Revert "Revert "单位部门成员数据管理关联课程考试""
This reverts commit f9a541f4
|
2021-01-11 17:31:28 +08:00 |
|
|
|
4f950543dd
|
用戶连接司机视角后发送一次列车完整hmi数据，否则第一次进司机视角列车状态显示不正确
|
2021-01-11 16:37:42 +08:00 |
|
|
|
2618913522
|
修改<从发布地图新建草稿没有复制目的地码数据>bug
|
2021-01-11 11:27:28 +08:00 |
|
|
|
f5f8df1e28
|
苏电院初始化时关闭响铃
|
2021-01-10 20:35:40 +08:00 |
|
|
|
cbde7f7e40
|
苏电院真实设备逻辑修改
|
2021-01-10 16:23:31 +08:00 |
|
|
|
f9a541f492
|
Revert "单位部门成员数据管理关联课程考试"
This reverts commit c6f0df8b
|
2021-01-09 20:16:18 +08:00 |
|
|
|
537d2a68f5
|
Revert "默认课程考试不分是否所属单位始终展示"
This reverts commit 5d65b4d5
|
2021-01-09 20:15:50 +08:00 |
|
|
|
6caf775a8e
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-01-09 19:51:21 +08:00 |
|
|
|
1d3409fb45
|
苏电院修改响铃时长
|
2021-01-09 19:47:54 +08:00 |
|
|
|
f49d344553
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-09 19:26:57 +08:00 |
|
|
|
88de80d11b
|
苏电院真实设备逻辑修改
|
2021-01-09 19:26:41 +08:00 |
|
DU
|
5d65b4d50d
|
默认课程考试不分是否所属单位始终展示
|
2021-01-08 18:09:47 +08:00 |
|
DU
|
c6f0df8b18
|
单位部门成员数据管理关联课程考试
|
2021-01-08 18:00:51 +08:00 |
|
|
|
fdd51383f4
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-08 15:32:06 +08:00 |
|
DU
|
8b64fde956
|
仿真会话bug修复
|
2021-01-07 19:33:01 +08:00 |
|
DU
|
61f2003f27
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-07 09:28:04 +08:00 |
|
DU
|
0ceee901a6
|
iscs加数据判断接口，车站实训生成背景更换，自动故障列车到达区段条件修改
|
2021-01-07 09:15:14 +08:00 |
|
|
|
39482d6b1d
|
苏电院屏蔽门调试
|
2021-01-05 17:47:55 +08:00 |
|
|
|
df1f83c789
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-31 18:23:58 +08:00 |
|
DU
|
d1e339a307
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 18:01:26 +08:00 |
|
DU
|
2434905228
|
实训适配新操作
|
2020-12-31 18:01:09 +08:00 |
|
|
|
f473304fe6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 16:30:17 +08:00 |
|
|
|
32bb3e691e
|
控制模式判断bug修改
|
2020-12-31 16:30:02 +08:00 |
|
DU
|
2149d85ede
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 13:45:22 +08:00 |
|
DU
|
55e2731634
|
试卷过期查询bug修改
|
2020-12-31 13:44:59 +08:00 |
|
|
|
0a53d304aa
|
导入导出添加ISCS数据
|
2020-12-31 09:53:03 +08:00 |
|
|
|
a25e3dc6f2
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 16:18:02 +08:00 |
|
|
|
6cac955c4c
|
国赛场景添加权限控制
|
2020-12-30 16:17:51 +08:00 |
|
|
|
9aa83aab76
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-30 14:39:11 +08:00 |
|
|
|
21406a1726
|
修改文件上传路径
|
2020-12-30 14:37:19 +08:00 |
|
|
|
4127d7d58b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 11:00:58 +08:00 |
|
|
|
d93934d9da
|
修改微信服务获取token接口调用
|
2020-12-30 11:00:27 +08:00 |
|
DU
|
ae12063980
|
试卷定义列表名称查询bug修改
|
2020-12-30 10:58:25 +08:00 |
|
|
|
7dd24fd938
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 10:42:52 +08:00 |
|
|
|
fc692f8040
|
运行图版本更新bug修改
|
2020-12-30 10:41:28 +08:00 |
|
DU
|
c9a0d8bc8f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:52:13 +08:00 |
|
DU
|
636432d6f9
|
复制运行计划bug修改
|
2020-12-30 09:51:11 +08:00 |
|
|
|
0bc894d2b9
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-30 09:18:32 +08:00 |
|
|
|
8161216321
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:17:37 +08:00 |
|
|
|
1745fcd5e0
|
修改邮件发送问题
|
2020-12-30 09:17:22 +08:00 |
|
DU
|
070dd06805
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:04:24 +08:00 |
|
|
|
2e2d58d992
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-29 18:39:20 +08:00 |
|
|
|
3d7fd9a5c2
|
抽象仿真，重构
|
2020-12-29 18:34:10 +08:00 |
|
|
|
07252b5fea
|
修改小程序access_token获取
|
2020-12-29 18:30:50 +08:00 |
|
DU
|
c9c4c20da9
|
修改运行图绘制bug
|
2020-12-29 18:19:59 +08:00 |
|
|
|
d50431919c
|
ISCS复制接口修改
|
2020-12-29 17:08:43 +08:00 |
|
|
|
78e222b297
|
实训生成bug修改
|
2020-12-29 13:59:18 +08:00 |
|
|
|
a5326da09c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-29 10:31:40 +08:00 |
|
|
|
3b811d1d40
|
发布的ibp、iscs数据管理；ibp紧急停车bug修改
|
2020-12-29 10:31:24 +08:00 |
|
|
|
b4c3e458f0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-28 14:33:56 +08:00 |
|
|
|
34fc686f4d
|
仿真列车出库时间调整为提前5分钟
列车折返进路办理添加是否存在冲突出库计划判断
|
2020-12-28 14:33:35 +08:00 |
|
|
|
7a45660493
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-28 13:58:20 +08:00 |
|
|
|
2fb256cf0e
|
ibp紧急停车按钮逻辑
|
2020-12-28 13:58:00 +08:00 |
|
DU
|
a8e2e0afaf
|
宁波三-两运行图导入修改；
指令定义分页查询增加仿真角色条件
|
2020-12-25 14:27:30 +08:00 |
|
|
|
f8abb9eddc
|
代码格式化
|
2020-12-25 09:01:43 +08:00 |
|
|
|
db657689bf
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-24 18:46:16 +08:00 |
|
|
|
9360fd5020
|
实训生成后原有课程恢复
|
2020-12-24 18:45:57 +08:00 |
|
DU
|
34f6cb7deb
|
宁波三运行图导入-工作日+双休日 （待测）
|
2020-12-24 18:28:55 +08:00 |
|
DU
|
8f748e6323
|
用户交路定义增加生成通用路径，
|
2020-12-23 19:04:01 +08:00 |
|
DU
|
ea7eb75078
|
运行图检查错误提示修改
|
2020-12-23 16:01:10 +08:00 |
|
DU
|
660a42ffe0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-23 15:12:17 +08:00 |
|
DU
|
cc5fd83f60
|
运行图生成防止时间跨过次日凌晨2点
|
2020-12-23 15:11:05 +08:00 |
|
|
|
c61ac54e2b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-23 09:13:32 +08:00 |
|
|
|
aab1348b33
|
商品更新bug修改
|
2020-12-22 18:19:43 +08:00 |
|
DU
|
0c343028b2
|
添加清空运行图车次数据
|
2020-12-22 16:31:14 +08:00 |
|
DU
|
284aeadb67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-22 15:11:48 +08:00 |
|
DU
|
a56448403d
|
平移单个服务计划
|
2020-12-22 15:11:35 +08:00 |
|
|
|
6c5713bfda
|
删除<RM模式下触发EB不生效>逻辑
|
2020-12-22 14:21:07 +08:00 |
|
|
|
ac22b5c8c7
|
列车添加<控制杆拉到快速制动位可以缓解信号EB>逻辑
|
2020-12-22 14:13:21 +08:00 |
|
|
|
52d0218305
|
留言板管理增加编辑功能
|
2020-12-22 13:47:37 +08:00 |
|
|
|
01b39f4129
|
运行至前方站步骤参数修改
|
2020-12-22 13:25:52 +08:00 |
|
|
|
730e245985
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-22 13:21:24 +08:00 |
|
|
|
da35d772bd
|
zc故障不停车bug修改；运行至前方站指令流程修改
|
2020-12-22 13:20:46 +08:00 |
|
DU
|
1a7deb1c0c
|
仿真操作异常添加提示
|
2020-12-22 10:55:21 +08:00 |
|
|
|
fbd2d01e07
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 22:27:02 +08:00 |
|
|
|
794d8a0a0a
|
联锁机故障取消逻辑调整（哈尔滨）
|
2020-12-21 22:24:56 +08:00 |
|
|
|
3dd75b34c2
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 22:15:26 +08:00 |
|
|
|
e3cee9cfbe
|
联锁机故障（哈尔滨）
|
2020-12-21 22:14:43 +08:00 |
|
|
|
57809890c8
|
办理过的进路不再办理
|
2020-12-21 19:01:02 +08:00 |
|
|
|
7e9ec11e76
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 18:41:57 +08:00 |
|
|
|
e7114802cb
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 17:59:56 +08:00 |
|
|
|
5ea8b122eb
|
ATS进路排列逻辑，已经或正在排列的进路不再重复排列
|
2020-12-21 17:59:42 +08:00 |
|
|
|
daf2d16cb7
|
仿真背景增加字段
|
2020-12-21 16:55:03 +08:00 |
|
DU
|
4353dd014e
|
导入运行图异常断言bug修复
|
2020-12-21 13:04:35 +08:00 |
|
DU
|
301ed565d1
|
个人停站时间数据判重逻辑修改
|
2020-12-21 09:16:18 +08:00 |
|
|
|
ab8fa3c3c0
|
修改华为正式数据库路径配置
|
2020-12-20 10:55:09 +08:00 |
|
|
|
c36f7ab639
|
调整查询进路路径计算逻辑
修改列车站台控制逻辑兼容无出站信号机站台
修改其他发现bug
|
2020-12-19 22:29:44 +08:00 |
|
|
|
d8f15148c8
|
哈尔滨问题去掉多余修改
|
2020-12-18 21:53:40 +08:00 |
|
|
|
744f446b56
|
哈尔滨问题修改
|
2020-12-18 21:47:20 +08:00 |
|
|
|
3b8b79e9e6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 21:46:45 +08:00 |
|
|
|
8a3ab0fc25
|
修改本地打包配置
|
2020-12-17 21:46:26 +08:00 |
|
|
|
b18ad86fc6
|
Revert "仿真运行中前后车次间隔时间不连续时需等待发车"
This reverts commit 5248236d
|
2020-12-17 20:42:09 +08:00 |
|
|
|
f0ef8308f1
|
贵装备查询默认课程bug修改
|
2020-12-17 18:45:28 +08:00 |
|
|
|
ff8427781b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 18:23:09 +08:00 |
|
|
|
0cd9867530
|
哈尔滨问题：日志、信号机灯丝熔断故障
|
2020-12-17 18:22:55 +08:00 |
|
DU
|
5248236d7d
|
仿真运行中前后车次间隔时间不连续时需等待发车
|
2020-12-17 17:40:49 +08:00 |
|
