|
|
b65610a349
|
创建用户交路时根据地图配置决定检不检查线路基础数据
|
2022-04-19 16:59:35 +08:00 |
|
|
|
abfd140ae9
|
Merge remote-tracking branch 'origin/test' into test
|
2022-04-19 15:58:16 +08:00 |
|
|
|
e34852eb65
|
大铁进路路径生成逻辑修改
|
2022-04-19 15:58:00 +08:00 |
|
weizhihong
|
5c4bdf41dc
|
修改【指示灯关联实体类】
Signed-off-by: weizhihong <weizhihong@joylink.club>
|
2022-04-19 15:40:41 +08:00 |
|
weizhihong
|
23f738cbc1
|
增加【按钮与站台关联、指示灯与进路关联】
Signed-off-by: weizhihong <weizhihong@joylink.club>
|
2022-04-19 15:08:40 +08:00 |
|
weizhihong
|
56b099f39f
|
大铁【改方操作】【接发指示灯】功能
Signed-off-by: weizhihong <weizhihong@joylink.club>
|
2022-04-19 13:48:27 +08:00 |
|
|
|
b808c220a8
|
教学统计
|
2022-04-18 19:01:54 +08:00 |
|
|
|
6f0aa02eb6
|
大铁CTC（未完）
|
2022-04-18 14:48:20 +08:00 |
|
|
|
c65998e861
|
Merge remote-tracking branch 'origin/test' into dev
|
2022-04-18 14:35:46 +08:00 |
|
|
|
cb561da228
|
学生考试成绩曲线接口
|
2022-04-15 18:52:22 +08:00 |
|
|
|
48d3d6fb1d
|
大铁CTC
|
2022-04-15 18:51:26 +08:00 |
|
|
|
682beda268
|
处理大铁无ZC的问题：车站关联的zc没有用到，所以车站不再关联zc
|
2022-04-15 10:23:14 +08:00 |
|
|
|
78796a7009
|
修改佛山线运行图导入逻辑；修改ats准备发车时的逻辑
|
2022-03-31 10:22:20 +08:00 |
|
|
|
5c3a88d2aa
|
联动道岔、计轴关联道岔解锁逻辑修改
|
2022-03-30 17:32:19 +08:00 |
|
|
|
3aed0adf9d
|
修改EB距离计算逻辑
|
2022-03-30 15:59:13 +08:00 |
|
|
|
cfe37d824a
|
修改速度释放的逻辑；修改办理进路时检查延续保护道岔占用的逻辑
|
2022-03-29 16:51:08 +08:00 |
|
|
|
0e1a8da2d5
|
修改默认运行级别为ITC的线路加载出库列车的逻辑，使列车状态正确
|
2022-03-29 13:59:41 +08:00 |
|
|
|
c5e40e047c
|
修改佛山线运行图导入逻辑（调试车与运营车在不同的轨道折返）；
|
2022-03-28 14:57:40 +08:00 |
|
|
|
5d897e4925
|
修改佛山线运行图导入逻辑；修改无应答器线路itc移动授权更新逻辑
|
2022-03-25 18:44:06 +08:00 |
|
|
|
9f881edc6c
|
暂时提交
|
2022-01-24 23:24:55 +08:00 |
|
|
|
4e07a65b6a
|
pa/pis系统消息类型作为操作参数
|
2022-01-19 14:36:13 +08:00 |
|
|
|
2e06dd9031
|
pis系统设备默认状态改为"正常"
|
2022-01-19 13:39:07 +08:00 |
|
|
|
3b9de34033
|
补充pa/pis系统设备状态
|
2022-01-18 17:44:41 +08:00 |
|
|
|
c9a504621b
|
pa/pis系统功能
|
2022-01-18 15:54:29 +08:00 |
|
|
|
46dec55ba0
|
增加pa/pis系统数据接口；增加pa/pis系统交互逻辑（未完）
|
2022-01-17 14:34:51 +08:00 |
|
|
|
a3648eb642
|
项目域名查询时，未配置的域名不再尝试返回Default项目配置
|
2022-01-07 14:19:56 +08:00 |
|
|
|
9b781d3c12
|
Merge branch 'test' into dev
|
2022-01-05 17:16:15 +08:00 |
|
|
|
2de4d9b089
|
修改二维码url分割符；非测试/正式环境不生成二维码url；补充controller注释
|
2022-01-05 17:16:01 +08:00 |
|
|
|
af23df2ea5
|
修改服务和回调域名
|
2022-01-05 14:10:41 +08:00 |
|
|
|
d0813d027d
|
二维码生成带Project；项目域名配置里增加资源域名
|
2021-12-31 10:35:21 +08:00 |
|
|
|
7b4fad4939
|
修改查询运行中列车接口为仅查询【正线上的列车】
|
2021-12-30 16:49:10 +08:00 |
|
|
|
791a3d3fdf
|
增加构建考试规则后对总分的校验
|
2021-12-28 15:49:44 +08:00 |
|
|
|
ed00c8aa7f
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-28 11:50:17 +08:00 |
|
|
|
c00fbd22b3
|
删除数据处理接口，改用SQL处理数据
|
2021-12-28 11:49:37 +08:00 |
|
|
|
89f6f5ad4d
|
增加校验考试规则接口；增加重新生成系统考试规则接口；增加生成实训后自动校验考试并重新生成系统考试规则逻辑
|
2021-12-28 11:38:45 +08:00 |
|
|
|
cfe232769d
|
修改三维课程对象转换赋值bug
|
2021-12-27 09:12:04 +08:00 |
|
|
|
48a3b8c6cf
|
修改三维课程管理接口逻辑
|
2021-12-24 10:58:27 +08:00 |
|
|
|
5babfecb4c
|
添加三维课程相关管理接口
|
2021-12-24 10:43:55 +08:00 |
|
|
|
421d5c36c0
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-23 17:48:16 +08:00 |
|
|
|
2c4e631b64
|
生成实训后检查考试规则是否符合要求；增加更改考试规则的接口
|
2021-12-23 17:45:06 +08:00 |
|
|
|
06cdf717b1
|
列车运行bug修改
|
2021-12-15 18:17:00 +08:00 |
|
|
|
31bf05101c
|
修改区段道岔失表时道岔区段占用显示异常的问题；修改区段故障的应用和修复逻辑的表述
|
2021-12-15 14:39:30 +08:00 |
|
|
|
d0a380156e
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-15 11:30:36 +08:00 |
|
|
|
9da6d14211
|
加载列车时，如果在站间，增加设置列车的到达、离站信息
|
2021-12-15 11:30:17 +08:00 |
|
Jade
|
bb851f3309
|
转换轨发车时间
|
2021-12-15 09:30:47 +08:00 |
|
|
|
d16909dd2c
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-14 17:47:14 +08:00 |
|
Jade
|
7047768aa9
|
屏蔽门故障只对非CTC进路有效
|
2021-12-14 17:42:08 +08:00 |
|
|
|
4d14cd19fd
|
【站台折返策略不生效】逻辑补全
|
2021-12-14 17:33:55 +08:00 |
|
Jade
|
8c7b9f6f89
|
isUpdateTripPlanByServiceNumber
|
2021-12-14 16:23:09 +08:00 |
|
|
|
4442223dfc
|
修改站台折返策略处理逻辑
|
2021-12-14 16:11:56 +08:00 |
|
|
|
82253f1832
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-14 15:02:52 +08:00 |
|
|
|
f27b86b502
|
添加线路配置
|
2021-12-14 15:02:36 +08:00 |
|
Jade
|
17cade484f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-12-13 17:31:51 +08:00 |
|
Jade
|
11d9c2c421
|
车辆段逻辑
|
2021-12-13 17:31:44 +08:00 |
|
|
|
61fdd4941d
|
统一列车target更新逻辑
|
2021-12-13 17:29:14 +08:00 |
|
|
|
be92513d93
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-13 11:22:11 +08:00 |
|
|
|
b8687f8d40
|
修改机器人驾驶识别信号机bug
|
2021-12-13 11:21:59 +08:00 |
|
Jade
|
6b7a36aeed
|
车辆段逻辑
|
2021-12-13 11:02:48 +08:00 |
|
|
|
690acdba5f
|
列车状态信息增加预选模式
|
2021-12-13 10:38:05 +08:00 |
|
|
|
46acce3f6b
|
处理福州线列车在二十一站左侧折返轨停车会导致提前更换车次问题；机器人驾驶增加识别信号机功能；处理车辆段的列车以备用车方式加载到正线上时因ctc移动授权丢失引起的问题；
|
2021-12-10 11:20:05 +08:00 |
|
|
|
306e91296a
|
运行图检查修改：当前后两车次分别是入库、出库时，无需前者的尾与后者的首相同
|
2021-12-10 10:03:51 +08:00 |
|
|
|
7dab924ae2
|
增加苏安院项目
|
2021-12-09 17:01:00 +08:00 |
|
|
|
f681f3a20f
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-09 16:33:36 +08:00 |
|
|
|
f8b2636355
|
延续保护区段允许选择逻辑区段
|
2021-12-09 16:33:19 +08:00 |
|
Jade
|
52821e1200
|
回库逻辑，加载备用车
|
2021-12-09 15:25:05 +08:00 |
|
xiazengbin
|
c6aa328d1d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test2-xzb-1
|
2021-12-09 14:39:29 +08:00 |
|
xiazengbin
|
3ebab8ed31
|
优化车辆段路径搜索
|
2021-12-09 14:29:24 +08:00 |
|
|
|
fd40f9de78
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-09 13:25:44 +08:00 |
|
|
|
3577f7331b
|
增加【列车到达速度上限后牵引力与阻力持平】逻辑
|
2021-12-09 13:18:34 +08:00 |
|
Jade
|
0a52d4d029
|
显示配置-车次窗车头翻转
|
2021-12-09 10:28:13 +08:00 |
|
Jade
|
ce26b80e6a
|
车辆段 逻辑完善
|
2021-12-08 17:55:07 +08:00 |
|
|
|
edd6279e63
|
Merge branch 'test' into dev
|
2021-12-08 17:06:34 +08:00 |
|
|
|
e6f6421e50
|
Merge branch 'test' into test2
|
2021-12-08 17:06:08 +08:00 |
|
|
|
d557113276
|
修改【使用增加计划功能增加计划时，可能出现既是入库计划又是折返计划情况】的bug
|
2021-12-08 17:05:03 +08:00 |
|
Jade
|
c5eba208ff
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-08 15:46:29 +08:00 |
|
Jade
|
1bf100f117
|
车辆段 出库逻辑
|
2021-12-08 15:46:03 +08:00 |
|
|
|
d9454dced0
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-08 15:41:23 +08:00 |
|
|
|
6372892cdb
|
修改重设车次号逻辑的位置以覆盖生成单条计划的情况
|
2021-12-08 15:41:11 +08:00 |
|
|
|
15f9f69428
|
增加线路配置【运行图中车次号唯一】（影响生成计划的车次号）与相应逻辑
|
2021-12-08 15:40:43 +08:00 |
|
|
|
13a11337dd
|
修改重设车次号逻辑的位置以覆盖生成单条计划的情况
|
2021-12-08 15:31:13 +08:00 |
|
|
|
7fcf48be35
|
增加线路配置【运行图中车次号唯一】（影响生成计划的车次号）与相应逻辑
|
2021-12-08 15:01:17 +08:00 |
|
Jade
|
88e5fa6abb
|
车辆段 派班计划生成调整
|
2021-12-08 13:05:44 +08:00 |
|
|
|
bed44dc77f
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-08 11:01:14 +08:00 |
|
|
|
58cf6af8c7
|
修改ATS逻辑：【计划车到转换轨准备回库时自动转人工车】【有车辆段时回库列车不消失】
|
2021-12-08 11:01:06 +08:00 |
|
Jade
|
2cad9aea15
|
车辆段fix
|
2021-12-08 10:57:35 +08:00 |
|
Jade
|
549e1ef058
|
车辆段排列进路逻辑
|
2021-12-08 10:36:11 +08:00 |
|
Jade
|
4755d9a137
|
车辆段逻辑优化
|
2021-12-07 17:53:53 +08:00 |
|
Jade
|
087a603bc0
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 15:50:24 +08:00 |
|
Jade
|
645bfee559
|
车辆段逻辑
|
2021-12-07 15:50:10 +08:00 |
|
|
|
bc2451cc18
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 15:47:53 +08:00 |
|
|
|
2e09968362
|
修改ZC默认关联的区段筛选bug
|
2021-12-07 15:47:41 +08:00 |
|
xiazengbin
|
cae20aba53
|
车辆段加载route path 添加过滤
|
2021-12-07 15:26:50 +08:00 |
|
Jade
|
2433e7d813
|
车辆段逻辑
|
2021-12-07 11:27:48 +08:00 |
|
Jade
|
bac67b2ebf
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 09:46:03 +08:00 |
|
xiazengbin
|
09b0f92614
|
优化loadDepotInOutRoutePath
|
2021-12-07 09:43:15 +08:00 |
|
xiazengbin
|
578d1fd44a
|
优化loadDepotInOutRoutePath
|
2021-12-07 09:38:44 +08:00 |
|
Jade
|
a834811cab
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 09:24:25 +08:00 |
|
xiazengbin
|
b9a550a6a5
|
优化loadDepotInOutRoutePath
|
2021-12-07 09:12:32 +08:00 |
|
xiazengbin
|
76876c6818
|
Merge remote-tracking branch 'origin/test2' into test2-xzb
|
2021-12-06 18:18:45 +08:00 |
|
xiazengbin
|
eb56128954
|
SimulationBuilder.build中实现加载车辆段route path
|
2021-12-06 18:06:01 +08:00 |
|
Jade
|
7254a02356
|
车辆段逻辑
|
2021-12-06 16:15:12 +08:00 |
|
|
|
dbc3a62b7f
|
Merge branch 'dev' into test2
|
2021-12-06 16:00:15 +08:00 |
|
|
|
ac1e32082c
|
【线路的ZC只有一个】且【ZC没有设置关联区段】时，自动关联全线计轴区段（以前是物理区段）；修改【区段有ZC在工作】的判定为【所属计轴区段有ZC在工作】
|
2021-12-06 15:52:14 +08:00 |
|
|
|
f5c711da90
|
修改岔心所在计轴区段预复位成功后，预复位状态未清除的bug
|
2021-12-06 13:22:48 +08:00 |
|
|
|
2258062e9a
|
列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭
|
2021-12-06 10:31:53 +08:00 |
|
Jade
|
05e0eedb34
|
列车加载到车辆段
|
2021-12-03 17:58:56 +08:00 |
|
|
|
d27df770d6
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-02 13:00:20 +08:00 |
|
|
|
09d423a3f4
|
重启令解实训，背景给车站设置站控；列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭
|
2021-12-02 12:59:54 +08:00 |
|
Jade
|
be7e4f7a83
|
门选零位不给牵引力
|
2021-12-02 10:25:07 +08:00 |
|
|
|
a7acb9929d
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-01 18:29:49 +08:00 |
|
|
|
b054137647
|
生成实训时，用所属集中站过滤车辆段区段
|
2021-12-01 18:29:33 +08:00 |
|
Jade
|
2db15a49a4
|
岔心计轴故障逻辑
|
2021-12-01 18:28:10 +08:00 |
|
|
|
6fafb601d8
|
修改生成实训时，过滤车辆段区段的逻辑；区段状态增加remain
|
2021-12-01 14:09:44 +08:00 |
|
|
|
00ac703598
|
ci增加更新道岔预复位状态逻辑（因道岔计轴区段计轴故障预复位恢复后道岔的预复位状态没有清除掉）；增加【进路内区段有占用时，强解进路区段，延时解锁】；进路联锁条件不满足而延时解锁的道岔失表判定条件修改
|
2021-12-01 13:07:32 +08:00 |
|
|
|
5ea4b7af3e
|
项目域名管理接口修改；生成区段实训时，如果所属计轴区段属于车辆段，跳过
|
2021-11-30 16:28:53 +08:00 |
|
Jade
|
a5f30e905d
|
区段 岔心
|
2021-11-30 14:29:01 +08:00 |
|
Jade
|
d916dc162e
|
计轴受扰 岔心状态
|
2021-11-30 10:29:59 +08:00 |
|
Jade
|
63db1a8564
|
南京二 实训问题处理 岔心占用
|
2021-11-30 09:46:17 +08:00 |
|
|
|
a3d3f86518
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-11-29 17:30:50 +08:00 |
|
|
|
6c5da045f7
|
连锁重启操作交出车站控制权
|
2021-11-29 17:30:30 +08:00 |
|
|
|
9839992d0c
|
Merge branch 'master-huawei' into dev
|
2021-11-29 17:30:00 +08:00 |
|
Jade
|
8c59338df7
|
南京二 实训问题处理
|
2021-11-29 17:09:17 +08:00 |
|
Jade
|
dfcb558cf3
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-29 16:35:11 +08:00 |
|
Jade
|
4705b55aba
|
南京二 实训问题处理
|
2021-11-29 16:34:03 +08:00 |
|
|
|
aaf7582086
|
增加扬工院项目
|
2021-11-29 13:38:31 +08:00 |
|
|
|
fc6683c075
|
修改道岔故障（可恢复）枚举
|
2021-11-26 09:32:12 +08:00 |
|
|
|
bc2d84dfd0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-26 09:25:58 +08:00 |
|
|
|
b7ea3007da
|
修改可恢复失表故障为1次恢复
|
2021-11-26 09:25:46 +08:00 |
|
Jade
|
cbd092b3c6
|
南京二 实训问题处理 岔心
|
2021-11-25 17:47:41 +08:00 |
|
|
|
b97969ab47
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-25 17:19:50 +08:00 |
|
|
|
53726f14fc
|
补全DeviceFault的注解
|
2021-11-25 17:19:40 +08:00 |
|
Jade
|
a9dfb2424a
|
南京二 实训问题处理
|
2021-11-25 14:53:57 +08:00 |
|
Jade
|
18533b2fbc
|
南京二 实训问题处理 - 替代信号机
|
2021-11-25 14:28:38 +08:00 |
|
|
|
5ac9c9ca41
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-11-25 12:10:47 +08:00 |
|
|
|
f7cb5fca15
|
仿真存储数据结构修改、补全
|
2021-11-25 10:06:00 +08:00 |
|
|
|
39ab1f9c0b
|
南京操作
|
2021-11-25 10:05:29 +08:00 |
|
Jade
|
68ebd521d8
|
南京二 实训问题处理
|
2021-11-24 10:46:07 +08:00 |
|
Jade
|
5130b67ddd
|
南京二 实训问题处理
|
2021-11-24 09:36:14 +08:00 |
|
Jade
|
002fca4c64
|
南京二 实训问题处理
|
2021-11-24 09:20:46 +08:00 |
|
Jade
|
8d540769cc
|
南京二 实训问题处理
|
2021-11-23 15:39:46 +08:00 |
|
Jade
|
b49aa0e807
|
南京二 实训问题处理
|
2021-11-23 10:28:45 +08:00 |
|
Jade
|
64e76d7bde
|
南京二 按计划行车问题
|
2021-11-22 16:43:39 +08:00 |
|
Jade
|
513aa73523
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
|
2021-11-22 11:21:43 +08:00 |
|
Jade
|
5169652845
|
南京二 按计划行车问题
|
2021-11-22 11:20:33 +08:00 |
|
|
|
6b16dc6fb4
|
删除查询进路路径方法中，虚拟信号机下的进路只有一条的断言和逻辑
|
2021-11-22 09:36:06 +08:00 |
|
|
|
247da90858
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-11-19 21:01:54 +08:00 |
|
|
|
4ab64ffe1b
|
修改转辙机告警短信发送逻辑
|
2021-11-19 15:04:26 +08:00 |
|
|
|
cfc33cc649
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-11-18 18:59:52 +08:00 |
|
|
|
fce534731a
|
添加用户登录信息清理逻辑
修改在线用户信息查询接口bug
|
2021-11-18 16:14:09 +08:00 |
|
|
|
de74214d67
|
添加短信服务接口和转辙机发送短信告警信息功能
|
2021-11-18 14:33:36 +08:00 |
|
