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

538 Commits

Author SHA1 Message Date
walker-sheng
3316c11fed 调整ZC非通信车占用逻辑忽略道岔区段 2021-01-28 17:47:08 +08:00
walker-sheng
d669bb2d4c 进路路径查询方法哈尔滨ATP进路逻辑调整 2021-01-28 17:43:52 +08:00
walker-sheng
05ab248b18 进路路径对象调整 
进路路径查询方法重写
按计划行车加载列车逻辑调整
进路延续保护侧防逻辑问题修改
 2021-01-28 16:36:07 +08:00
walker-sheng
6531a09c60 Merge remote-tracking branch 'origin/test' into test 2021-01-28 09:10:01 +08:00
walker-sheng
a1e2e9dc8c 客流策略计算结构调整 2021-01-28 09:09:46 +08:00
joylink_zhangsai
447b0e861a 运行图发布后删除旧的派班计划 2021-01-27 19:18:18 +08:00
joylink_zhangsai
ec71cf4c20 Merge remote-tracking branch 'origin/test' into test 2021-01-27 19:05:33 +08:00
joylink_zhangsai
467cae3d01 运行图发布后删除缓存 2021-01-27 19:05:20 +08:00
DU
62edf56871 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-27 18:17:43 +08:00
DU
e1ef8cf549 运行图编制修改，加载列车位置修改，ato bug修改 2021-01-27 18:17:34 +08:00
walker-sheng
f6814f8e04 客流模拟仿真逻辑调整 
修改停站时间策略逻辑bug
添加跳停策略和计算服务对象，未实现
 2021-01-27 15:33:59 +08:00
joylink_zhangsai
2ddedd3134 Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:41:56 +08:00
joylink_zhangsai
bf326074ad 修改取消进路时延时解锁条件 2021-01-26 18:41:51 +08:00
walker-sheng
927b5bb83c Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:39:22 +08:00
walker-sheng
51285bf767 客流策略流程和停站时间策略逻辑开发 2021-01-26 18:39:05 +08:00
DU
bf3bf28fad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 16:21:45 +08:00
DU
44a7972427 实训生成修改 2021-01-26 16:21:32 +08:00
walker-sheng
4322ed671e Merge remote-tracking branch 'origin/test' into test 2021-01-26 14:32:29 +08:00
walker-sheng
e92867a2bc 添加项目枚举 2021-01-26 14:32:08 +08:00
joylink_zhangsai
b678d3e103 Merge remote-tracking branch 'origin/test' into test 2021-01-26 13:18:17 +08:00
joylink_zhangsai
17abe86959 列车初始化bug修改；取消进路延时解锁条件修改；设头码车时查询路径逻辑修改 2021-01-26 13:18:10 +08:00
DU
d491b56ef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 10:01:19 +08:00
DU
bd75dd9b3e 站间距计算修改 2021-01-26 10:01:08 +08:00
walker-sheng
bb8a694132 Merge remote-tracking branch 'origin/test' into test 2021-01-26 09:12:20 +08:00
walker-sheng
0aae6b66fc Merge remote-tracking branch 'origin/passenger' into test 2021-01-26 09:01:51 +08:00
joylink_zhangsai
8911cfa6b1 Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:44:37 +08:00
joylink_zhangsai
7d30ceb7de 列车添加倒车最大速度，列车运行逻辑对应修改 2021-01-25 19:44:32 +08:00
DU
d8897d80d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 19:26:42 +08:00
DU
8deceb2a2c 站间距根据精确到停车点； 
折返按钮状态保存
 2021-01-25 19:26:31 +08:00
joylink_zhangsai
c159f9a8c1 Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:13:35 +08:00
joylink_zhangsai
f4c16da685 碰撞检测bug修改 2021-01-25 19:13:23 +08:00
walker-sheng
1f88489d3b Merge remote-tracking branch 'origin/test' into test 2021-01-25 19:05:43 +08:00
walker-sheng
1527a8ccf1 信号重复封锁逻辑修改 2021-01-25 19:05:30 +08:00
joylink_zhangsai
02d4d12933 Merge remote-tracking branch 'origin/test' into test 2021-01-25 18:45:46 +08:00
joylink_zhangsai
8459f38fc3 添加列车<倒车限速><碰撞检测逻辑> 2021-01-25 18:45:36 +08:00
walker-sheng
5a53001eaf 信号重复封锁逻辑修改 2021-01-25 18:31:28 +08:00
DU
15462ece3a 站间距离修改 2021-01-25 17:48:06 +08:00
joylink_zhangsai
ebb8cfd55e Merge remote-tracking branch 'origin/test' into test 2021-01-25 17:45:46 +08:00
DU
c26fb273e8 折返站的设置折返实训 2021-01-25 17:16:01 +08:00
DU
96acf9671b 运行等级的站间距离根据地图重新更新 2021-01-25 17:11:02 +08:00
DU
f3eb9096c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 16:17:48 +08:00
joylink_zhangsai
4da39b13f2 Merge remote-tracking branch 'origin/test' into test 2021-01-25 16:14:23 +08:00
joylink_zhangsai
f05398e33c 信号重复封锁的检查区段改为第一个逻辑区段；<延续保护未锁闭>的移动授权改为<延续保护前100m|延续保护前一个区段距离更远的那个端点> 2021-01-25 16:13:57 +08:00
walker-sheng
e5fe7c4dd3 联锁生成——延续保护和侧防生成道岔相关逻辑调整 
仿真初始化进路状态添加侧防元素转换锁闭逻辑
进路服务修改侧防锁闭，道岔预先锁闭等逻辑
 2021-01-25 16:13:21 +08:00
DU
e33afe5a10 更新站间运行等级也可修改距离 2021-01-25 15:44:10 +08:00
DU
a4e4dd92cf 西安二号线 车站设置折返线 实训 2021-01-25 15:19:54 +08:00
DU
36b509ff40 更新站间数据 2021-01-25 14:47:57 +08:00
joylink_zhangsai
5e2c83d565 信号重开逻辑修改 2021-01-25 14:47:46 +08:00
DU
04eb086254 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-25 14:12:00 +08:00
DU
3d99582eb1 组织用户关系更改 2021-01-25 14:11:45 +08:00
DU
7120e303be 成都三现地信号机自动控和人工控实训名字 2021-01-25 14:00:47 +08:00
joylink_zhangsai
4a4c5fa92f 修改车站字段类型 2021-01-25 13:29:32 +08:00
joylink_zhangsai
642fc17de5 列车移动授权计算对<屏蔽门开启>情况的处理逻辑修改；道岔、车站添加字段 2021-01-25 13:13:42 +08:00
walker-sheng
2a8e87ce14 Merge remote-tracking branch 'origin/test' into test 2021-01-25 11:24:39 +08:00
walker-sheng
68e57fa9b0 添加进路延续保护侧防锁闭和解锁逻辑 2021-01-25 11:24:20 +08:00
joylink_zhangsai
e351662dcc 添加挤岔恢复指令 2021-01-22 21:12:01 +08:00
walker-sheng
efeda41423 Merge remote-tracking branch 'origin/test' into test 2021-01-22 20:48:27 +08:00
walker-sheng
face2acfac 进路信号封锁联锁检查和开放逻辑修改 2021-01-22 20:48:14 +08:00
joylink_zhangsai
39af42d875 添加道岔计轴预复位的状态及处理逻辑 2021-01-22 20:38:36 +08:00
walker-sheng
6e6e0a9ca7 Merge remote-tracking branch 'origin/test' into test 2021-01-22 18:58:29 +08:00
walker-sheng
8a4e459b3e 客流停站时间策略逻辑开发 2021-01-22 18:58:14 +08:00
joylink_zhangsai
4e85d158e4 岔心强解bug修改 2021-01-22 18:26:26 +08:00
joylink_zhangsai
808d7c3ee9 修改道岔计轴区段的非通信车占用逻辑（ARB那里） 2021-01-22 18:15:10 +08:00
joylink_zhangsai
70b01e3f5f 修改开放引导信号时的判断信号机接近区段占用逻辑 2021-01-22 17:29:50 +08:00
joylink_zhangsai
8cc9e9f3d2 Merge remote-tracking branch 'origin/test' into test 2021-01-22 16:29:46 +08:00
walker-sheng
dc6fc9345c Merge remote-tracking branch 'origin/test' into test 2021-01-22 16:28:07 +08:00
walker-sheng
8c9392bf14 修改ATS进路触发逻辑 
修改进路排列如果进路已经锁闭直接返回
修改道岔单操逻辑bug
 2021-01-22 16:27:46 +08:00
joylink_zhangsai
411d276baa 实现<区段预复位>操作 2021-01-22 15:10:21 +08:00
joylink_zhangsai
5eb20f669c 取消进路同时取消追踪模式；岔心关联区段锁闭时，岔心区段也锁闭 2021-01-21 19:30:18 +08:00
joylink_zhangsai
88331d6b72 道岔添加<挤岔>故障及逻辑；修改区故解和道岔区故解逻辑 2021-01-21 17:11:15 +08:00
joylink_zhangsai
f67542a5c2 Merge remote-tracking branch 'origin/test' into test 2021-01-21 16:16:45 +08:00
walker-sheng
c747a67d59 ATS进路触发bug修改，添加进路服务日志 2021-01-21 16:09:38 +08:00
joylink_zhangsai
ff2e0e6f71 修改<进路交自动控><进路收人工控><办理引导>的逻辑；修改引导信号开启时间为30秒 2021-01-21 11:24:00 +08:00
joylink_zhangsai
6b843ad147 取消<区段占用进路不排列配置项>；修改<区段强解>逻辑；<查询需要排列的进路>逻辑中添加<触发进路检查>逻辑 2021-01-20 19:37:21 +08:00
walker-sheng
da922a6e31 Merge remote-tracking branch 'origin/test' into test 2021-01-20 18:56:06 +08:00
walker-sheng
c2d0137c28 添加进路排列检查失败日志打印 
大客流策略流程
 2021-01-20 18:55:53 +08:00
joylink_zhangsai
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
joylink_zhangsai
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
walker-sheng
fef9896703 Merge remote-tracking branch 'origin/test' into test 2021-01-19 19:42:36 +08:00
walker-sheng
60e7960728 联锁生成——延续保护解锁时间添加根据解锁区段长度计算的逻辑 2021-01-19 19:42:19 +08:00
joylink_zhangsai
a4e4884721 传输信号机不构建地图数据 2021-01-19 18:55:56 +08:00
joylink_zhangsai
e00262ceb9 传输信号机不生成联锁数据 2021-01-19 18:41:17 +08:00
joylink_zhangsai
52986aa9a2 将传输信号机联锁数据校验逻辑与其它信号机区分，添加传输信号机的构建逻辑 2021-01-19 18:11:44 +08:00
walker-sheng
bad7cca595 进路正常解锁相关道岔解锁逻辑 2021-01-19 17:09:48 +08:00
walker-sheng
fa3a17c63e Merge remote-tracking branch 'origin/test' into test 2021-01-19 17:02:30 +08:00
joylink_zhangsai
3742523aee 实现<强扳道岔>操作；进路正常解锁道岔时，添加<尝试解锁联动道岔和计轴关联道岔>逻辑 2021-01-19 17:01:34 +08:00
joylink_zhangsai
d6a5120ccb 去掉<进路关联屏蔽门开门时关闭始端信号机>的逻辑 2021-01-19 14:34:17 +08:00
joylink_zhangsai
a60106dedc 屏蔽门关门去掉对信号机状态的检查 2021-01-19 13:32:25 +08:00
joylink_zhangsai
f0b8778bfb 去掉进路办理时对非CBTC进路的延续保护锁闭状态检查；添加<取消设置>操作；添加<传输信号机>绘图数据 2021-01-19 11:19:24 +08:00
walker-sheng
25e16b83ea Merge remote-tracking branch 'origin/test' into test 2021-01-19 10:37:07 +08:00
walker-sheng
c2e1bca38c ATS出库和折返进路触发问题修改 2021-01-19 10:36:48 +08:00
joylink_zhangsai
3b99e3f5ea 恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查 2021-01-18 17:24:06 +08:00
joylink_zhangsai
ad529992af 信号机添加<所属车站>绘图属性；交出控制权添加<控制权所属校验> 2021-01-18 16:22:19 +08:00
joylink_zhangsai
35409a3901 进路封锁操作，取消<进路锁闭的区段不处理>的逻辑 2021-01-18 13:38:37 +08:00
walker-sheng
426ae9f775 Merge remote-tracking branch 'origin/test' into test 2021-01-15 18:40:11 +08:00
walker-sheng
843e2c94a5 联锁生成逻辑在生成侧防时，进路道岔生成bug修改 
仿真（西门子）联锁逻辑完善，和调试
 2021-01-15 18:39:57 +08:00
DU
1f82cf3deb 应答器逻辑补充 2021-01-15 17:06:58 +08:00
walker-sheng
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
walker-sheng
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
joylink_zhangsai
45c349dff8 Merge remote-tracking branch 'origin/test' into test 2021-01-15 09:59:27 +08:00
joylink_zhangsai
1567647be2 微信支付 2021-01-15 09:59:01 +08:00
walker-sheng
f29fadfbc6 Merge remote-tracking branch 'origin/test' into test 2021-01-14 19:07:51 +08:00
walker-sheng
eeeec1db01 联锁侧防数据生成、保存、仿真构建流程调试修改 
联锁进路控制添加侧防逻辑（延续保护侧防逻辑还没有加），触发区段使用逻辑区段
联锁进路信号机添加 "级别" 概念和逻辑
 2021-01-14 19:07:32 +08:00
walker-sheng
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
sheng
ca313ad48c Merge remote-tracking branch 'origin/test' into test 2021-01-12 23:53:15 +08:00
sheng
edcdca23c5 添加侧防生成逻辑 2021-01-12 23:52:58 +08:00
thesai
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
thesai
4c23708d14 添加考试的权限校验 2021-01-12 18:12:50 +08:00
thesai
62739021be 仿真权限校验bug修改 2021-01-12 16:12:38 +08:00
thesai
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
thesai
92a2d39318 Merge remote-tracking branch 'origin/test' into test 2021-01-11 20:09:59 +08:00
thesai
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
thesai
4f950543dd 用戶连接司机视角后发送一次列车完整hmi数据，否则第一次进司机视角列车状态显示不正确 2021-01-11 16:37:42 +08:00
thesai
2618913522 修改<从发布地图新建草稿没有复制目的地码数据>bug 2021-01-11 11:27:28 +08:00
thesai
f5f8df1e28 苏电院初始化时关闭响铃 2021-01-10 20:35:40 +08:00
thesai
cbde7f7e40 苏电院真实设备逻辑修改 2021-01-10 16:23:31 +08:00
thesai
f9a541f492 Revert "单位部门成员数据管理关联课程考试" 
This reverts commit c6f0df8b
 2021-01-09 20:16:18 +08:00
thesai
537d2a68f5 Revert "默认课程考试不分是否所属单位始终展示" 
This reverts commit 5d65b4d5
 2021-01-09 20:15:50 +08:00
thesai
6caf775a8e Merge remote-tracking branch 'origin/test' into master-huawei 2021-01-09 19:51:21 +08:00
thesai
1d3409fb45 苏电院修改响铃时长 2021-01-09 19:47:54 +08:00
thesai
f49d344553 Merge remote-tracking branch 'origin/test' into test 2021-01-09 19:26:57 +08:00
thesai
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
sheng
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
joylink_zhangsai
39482d6b1d 苏电院屏蔽门调试 2021-01-05 17:47:55 +08:00
walker-sheng
fa376fdfa3 Merge branch 'test' into restruct 2021-01-04 18:23:51 +08:00
walker-sheng
c94ad846ce 仿真真实设备模拟逻辑开发 2021-01-04 18:22:14 +08:00
walker-sheng
df1f83c789 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-31 18:23:58 +08:00
walker-sheng
13cc8e9bf8 Merge remote-tracking branch 'origin/test' into test 2020-12-31 18:23:23 +08:00
walker-sheng
50fb1fc564 仿真抽象 2020-12-31 18:22: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
joylink_zhangsai
f473304fe6 Merge remote-tracking branch 'origin/test' into test 2020-12-31 16:30:17 +08:00
joylink_zhangsai
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
joylink_zhangsai
0a53d304aa 导入导出添加ISCS数据 2020-12-31 09:53:03 +08:00
walker-sheng
57c9fcc04f Merge remote-tracking branch 'origin/test' into test 2020-12-30 16:52:38 +08:00
walker-sheng
eadc8ccc8c 删除用户配置表数据库相关对象和相关接口 2020-12-30 16:51:50 +08:00
joylink_zhangsai
a25e3dc6f2 Merge remote-tracking branch 'origin/test' into test 2020-12-30 16:18:02 +08:00
joylink_zhangsai
6cac955c4c 国赛场景添加权限控制 2020-12-30 16:17:51 +08:00
walker-sheng
9aa83aab76 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-30 14:39:11 +08:00
walker-sheng
21406a1726 修改文件上传路径 2020-12-30 14:37:19 +08:00
walker-sheng
4127d7d58b Merge remote-tracking branch 'origin/test' into test 2020-12-30 11:00:58 +08:00
walker-sheng
d93934d9da 修改微信服务获取token接口调用 2020-12-30 11:00:27 +08:00
DU
ae12063980 试卷定义列表名称查询bug修改 2020-12-30 10:58:25 +08:00
joylink_zhangsai
7dd24fd938 Merge remote-tracking branch 'origin/test' into test 2020-12-30 10:42:52 +08:00
joylink_zhangsai
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
walker-sheng
0bc894d2b9 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-30 09:18:32 +08:00
walker-sheng
8161216321 Merge remote-tracking branch 'origin/test' into test 2020-12-30 09:17:37 +08:00
walker-sheng
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
walker-sheng
2e2d58d992 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-29 18:39:20 +08:00
walker-sheng
3d7fd9a5c2 抽象仿真，重构 2020-12-29 18:34:10 +08:00
walker-sheng
07252b5fea 修改小程序access_token获取 2020-12-29 18:30:50 +08:00
DU
c9c4c20da9 修改运行图绘制bug 2020-12-29 18:19:59 +08:00
joylink_zhangsai
d50431919c ISCS复制接口修改 2020-12-29 17:08:43 +08:00
joylink_zhangsai
78e222b297 实训生成bug修改 2020-12-29 13:59:18 +08:00
joylink_zhangsai
a5326da09c Merge remote-tracking branch 'origin/test' into test 2020-12-29 10:31:40 +08:00
joylink_zhangsai
3b811d1d40 发布的ibp、iscs数据管理；ibp紧急停车bug修改 2020-12-29 10:31:24 +08:00
walker-sheng
b4c3e458f0 Merge remote-tracking branch 'origin/test' into test 2020-12-28 14:33:56 +08:00
walker-sheng
34fc686f4d 仿真列车出库时间调整为提前5分钟 
列车折返进路办理添加是否存在冲突出库计划判断
 2020-12-28 14:33:35 +08:00
joylink_zhangsai
7a45660493 Merge remote-tracking branch 'origin/test' into test 2020-12-28 13:58:20 +08:00
joylink_zhangsai
2fb256cf0e ibp紧急停车按钮逻辑 2020-12-28 13:58:00 +08:00
DU
a8e2e0afaf 宁波三-两运行图导入修改； 
指令定义分页查询增加仿真角色条件
 2020-12-25 14:27:30 +08:00
joylink_zhangsai
f8abb9eddc 代码格式化 2020-12-25 09:01:43 +08:00
joylink_zhangsai
db657689bf Merge remote-tracking branch 'origin/test' into test 2020-12-24 18:46:16 +08:00
joylink_zhangsai
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
joylink_zhangsai
c61ac54e2b Merge remote-tracking branch 'origin/test' into test 2020-12-23 09:13:32 +08:00
joylink_zhangsai
aab1348b33 商品更新bug修改 2020-12-22 18:19:43 +08:00