tiger_zhou
|
94177b2581
|
proto及 rtss cros配置(修改基于boot 2.7)
|
2023-02-22 10:45:37 +08:00 |
|
tiger_zhou
|
c38d4748d5
|
proto及 rtss cros配置(修改基于boot 2.7)
|
2023-02-20 16:58:23 +08:00 |
|
tiger_zhou
|
7ce998f117
|
proto
|
2023-02-20 15:11:07 +08:00 |
|
tiger_zhou
|
822e908562
|
迁移 util
|
2023-02-20 13:11:33 +08:00 |
|
tiger_zhou
|
9dcaeba9ca
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-ncc
Conflicts:
rtss/src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
rtss/src/main/java/club/joylink/rtss/vo/client/mapFunction/RtsMapFunctionDescModifyVO.java
rtss/src/main/java/club/joylink/rtss/vo/training2/draft/UpdateStepReqVo.java
|
2023-02-20 09:29:54 +08:00 |
|
tiger_zhou
|
eb81ea59dc
|
用户登录不显示个人权限
|
2023-02-20 09:25:48 +08:00 |
|
tiger_zhou
|
75a1fa43cc
|
权限时间调整
|
2023-02-17 18:42:02 +08:00 |
|
tiger_zhou
|
f074c4db94
|
权限时间调整
|
2023-02-17 18:16:59 +08:00 |
|
weizhihong
|
5d3a8905c2
|
【单操实训增加组织过滤】【项目过滤无效项目】
|
2023-02-17 17:42:25 +08:00 |
|
weizhihong
|
977834cd4e
|
【分散自律操作模式切换BUG处理】
|
2023-02-17 15:34:47 +08:00 |
|
tiger_zhou
|
c39c661010
|
1
|
2023-02-17 14:49:47 +08:00 |
|
weizhihong
|
eac12826d1
|
【分散自律同意、不同意逻辑处理】
|
2023-02-17 14:21:52 +08:00 |
|
tiger_zhou
|
557a9f7858
|
1
|
2023-02-17 14:00:00 +08:00 |
|
tiger_zhou
|
812c9bd880
|
变更结构
|
2023-02-17 13:57:35 +08:00 |
|
tiger_zhou
|
6ab040d1ba
|
变更结构
|
2023-02-17 13:37:15 +08:00 |
|
tiger_zhou
|
5d009a8ab4
|
变更结构
|
2023-02-17 13:04:48 +08:00 |
|
weizhihong
|
aad3a16d5b
|
【车站控制操作模式BUG处理】
|
2023-02-17 09:56:45 +08:00 |
|
tiger_zhou
|
cb811c3894
|
变更结构
|
2023-02-16 18:05:08 +08:00 |
|
tiger_zhou
|
4264d10744
|
变更结构
|
2023-02-16 17:53:56 +08:00 |
 joylink_zhangsai
|
9f28c2f8ee
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-16 17:30:21 +08:00 |
|
joylink_zhangsai
|
ae801cb061
|
修改机器人驾驶代码使逻辑更清晰，并解决地铁线路站台轨不停车的问题
|
2023-02-16 17:30:00 +08:00 |
|
tiger_zhou
|
fa150fb0b5
|
变更结构
|
2023-02-16 16:41:33 +08:00 |
|
tiger_zhou
|
213e2f8bf3
|
变更结构
|
2023-02-16 15:44:15 +08:00 |
|
tiger_zhou
|
e78cf889d4
|
Merge branch 'test-ncc' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-ncc
|
2023-02-16 15:39:46 +08:00 |
|
tiger_zhou
|
1eba4b7a4e
|
变更结构
|
2023-02-16 15:39:20 +08:00 |
|
weizhihong
|
3cc442b0fa
|
【车站模式申请消息返回格式修改】
|
2023-02-16 14:10:18 +08:00 |
|
weizhihong
|
8cfa715e37
|
【修改实训运行逻辑：只有在场景情况下判断等待时间】
|
2023-02-16 13:33:14 +08:00 |
|
joylink_zhangsai
|
233b1b1ff2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-16 11:13:27 +08:00 |
|
joylink_zhangsai
|
33dc36a6af
|
修改地图功能默认描述；增加批量修改地图功能描述接口
|
2023-02-16 11:12:03 +08:00 |
|
joylink_zhangsai
|
a90b557f0b
|
Merge remote-tracking branch 'origin/test-ncc' into test-ncc
|
2023-02-15 18:35:14 +08:00 |
|
joylink_zhangsai
|
53898cf270
|
添加模块
|
2023-02-15 18:34:32 +08:00 |
|
weizhihong
|
e748120a8d
|
【实训执行逻辑、更新步骤参数修改】
|
2023-02-15 18:13:53 +08:00 |
|
tiger_zhou
|
0e23653da5
|
更改jdk，boot版本，修改配置
|
2023-02-15 18:04:57 +08:00 |
|
weizhihong
|
6689da99ee
|
【区故解延时解锁，增加进路锁闭条件】
|
2023-02-15 17:09:43 +08:00 |
|
joylink_zhangsai
|
cf5b5e8919
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 17:08:02 +08:00 |
|
tiger_zhou
|
963d0e0710
|
考试调整
|
2023-02-15 16:57:43 +08:00 |
|
joylink_zhangsai
|
b409263cf8
|
修改ATS界面开关门操作，使用更直接的逻辑
|
2023-02-15 15:26:47 +08:00 |
|
joylink_zhangsai
|
a45f0a3295
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 14:11:01 +08:00 |
|
joylink_zhangsai
|
7bc7fdeaee
|
地图功能增加bgUrl返回
|
2023-02-15 14:10:44 +08:00 |
|
tiger_zhou
|
db0ba127ed
|
试卷场景分数调整
|
2023-02-15 13:43:16 +08:00 |
|
weizhihong
|
be8c515eea
|
【车站操作模式转换逻辑调整】
|
2023-02-15 12:55:44 +08:00 |
|
joylink_zhangsai
|
55c93799c2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 11:19:36 +08:00 |
|
joylink_zhangsai
|
2f162fdaaa
|
地图功能增加背景图片url；修改ATS界面开关门操作以确保成功
|
2023-02-15 11:19:25 +08:00 |
|
weizhihong
|
ddb5f69705
|
【车站模式操作支持多车站切换】
|
2023-02-15 11:07:22 +08:00 |
|
weizhihong
|
2d59c54f87
|
【模式申请增加超过两分钟直接驳回处理】
|
2023-02-15 10:30:54 +08:00 |
|
joylink_zhangsai
|
5aec3edb8d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 09:54:43 +08:00 |
|
joylink_zhangsai
|
a3846f459b
|
修改列车停站后无法开站台门bug
|
2023-02-15 09:54:30 +08:00 |
|
tiger_zhou
|
6a0a8477f2
|
应急ws调整
|
2023-02-14 17:43:32 +08:00 |
|
joylink_zhangsai
|
6d37169068
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-14 17:33:44 +08:00 |
|
joylink_zhangsai
|
8463e2ff57
|
ATS的开关门操作增加修改门选择逻辑
|
2023-02-14 17:33:32 +08:00 |