|
|
15ec7c7b3b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-05 17:48:54 +08:00 |
|
|
|
8edf518f95
|
客流车站参数管理接口开发
|
2021-03-05 17:46:56 +08:00 |
|
|
|
6ee4d141c9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-05 16:35:31 +08:00 |
|
|
|
6abd8254b6
|
仿真结构抽象(仿真主线程逻辑调整)
虚拟真实设备逻辑开发
|
2021-03-05 16:34:54 +08:00 |
|
|
|
5fa74769c8
|
由于会导致备用车和北京一自动信号机前的列车不能运行，去掉对<未进路锁闭的区段>的检查
|
2021-03-05 14:58:54 +08:00 |
|
|
|
97a3baedb7
|
运行线逻辑完善
|
2021-03-05 13:54:55 +08:00 |
|
|
|
e091dac76a
|
修改cgy留言板数据时间修改接口
|
2021-03-04 21:27:41 +08:00 |
|
|
|
8c9093c530
|
修改cgy留言板数据时间修改接口
|
2021-03-04 21:22:14 +08:00 |
|
|
|
16bd531cd9
|
添加cgy留言板数据时间修改接口
|
2021-03-04 21:07:28 +08:00 |
|
|
|
6b0db15a6d
|
针对成工院修改留言板
|
2021-03-03 21:30:38 +08:00 |
|
|
|
fb7f3fa70c
|
仿真结构抽象(仿真数据仓库抽象，一些逻辑调整)
|
2021-03-03 19:22:31 +08:00 |
|
|
|
e8bb268287
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-03 16:56:50 +08:00 |
|
|
|
8876292193
|
仿真结构抽象(操作分发调整，用户订阅/取消订阅逻辑框架构建，添加固定频率任务接口)
|
2021-03-03 16:56:32 +08:00 |
|
|
|
a397a1c195
|
修改浙大网新停车/发车操作指令
|
2021-03-02 17:29:46 +08:00 |
|
|
|
b02db4209e
|
添加浙大网新停车/发车操作指令
|
2021-03-02 16:02:00 +08:00 |
|
|
|
dd1e5b7705
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-02 13:31:27 +08:00 |
|
|
|
1a5bb58354
|
修改目的地码数据以兼容宁波三运行线逻辑；修改头码车目标到站逻辑；修改列车扣车操作逻辑以兼容浙大网新列车扣车逻辑
|
2021-03-02 13:30:46 +08:00 |
|
DU
|
09298761bf
|
实训修改，教学成绩导出学号修改
|
2021-03-01 19:09:24 +08:00 |
|
DU
|
e3a44e76f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-01 17:36:14 +08:00 |
|
DU
|
4b4b30ad9b
|
下架默认课程不显示
|
2021-03-01 17:36:05 +08:00 |
|
|
|
ada9bc6fd8
|
添加日志
|
2021-03-01 16:41:11 +08:00 |
|
|
|
fe2892dad0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-26 18:45:17 +08:00 |
|
|
|
3265507232
|
仿真结构抽象(操作分发部分实现)
|
2021-02-26 18:44:55 +08:00 |
|
DU
|
0961ec7453
|
组织查询bug
|
2021-02-26 18:37:22 +08:00 |
|
DU
|
411cf5008d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-26 18:07:43 +08:00 |
|
DU
|
3c3a13030f
|
学院账号绑定顶级组织code，账号登陆验证组织绑定项目
|
2021-02-26 18:07:33 +08:00 |
|
|
|
98a6a509d4
|
CGY取消权限校验
|
2021-02-26 14:27:38 +08:00 |
|
DU
|
745a4c2999
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-26 10:49:47 +08:00 |
|
DU
|
825a870d8e
|
课程表加默认字段
|
2021-02-26 10:49:37 +08:00 |
|
|
|
88720cd004
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-26 10:15:24 +08:00 |
|
DU
|
68e9264d60
|
学院名称不显示bug
|
2021-02-25 16:33:02 +08:00 |
|
DU
|
05306ac91c
|
导入学员信息bug
|
2021-02-25 16:24:02 +08:00 |
|
|
|
56f6c82f02
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-25 15:20:56 +08:00 |
|
|
|
029764eb07
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-24 18:45:45 +08:00 |
|
|
|
afdbde3753
|
添加validation依赖，修复@Validated实训问题
添加注册接口（邮箱）
仿真结构抽象
|
2021-02-24 18:45:33 +08:00 |
|
DU
|
e6390321ae
|
控制权限转移修改
|
2021-02-24 18:43:44 +08:00 |
|
|
|
f289618709
|
添加<区段开放/关闭>操作
|
2021-02-24 15:40:47 +08:00 |
|
|
|
aa7e69f7dd
|
设置自动通过进路根据配置设置背景
|
2021-02-24 10:03:30 +08:00 |
|
|
|
cf2e10b9db
|
恢复车站的计轴预复位取消操作
|
2021-02-23 19:43:04 +08:00 |
|
|
|
0db6131fc8
|
添加计轴复位操作并将宁波一的IBP盘复位按钮改为调用此操作
|
2021-02-23 17:10:55 +08:00 |
|
|
|
3d8564ae84
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-23 15:59:37 +08:00 |
|
|
|
a733559ea0
|
强制点灯bug修改
|
2021-02-23 15:59:20 +08:00 |
|
DU
|
8d424521af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-23 14:11:09 +08:00 |
|
|
|
653a37b1a9
|
IBP盘预复位逻辑完善；添加配置；宁波三部分操作添加
|
2021-02-23 14:03:36 +08:00 |
|
DU
|
abc0b200e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java
|
2021-02-23 13:30:48 +08:00 |
|
DU
|
1544add3a7
|
实训修改 泰雷兹跳停操作
|
2021-02-23 13:30:20 +08:00 |
|
|
|
70e60808ac
|
仿真背景保存添加车站的新字段；IBP盘加新按钮类型；IBP盘按按钮接口修改；添加接口查询车站下的区段和地图下的区段
|
2021-02-23 09:50:42 +08:00 |
|
|
|
74c5ba1a2e
|
车站状态发送修改
|
2021-02-22 16:48:24 +08:00 |
|
|
|
d89363e880
|
泰雷兹道岔封锁操作逻辑实现
|
2021-02-22 13:46:49 +08:00 |
|
|
|
71ac99cb50
|
车站预复位字段修改
|
2021-02-22 10:55:55 +08:00 |
|
|
|
b895017e9c
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsStationService.java
|
2021-02-22 10:02:02 +08:00 |
|
DU
|
c3fd300248
|
自动折返现地实训背景bug，站台状态重置修改
|
2021-02-20 16:44:07 +08:00 |
|
DU
|
f3b9ebf4a7
|
车站控制权
|
2021-02-20 15:35:58 +08:00 |
|
|
|
8d218f15bd
|
添加车站预复位操作
|
2021-02-20 14:48:52 +08:00 |
|
DU
|
ede2afc019
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-20 13:40:52 +08:00 |
|
DU
|
b121560787
|
系统扣车，车站授权
|
2021-02-20 13:40:42 +08:00 |
|
|
|
572f4f1b6d
|
添加请求区域控制权(区域选择)相关属性、操作、逻辑；添加泰雷兹<道岔/命令>操作及相关属性、逻辑（未完）
|
2021-02-20 13:34:25 +08:00 |
|
|
|
0a84cbb690
|
对未锁闭的区段执行区故解去掉报错
|
2021-02-19 14:01:48 +08:00 |
|
|
|
71ddb49505
|
列车模型数据修改；添加<办理引导前是否需要信号机接近锁闭>配置项；人解引导进路时走取消引导逻辑
|
2021-02-19 13:16:28 +08:00 |
|
|
|
8ce8504521
|
订单创建类添加以分为单位的价格；列车添加运行类型；修改<全站取消自动通过进路功能无效>bug；倒车限速改为5km/h
|
2021-02-19 09:44:18 +08:00 |
|
|
|
e2bd029771
|
仿真结构抽象
|
2021-02-18 18:26:55 +08:00 |
|
|
|
bec904c711
|
Revert "改用华为语音识别服务"
This reverts commit c977e4c9
|
2021-02-18 11:33:04 +08:00 |
|
|
|
321605663f
|
Merge branch 'nb1' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
|
2021-02-18 11:31:04 +08:00 |
|
|
|
a3b89f9125
|
设置/取消强制点灯操作合并
|
2021-02-18 11:29:57 +08:00 |
|
|
|
d96e44f896
|
仿真子系统添加<运行图编制工作站>；<新建单位rootId字段没有值>bug修改
|
2021-02-18 11:10:14 +08:00 |
|
|
|
983cff6af8
|
Merge branch 'restruct' into test
# Conflicts:
# src/main/java/club/joylink/rtss/services/ISysUserService.java
# src/main/java/club/joylink/rtss/services/SysUserService.java
|
2021-02-18 10:33:27 +08:00 |
|
|
|
e37ee81e86
|
微信支付回调接口修改
|
2021-02-18 09:08:38 +08:00 |
|
|
|
8e3a551ab4
|
一个小失误
|
2021-02-05 18:09:00 +08:00 |
|
|
|
c977e4c90d
|
改用华为语音识别服务
|
2021-02-05 18:06:11 +08:00 |
|
|
|
7c259ce136
|
针对宁波一问题的修改
|
2021-02-05 18:04:40 +08:00 |
|
|
|
6435f5f844
|
客流策略计算频率注释恢复
|
2021-02-05 17:42:06 +08:00 |
|
|
|
e65005a61a
|
客流策略指标定义修改，新指标计算逻辑实现
|
2021-02-05 17:41:33 +08:00 |
|
|
|
5081c580ec
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 16:42:07 +08:00 |
|
|
|
f3411c77c4
|
修改ATS进路触发办理折返处判断逻辑bug
|
2021-02-05 16:41:52 +08:00 |
|
DU
|
68041fa54b
|
实训修改
|
2021-02-05 15:14:56 +08:00 |
|
|
|
eb6d51c22b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 13:37:28 +08:00 |
|
|
|
e37fa24c31
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-05 13:37:18 +08:00 |
|
|
|
55449d3a67
|
修改站间运行时间计算预计离开时间有时空指针的bug
|
2021-02-05 09:51:48 +08:00 |
|
|
|
d9f9ce640e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 09:50:25 +08:00 |
|
|
|
a87ca75d37
|
修改站间运行时间计算预计离开时间有时空指针的bug
|
2021-02-05 09:50:13 +08:00 |
|
DU
|
38fd5a14a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-04 18:33:55 +08:00 |
|
DU
|
6f17bc3089
|
drawWay字段删除，数据库同步删除
|
2021-02-04 18:33:46 +08:00 |
|
|
|
33ade9bc31
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-04 18:25:22 +08:00 |
|
|
|
5f8c2039c5
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 18:14:22 +08:00 |
|
|
|
51e88d488d
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-04 18:14:08 +08:00 |
|
|
|
3f35c48cb3
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 18:02:28 +08:00 |
|
|
|
5695af9fac
|
客流消息添加单独订阅路径
客流订阅事件处理
客流计算逻辑调整-跳停考虑跳站规则
策略消息推送对象修改
|
2021-02-04 18:02:11 +08:00 |
|
|
|
64e71ed9ea
|
线段加俩参数
|
2021-02-04 17:55:50 +08:00 |
|
|
|
0e8e394d04
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 17:39:59 +08:00 |
|
|
|
e0b6209e91
|
封锁信号机时去掉重复封锁逻辑
|
2021-02-04 17:39:51 +08:00 |
|
DU
|
74dd554a9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-04 17:27:05 +08:00 |
|
DU
|
1635c356ed
|
实训补充修改
|
2021-02-04 17:26:53 +08:00 |
|
|
|
06e3ab8b6e
|
移动授权终点添加<未锁闭或延时解锁的区段>；延时解锁进路的始端信号机重开时取消延时解锁；取消进路后，始端信号机锁闭进路字段置为null
|
2021-02-04 17:18:15 +08:00 |
|
|
|
40791540e2
|
添加<ATS自动调整运行>配置
|
2021-02-04 11:10:56 +08:00 |
|
|
|
cc9aba942c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 18:35:32 +08:00 |
|
|
|
ee2922f84a
|
泰雷兹操作（未测试）；边缘车站可以跳停；进路延时解锁时无法取消进路；根据运行时间计算ATO速度逻辑修改
|
2021-02-03 18:34:40 +08:00 |
|
|
|
54c5ec595c
|
空指针异常屏蔽
|
2021-02-03 18:24:30 +08:00 |
|
|
|
f843b9ace0
|
修改停站时间计算和站间运行时间计算逻辑
修改ATS进路排列触发——折返计划与出库计划冲突bug
|
2021-02-03 16:28:53 +08:00 |
|
|
|
e9d03da5e0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 14:49:42 +08:00 |
|
|
|
546f558397
|
添加仿真延时任务对象和逻辑
|
2021-02-03 14:48:48 +08:00 |
|
