|
|
c4cc217cd3
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-11 14:56:35 +08:00 |
|
|
|
39bb108a64
|
修改生成默认课程bug；修改备用车设置为头码车不运行bug；未按计划行车时不再将转换轨的人工车替换成即将出库的计划车；修改<设置自动触发/ats自排时信号机需处于人工控>设置的判定bug；列车应用新计划时清除未触发的进路；修改列车更新目标区段逻辑；
|
2021-08-11 14:54:32 +08:00 |
|
|
|
f3293c93d7
|
延续保护解锁侧防解锁逻辑问题修改
|
2021-08-11 11:20:54 +08:00 |
|
|
|
b431e382a5
|
修改设置计划车bug
|
2021-08-10 20:42:58 +08:00 |
|
|
|
ef79a3abf0
|
修改target更新逻辑；修改设置计划车bug；修改计轴故障时进路不能解锁问题
|
2021-08-10 20:24:48 +08:00 |
|
|
|
c557d118a6
|
修改头码车运行时仿真异常的问题（因为没有运行等级/停站时间数据，现在添加了对这两个数据的简单校验）；人工车有进路就能运行
|
2021-08-10 16:09:10 +08:00 |
|
|
|
b86308f88a
|
取消应答器数据校验
|
2021-08-10 13:16:47 +08:00 |
|
|
|
c7b63cfacc
|
地图发布创建默认交路时，数据检查不通过时，不再报错，仅取消创建交路
|
2021-08-10 10:11:09 +08:00 |
|
|
|
9e39ee5a93
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-09 16:46:20 +08:00 |
|
|
|
44d3166858
|
修改进路触发逻辑；列车在转换轨停车时，增加检查回库的逻辑
|
2021-08-09 16:46:05 +08:00 |
|
|
|
631324c2c7
|
ato逻辑无速度曲线判断
|
2021-08-09 14:45:55 +08:00 |
|
|
|
bdd35ae336
|
Merge remote-tracking branch 'origin/test' into ats-restruct
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATO/service/ATOService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
|
2021-08-09 14:35:23 +08:00 |
|
|
|
884b312623
|
列车ITC级别运行相关逻辑完善
|
2021-08-09 14:28:07 +08:00 |
|
|
|
05d585e37e
|
修改进路筛选bug；修改ma计算bug；修改ats监控列车的通信判定
|
2021-08-09 13:59:04 +08:00 |
|
|
|
38da1d716c
|
列车ITC级别运行相关逻辑实现
|
2021-08-06 18:12:54 +08:00 |
|
|
|
6f76ea4df7
|
处理无折返策略数据导致的bug
|
2021-08-06 18:00:52 +08:00 |
|
|
|
6cadfcf607
|
hmi消息增加牵引/制动力比例
|
2021-08-06 16:32:33 +08:00 |
|
|
|
6dee8dfa31
|
多点登录被登出后发送socket消息；ARB故障在有非通信车接近时改为计轴故障
|
2021-08-06 14:21:03 +08:00 |
|
|
|
3607e9ebe2
|
进路设置自动通过后，无法使用取消进路操作；从发布地图创建草稿增加超限区段数据
|
2021-08-06 10:22:47 +08:00 |
|
|
|
5c2a94161a
|
bug
|
2021-08-05 18:49:48 +08:00 |
|
|
|
01c99a8ead
|
Merge remote-tracking branch 'origin/ats-restruct' into test
# Conflicts:
# src/main/java/club/joylink/rtss/dao/DraftMapRouteOverrunDAO.java
# src/main/java/club/joylink/rtss/entity/DraftMapRouteOverrun.java
# src/main/java/club/joylink/rtss/entity/DraftMapRouteOverrunExample.java
# src/main/resources/mybatis/mapper/DraftMapRouteOverrunDAO.xml
|
2021-08-05 18:39:50 +08:00 |
|
|
|
afbaf5debc
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-05 18:38:14 +08:00 |
|
|
|
5570eac3e4
|
进路超限区段数据构建，逻辑实现
|
2021-08-05 18:37:55 +08:00 |
|
|
|
3af6b866ab
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-05 17:41:02 +08:00 |
|
|
|
405b2368f9
|
列车终点站跳停逻辑修改
|
2021-08-05 17:40:39 +08:00 |
|
|
|
534c014bb1
|
修改ATO逻辑；增加处理地图草稿数据接口
|
2021-08-05 16:18:26 +08:00 |
|
|
|
7928c2a41c
|
sql文件
|
2021-08-05 14:07:50 +08:00 |
|
|
|
8be3baaba6
|
补文件
|
2021-08-05 14:05:50 +08:00 |
|
|
|
3e16198215
|
修改新版ma计算；恢复ATO到站自动开门后关闭ATO逻辑
|
2021-08-05 13:48:46 +08:00 |
|
|
|
43274b5511
|
修改扣车bug
|
2021-08-05 10:03:07 +08:00 |
|
|
|
334d4ec105
|
增加创建超限区段接口、进路数据关联超限区段
|
2021-08-05 09:52:47 +08:00 |
|
|
|
8e58d6ba89
|
设置头码车路径寻找逻辑修改
|
2021-08-05 09:51:35 +08:00 |
|
|
|
3d712e6486
|
修改新ATS中的bug；取消进路功能不再取消自动通过状态
|
2021-08-04 18:02:36 +08:00 |
|
|
|
e0c7ad2150
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-04 15:16:20 +08:00 |
|
|
|
d6ba9cd5cf
|
取消进路功能不能取消通过进路
|
2021-08-04 15:12:05 +08:00 |
|
|
|
77459e2a98
|
列车跳停bug修改
|
2021-08-04 09:37:12 +08:00 |
|
|
|
1f6b77b26a
|
MA计算ato距离逻辑调整
|
2021-08-03 18:34:13 +08:00 |
|
|
|
a3634dda76
|
新版ATS进路选择bug修改；头码车计划区段更新逻辑修改；
|
2021-08-03 16:58:24 +08:00 |
|
|
|
eb5d355485
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-03 15:47:02 +08:00 |
|
|
|
dd553411a8
|
取消smart-doc编译期执行
|
2021-08-03 14:23:11 +08:00 |
|
|
|
83f5ada9f3
|
仿真ats重构-修改服务端口
|
2021-08-03 14:13:19 +08:00 |
|
|
|
c825bd92aa
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-08-03 13:59:01 +08:00 |
|
|
|
0296d007ab
|
设置人工车时，列车在停止状态下才清除target；添加创建进路接口；列车最大速度降低至80km/h
|
2021-08-03 13:58:39 +08:00 |
|
|
|
653a29eb65
|
仿真ats重构-MA移动授权逻辑重构，ATS进路触发逻辑调整，进路正常开始解锁逻辑判断流程调整（现根据进路第一区段占用情况触发）
|
2021-08-03 13:53:49 +08:00 |
|
|
|
670ed1163a
|
新版ATS进路选择修改
|
2021-08-02 16:22:08 +08:00 |
|
|
|
6840372770
|
区段计轴故障流程修改；设置互锁解除时重开信号机
|
2021-08-02 11:22:05 +08:00 |
|
|
|
f0bd183765
|
Merge remote-tracking branch 'origin/test' into ats-restruct
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
# src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
# src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java
|
2021-08-02 09:48:34 +08:00 |
|
|
|
0a989ab9e2
|
新版ATS进路选择修改
|
2021-08-02 09:40:52 +08:00 |
|
|
|
8fc7e34e65
|
防护速度改为推荐速度+5km/h
|
2021-08-01 19:41:32 +08:00 |
|
|
|
6f0a60a3ea
|
hmi添加字段；计算速度曲线逻辑迁移至ATP循环；ATP速度防护逻辑修改
|
2021-07-30 19:06:45 +08:00 |
|
