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 |
|
|
|
4f950543dd
|
用戶连接司机视角后发送一次列车完整hmi数据，否则第一次进司机视角列车状态显示不正确
|
2021-01-11 16:37:42 +08:00 |
|
|
|
2618913522
|
修改<从发布地图新建草稿没有复制目的地码数据>bug
|
2021-01-11 11:27:28 +08:00 |
|
|
|
f5f8df1e28
|
苏电院初始化时关闭响铃
|
2021-01-10 20:35:40 +08:00 |
|
|
|
cbde7f7e40
|
苏电院真实设备逻辑修改
|
2021-01-10 16:23:31 +08:00 |
|
|
|
f9a541f492
|
Revert "单位部门成员数据管理关联课程考试"
This reverts commit c6f0df8b
|
2021-01-09 20:16:18 +08:00 |
|
|
|
537d2a68f5
|
Revert "默认课程考试不分是否所属单位始终展示"
This reverts commit 5d65b4d5
|
2021-01-09 20:15:50 +08:00 |
|
|
|
6caf775a8e
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-01-09 19:51:21 +08:00 |
|
|
|
1d3409fb45
|
苏电院修改响铃时长
|
2021-01-09 19:47:54 +08:00 |
|
|
|
f49d344553
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-09 19:26:57 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
39482d6b1d
|
苏电院屏蔽门调试
|
2021-01-05 17:47:55 +08:00 |
|
|
|
fa376fdfa3
|
Merge branch 'test' into restruct
|
2021-01-04 18:23:51 +08:00 |
|
|
|
c94ad846ce
|
仿真真实设备模拟逻辑开发
|
2021-01-04 18:22:14 +08:00 |
|
|
|
df1f83c789
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-31 18:23:58 +08:00 |
|
|
|
13cc8e9bf8
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 18:23:23 +08:00 |
|
|
|
50fb1fc564
|
仿真抽象
|
2020-12-31 18:22:58 +08:00 |
|
|
|
7fad4fd3ae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/rtss/wechat/MiniProgramAccessTokenManager.java
# src/main/java/club/joylink/rtss/wechat/MiniProgramServiceImpl.java
|
2020-12-31 18:21:41 +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 |
|
|
|
f473304fe6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 16:30:17 +08:00 |
|
|
|
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 |
|
|
|
0a53d304aa
|
导入导出添加ISCS数据
|
2020-12-31 09:53:03 +08:00 |
|
|
|
57c9fcc04f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 16:52:38 +08:00 |
|
|
|
eadc8ccc8c
|
删除用户配置表数据库相关对象和相关接口
|
2020-12-30 16:51:50 +08:00 |
|
|
|
a25e3dc6f2
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 16:18:02 +08:00 |
|
|
|
6cac955c4c
|
国赛场景添加权限控制
|
2020-12-30 16:17:51 +08:00 |
|
|
|
9aa83aab76
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-30 14:39:11 +08:00 |
|
|
|
9426e4ddeb
|
修改微信服务获取token接口调用
|
2020-12-30 14:38:51 +08:00 |
|
|
|
21406a1726
|
修改文件上传路径
|
2020-12-30 14:37:19 +08:00 |
|
|
|
4127d7d58b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 11:00:58 +08:00 |
|
|
|
d93934d9da
|
修改微信服务获取token接口调用
|
2020-12-30 11:00:27 +08:00 |
|
DU
|
ae12063980
|
试卷定义列表名称查询bug修改
|
2020-12-30 10:58:25 +08:00 |
|
|
|
7dd24fd938
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 10:42:52 +08:00 |
|
|
|
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 |
|
|
|
0bc894d2b9
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-30 09:18:32 +08:00 |
|
|
|
8161216321
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:17:37 +08:00 |
|
|
|
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 |
|
|
|
2e2d58d992
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-29 18:39:20 +08:00 |
|
|
|
4628dc3fcb
|
修改小程序access_token获取
|
2020-12-29 18:37:29 +08:00 |
|
|
|
3d7fd9a5c2
|
抽象仿真，重构
|
2020-12-29 18:34:10 +08:00 |
|
|
|
07252b5fea
|
修改小程序access_token获取
|
2020-12-29 18:30:50 +08:00 |
|
DU
|
c9c4c20da9
|
修改运行图绘制bug
|
2020-12-29 18:19:59 +08:00 |
|
|
|
d50431919c
|
ISCS复制接口修改
|
2020-12-29 17:08:43 +08:00 |
|
|
|
78e222b297
|
实训生成bug修改
|
2020-12-29 13:59:18 +08:00 |
|
|
|
a5326da09c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-29 10:31:40 +08:00 |
|
|
|
3b811d1d40
|
发布的ibp、iscs数据管理；ibp紧急停车bug修改
|
2020-12-29 10:31:24 +08:00 |
|
|
|
b4c3e458f0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-28 14:33:56 +08:00 |
|
|
|
34fc686f4d
|
仿真列车出库时间调整为提前5分钟
列车折返进路办理添加是否存在冲突出库计划判断
|
2020-12-28 14:33:35 +08:00 |
|
|
|
7a45660493
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-28 13:58:20 +08:00 |
|
|
|
2fb256cf0e
|
ibp紧急停车按钮逻辑
|
2020-12-28 13:58:00 +08:00 |
|
DU
|
a8e2e0afaf
|
宁波三-两运行图导入修改；
指令定义分页查询增加仿真角色条件
|
2020-12-25 14:27:30 +08:00 |
|
|
|
f8abb9eddc
|
代码格式化
|
2020-12-25 09:01:43 +08:00 |
|
|
|
db657689bf
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-24 18:46:16 +08:00 |
|
|
|
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 |
|
|
|
c61ac54e2b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-23 09:13:32 +08:00 |
|
|
|
aab1348b33
|
商品更新bug修改
|
2020-12-22 18:19:43 +08:00 |
|
DU
|
0c343028b2
|
添加清空运行图车次数据
|
2020-12-22 16:31:14 +08:00 |
|
DU
|
284aeadb67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-22 15:11:48 +08:00 |
|
DU
|
a56448403d
|
平移单个服务计划
|
2020-12-22 15:11:35 +08:00 |
|
|
|
6c5713bfda
|
删除<RM模式下触发EB不生效>逻辑
|
2020-12-22 14:21:07 +08:00 |
|
|
|
ac22b5c8c7
|
列车添加<控制杆拉到快速制动位可以缓解信号EB>逻辑
|
2020-12-22 14:13:21 +08:00 |
|
|
|
52d0218305
|
留言板管理增加编辑功能
|
2020-12-22 13:47:37 +08:00 |
|
|
|
01b39f4129
|
运行至前方站步骤参数修改
|
2020-12-22 13:25:52 +08:00 |
|
|
|
730e245985
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-22 13:21:24 +08:00 |
|
|
|
da35d772bd
|
zc故障不停车bug修改；运行至前方站指令流程修改
|
2020-12-22 13:20:46 +08:00 |
|
DU
|
1a7deb1c0c
|
仿真操作异常添加提示
|
2020-12-22 10:55:21 +08:00 |
|
|
|
fbd2d01e07
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 22:27:02 +08:00 |
|
|
|
794d8a0a0a
|
联锁机故障取消逻辑调整（哈尔滨）
|
2020-12-21 22:24:56 +08:00 |
|
|
|
3dd75b34c2
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 22:15:26 +08:00 |
|
|
|
e3cee9cfbe
|
联锁机故障（哈尔滨）
|
2020-12-21 22:14:43 +08:00 |
|
|
|
57809890c8
|
办理过的进路不再办理
|
2020-12-21 19:01:02 +08:00 |
|
|
|
7e9ec11e76
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 18:41:57 +08:00 |
|
|
|
e7114802cb
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 17:59:56 +08:00 |
|
|
|
5ea8b122eb
|
ATS进路排列逻辑，已经或正在排列的进路不再重复排列
|
2020-12-21 17:59:42 +08:00 |
|
|
|
daf2d16cb7
|
仿真背景增加字段
|
2020-12-21 16:55:03 +08:00 |
|
DU
|
4353dd014e
|
导入运行图异常断言bug修复
|
2020-12-21 13:04:35 +08:00 |
|
DU
|
301ed565d1
|
个人停站时间数据判重逻辑修改
|
2020-12-21 09:16:18 +08:00 |
|
|
|
ab8fa3c3c0
|
修改华为正式数据库路径配置
|
2020-12-20 10:55:09 +08:00 |
|
|
|
c36f7ab639
|
调整查询进路路径计算逻辑
修改列车站台控制逻辑兼容无出站信号机站台
修改其他发现bug
|
2020-12-19 22:29:44 +08:00 |
|
|
|
d8f15148c8
|
哈尔滨问题去掉多余修改
|
2020-12-18 21:53:40 +08:00 |
|
|
|
744f446b56
|
哈尔滨问题修改
|
2020-12-18 21:47:20 +08:00 |
|
|
|
3b8b79e9e6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 21:46:45 +08:00 |
|
|
|
8a3ab0fc25
|
修改本地打包配置
|
2020-12-17 21:46:26 +08:00 |
|
|
|
b18ad86fc6
|
Revert "仿真运行中前后车次间隔时间不连续时需等待发车"
This reverts commit 5248236d
|
2020-12-17 20:42:09 +08:00 |
|
|
|
f0ef8308f1
|
贵装备查询默认课程bug修改
|
2020-12-17 18:45:28 +08:00 |
|
|
|
ff8427781b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 18:23:09 +08:00 |
|
|
|
0cd9867530
|
哈尔滨问题：日志、信号机灯丝熔断故障
|
2020-12-17 18:22:55 +08:00 |
|
DU
|
5248236d7d
|
仿真运行中前后车次间隔时间不连续时需等待发车
|
2020-12-17 17:40:49 +08:00 |
|
DU
|
5d94ef018a
|
课程重新发布覆盖之前关联的班级关系；
地图基础数据：绘图元素 Text Line OutFrame 都加个 stationCode 参数
|
2020-12-17 15:18:00 +08:00 |
|
|
|
252a9ec9ed
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 15:01:18 +08:00 |
|
|
|
b572151bc4
|
留言板管理功能
|
2020-12-17 14:58:19 +08:00 |
|
|
|
407b123162
|
<删除考试>报错信息修改
|
2020-12-17 14:57:16 +08:00 |
|
|
|
fe9e9c18d5
|
删除考试报错信息修改
|
2020-12-17 11:23:46 +08:00 |
|
|
|
b05336cee7
|
开始考试bug修改
|
2020-12-17 10:44:16 +08:00 |
|
DU
|
4c8c75fdb2
|
默认课程可重新发布且贵装备学生查询默认课程修改
|
2020-12-17 09:36:34 +08:00 |
|
DU
|
a8a0450093
|
修改编制计划bug
|
2020-12-16 18:29:13 +08:00 |
|
DU
|
2a77963a17
|
客流不变化仿真不变
|
2020-12-16 16:44:06 +08:00 |
|
DU
|
a482b24299
|
ibp盘加通用数据
|
2020-12-16 16:07:33 +08:00 |
|
DU
|
bf2bfe919b
|
修改sql
|
2020-12-16 13:59:35 +08:00 |
|
DU
|
14fdf7cfb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-16 13:17:53 +08:00 |
|
DU
|
2a621e816d
|
客流数据切换，目前未关联对应车次运行图
|
2020-12-16 13:17:44 +08:00 |
|
|
|
99eab1c0d9
|
仿真日志添加注解
|
2020-12-16 13:11:59 +08:00 |
|
|
|
cd08b456fe
|
站间分割对象添加显示条件
|
2020-12-16 11:24:00 +08:00 |
|
|
|
747358df0d
|
仿真记录操作日志
|
2020-12-16 11:12:14 +08:00 |
|
|
|
a8214ae152
|
生成目的地码逻辑修改
|
2020-12-16 11:03:22 +08:00 |
|
|
|
d0b9c4e114
|
仿真基础信息中加入运行图基本信息，前端根据运行图信息做缓存
|
2020-12-16 09:17:54 +08:00 |
|
|
|
8a737f5af4
|
方法名修改
|
2020-12-15 14:11:09 +08:00 |
|
|
|
8fccb0b712
|
mapInfo批量插入添加version字段
|
2020-12-15 14:06:52 +08:00 |
|
|
|
d266d3a6bc
|
修改方法名
|
2020-12-15 10:15:37 +08:00 |
|
|
|
64c6261939
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 20:19:58 +08:00 |
|
|
|
01f10737cf
|
生成本地用户接口调整，直接获取本地所有地图权限10个
直接获取地图权限接口删除组织逻辑
|
2020-12-14 19:41:48 +08:00 |
|
|
|
0459d0facc
|
gzb查询默认课程bug修改
|
2020-12-14 19:40:43 +08:00 |
|
|
|
d33798184d
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 18:05:48 +08:00 |
|
|
|
06d340a72c
|
本地导入bug修改
|
2020-12-14 18:05:15 +08:00 |
|
|
|
f74d379ed9
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 17:16:19 +08:00 |
|
|
|
f2bea7bed0
|
<一键创建项目下所有地图的权限分发>接口自动给没有权限的地图生成权限
|
2020-12-14 17:16:04 +08:00 |
|
DU
|
565c5ee466
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-14 17:10:12 +08:00 |
|
DU
|
02288c9301
|
班级学生也显示默认课程
|
2020-12-14 17:10:01 +08:00 |
|
|
|
4e5cd4dce4
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 16:41:00 +08:00 |
|
|
|
98ec6a2453
|
添加<一键创建项目下所有地图的权限分发>接口
|
2020-12-14 16:28:56 +08:00 |
|
|
|
f1ed0d632f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 14:41:58 +08:00 |
|
|
|
9cfab25c4d
|
修改TDT消息变化采集bug
|
2020-12-14 14:41:42 +08:00 |
|
DU
|
d2d4b2deef
|
添加运行图有效性检查
|
2020-12-14 14:13:08 +08:00 |
|
DU
|
b169974ccf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-14 13:19:05 +08:00 |
|
DU
|
24ece695d2
|
查询用户交路bug
|
2020-12-14 13:18:57 +08:00 |
|
|
|
5ba18b5061
|
仿真基础信息添加错误消息列表
|
2020-12-14 13:14:55 +08:00 |
|
|
|
43183365cf
|
项目地图查询根据order_number排序
|
2020-12-11 21:51:13 +08:00 |
|
|
|
9da15bf9f9
|
发布地图分页查询添加按id排序
|
2020-12-11 21:22:42 +08:00 |
|
|
|
806d6c6e67
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-11 17:49:31 +08:00 |
|
|
|
b552d94f38
|
恢复<查询销售人员>接口
|
2020-12-11 17:49:16 +08:00 |
|
DU
|
28170a5c4c
|
删除冗余代码
|
2020-12-11 15:37:48 +08:00 |
|
DU
|
f9fc629889
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-11 15:33:29 +08:00 |
|
DU
|
ea90bc3d8b
|
通用单一环路平稳运行图
|
2020-12-11 15:33:16 +08:00 |
|
|
|
ba2d75c0c0
|
添加配置<当进路的区段占用时不排列进路>
|
2020-12-11 15:31:45 +08:00 |
|
|
|
9911d0e109
|
运行图加载计划查询bug修改
|
2020-12-11 13:37:38 +08:00 |
|
|
|
3cd7d4f58d
|
联锁生成进路bug修改
|
2020-12-11 11:07:48 +08:00 |
|
|
|
eaf72d9b54
|
运行图加载计划只查有效的地图
|
2020-12-11 10:32:41 +08:00 |
|
|
|
5c41dae39b
|
<发布地图根据线路查询无效>bug修改
|
2020-12-11 09:58:49 +08:00 |
|
|
|
b1e4191cea
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-11 09:55:34 +08:00 |
|
|
|
dbe2f83432
|
联锁数据生成添加<目的地码生成>，去掉<交路数据生成>；头码车逻辑兼容新目的地码数据；剧本保存添加头码车路径；<筛选头码车需要排列的进路>逻辑修改；<将计划车设为头码车不生效（西安二）>逻辑注掉
|
2020-12-11 09:55:15 +08:00 |
|
|
|
4d01d007d5
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-11 09:12:38 +08:00 |
|
|
|
c40fea8010
|
添加项目
|
2020-12-11 09:12:10 +08:00 |
|
DU
|
3e6bd50e11
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-10 18:46:24 +08:00 |
|
DU
|
5e0b042511
|
生成计划折返时间设置
|
2020-12-10 18:46:16 +08:00 |
|
|
|
98462a479f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-10 18:17:22 +08:00 |
|
|
|
c6fff22312
|
添加三维站台TDT状态收集发送
|
2020-12-10 18:17:10 +08:00 |
|
DU
|
38149a54dc
|
生成多个同运营路线服务计划
|
2020-12-10 17:57:13 +08:00 |
|
|
|
6f09c205b0
|
修改ATS自动触发进路bug
|
2020-12-10 17:24:10 +08:00 |
|
|
|
3e11fe642a
|
添加根据加载计划复制到指定地图功能接口
|
2020-12-10 15:55:41 +08:00 |
|
|
|
1924deac9c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-10 15:39:01 +08:00 |
|
|
|
2d3a2f25ee
|
添加根据地图一键领权限功能
|
2020-12-10 15:38:41 +08:00 |
|
|
|
465ceed601
|
修改进路延续保护重新锁闭条件判断逻辑
|
2020-12-10 13:58:19 +08:00 |
|
|
|
b1db9d64f8
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-09 19:20:33 +08:00 |
|
|
|
498d2b3079
|
进路是否直向进路判断逻辑修改——取消延续保护的判断
|
2020-12-09 19:19:44 +08:00 |
|
DU
|
14f4a94c58
|
补充提交
|
2020-12-09 16:56:44 +08:00 |
|
DU
|
0590008813
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-09 16:52:38 +08:00 |
|
DU
|
468d641a1f
|
运行图根据出入库及环路生成单个计划数据
|
2020-12-09 16:52:29 +08:00 |
|
|
|
c802b2115f
|
列车站间运行速度控制删除站台时间考虑
列车停站时间逻辑微调
列车区间通信故障然后恢复进路锁闭光带缺失问题修复
|
2020-12-09 13:30:40 +08:00 |
|
|
|
8500f89b5c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-08 19:32:27 +08:00 |
|
|
|
b148976759
|
修改列车停站时间计算逻辑
修改列车站台停车关门时机逻辑
修改ITC移动授权计算位置为信号机前5米
修改ATS进路触发西门子类进路bug，修改折返进路触发时机
修改备用车更新车次时机
修改进路延续保护解锁bug
|
2020-12-08 19:32:12 +08:00 |
|
|
|
9562c726e3
|
仿真使用情况记录
|
2020-12-08 11:23:35 +08:00 |
|
|
|
15166c7fbd
|
Merge branch 'master' into test
|
2020-12-07 19:23:22 +08:00 |
|
|
|
29875967a6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-07 15:27:01 +08:00 |
|
|
|
ad822784d5
|
仿真数据校验bug修改
|
2020-12-07 15:26:32 +08:00 |
|
|
|
fcea49db2b
|
客流添加列车PIS消息
|
2020-12-07 14:55:03 +08:00 |
|
|
|
90ba9c9696
|
用户管理分页查询sql bug修改
|
2020-12-07 10:40:52 +08:00 |
|
|
|
a7a58a5abc
|
Merge remote-tracking branch 'origin/test'
|
2020-12-04 20:59:29 +08:00 |
|
|
|
f73148c5a3
|
生成实训不删除用户考试数据
|
2020-12-04 20:58:08 +08:00 |
|
|
|
cbdb41ac0d
|
Merge remote-tracking branch 'origin/test'
|
2020-12-04 20:12:38 +08:00 |
|
|
|
b4876fa189
|
生成课程、考试时：如果课程下有试卷，不生成试卷；如果没有试卷，生成默认试卷
|
2020-12-04 20:10:58 +08:00 |
|
|
|
64f5ec3d7b
|
接收/交出控制权：整个集中站范围内的车站一起
|
2020-12-04 17:06:30 +08:00 |
|
|
|
712b08d450
|
用户管理界面更新用户信息bug修改
|
2020-12-03 19:57:26 +08:00 |
|
|
|
e799f3c5da
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# sql/20201203.sql
# src/main/java/club/joylink/rtss/services/training/generatornew/base/SignalGeneratorNew.java
|
2020-12-03 19:22:24 +08:00 |
|
|
|
d4e31b01e0
|
用户和单位
|
2020-12-03 19:19:24 +08:00 |
|
|
|
ea86955e6f
|
引导进路办理实训不生成
|
2020-12-03 19:18:13 +08:00 |
|
DU
|
b2f6c6a71d
|
实训bug相关修改
|
2020-12-03 11:01:50 +08:00 |
|
|
|
2eb8da551d
|
贵州装备导入学生自动给权限（一年，由赵杰分发）
|
2020-12-02 18:34:43 +08:00 |
|
|
|
fd869b3ed7
|
公司添加管理者逻辑bug修改
|
2020-12-02 16:09:33 +08:00 |
|
|
|
708ffdeb3c
|
公司查询逻辑bug修改
|
2020-12-02 15:34:05 +08:00 |
|
|
|
16946294a1
|
添加公司管理员
|
2020-12-02 12:03:30 +08:00 |
|
DU
|
f74b5822ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-02 09:39:13 +08:00 |
|
DU
|
5c257f5745
|
用户查询增加单位项
|
2020-12-02 09:39:04 +08:00 |
|
|
|
b72588b6ab
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-01 19:05:58 +08:00 |
|
|
|
ed00cee495
|
联锁生成逻辑——侧防数据生成逻辑开发（未完成）
|
2020-12-01 19:05:40 +08:00 |
|
DU
|
083ba77f99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-01 18:36:13 +08:00 |
|
DU
|
f2a137379b
|
导入试题提示修改
|
2020-12-01 18:36:04 +08:00 |
|
|
|
7fe6e84da3
|
微信小程序code过期错误类型修改
|
2020-12-01 14:24:09 +08:00 |
|
|
|
dbfd391799
|
分页查询用户信息添加单位名称字段
|
2020-11-30 17:51:22 +08:00 |
|
|
|
5eddc4d8e0
|
《实训生成时，未根据prdType筛选》bug修改（考试开始的bug同时消除）；开始考试效率优化
|
2020-11-30 17:12:54 +08:00 |
|
|
|
bbeaa73c14
|
添加根据地图查绘图数据接口
|
2020-11-27 18:13:38 +08:00 |
|
|
|
ab03faa02b
|
根据mapId获取地图数据接口修改
|
2020-11-27 17:49:24 +08:00 |
|
|
|
f564935c40
|
理论题导入bug修改
|
2020-11-27 17:18:23 +08:00 |
|
|
|
34c1616a4c
|
理论题导入bug修改
|
2020-11-27 17:00:52 +08:00 |
|
|
|
5d743425e5
|
生成课程速度优化
|
2020-11-27 16:11:05 +08:00 |
|
|
|
91e23f39fc
|
信号机自排关和进路自动触发实训生成逻辑分开
|
2020-11-27 15:06:02 +08:00 |
|
|
|
76df1f7cd0
|
Merge branch 'training-bug' into test
|
2020-11-27 14:11:28 +08:00 |
|
|
|
788988a3e6
|
添加客流视图开关及通信流程
|
2020-11-27 14:04:22 +08:00 |
|
|
|
f2ad219264
|
实训生成bug修改；课程&考试生成去掉没有实训的章节
|
2020-11-27 13:16:20 +08:00 |
|
|
|
a2ca5c5981
|
信号总取消操作修改；课程查询逻辑修改
|
2020-11-26 19:03:32 +08:00 |
|
|
|
ac6a2750df
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:18:32 +08:00 |
|
|
|
0afb167ca7
|
语音文件添加类型
|
2020-11-26 18:18:17 +08:00 |
|
|
|
215a6bafd0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:10:32 +08:00 |
|
|
|
9e4d63f3c2
|
仿真websocket订阅重构，同时修复仿真上线/下线事件逻辑，应该不会再出现进入大屏再关闭大屏标签页导致用户下线继而导致仿真销毁问题
仿真抽象对象添加抽象仿真用户
|
2020-11-26 18:10:16 +08:00 |
|
|
|
5892cad910
|
语音文件上传保存bug修改
|
2020-11-26 14:16:21 +08:00 |
|
|
|
13ddd0f01a
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 13:49:04 +08:00 |
|
|
|
ed6c7809ac
|
语音识别的文件保存的bug修改；本地部署的导入导出修改（未测试）
|
2020-11-26 13:48:48 +08:00 |
|
|
|
a6e8c3cc49
|
删除无用线程池配置，修改使用线程池核心数量
|
2020-11-26 13:35:24 +08:00 |
|
|
|
6292dee955
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 09:34:56 +08:00 |
|
|
|
b303ec5694
|
迁移微信接口消息转换器和配置
|
2020-11-26 09:34:39 +08:00 |
|
|
|
ab2270cc99
|
语音文件上传bug修改
|
2020-11-25 19:31:31 +08:00 |
|
|
|
d2ec25cfb0
|
语音文件上传正式
|
2020-11-25 18:26:15 +08:00 |
|
|
|
de5fa9030f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-25 16:38:27 +08:00 |
|
|
|
5cd012cc66
|
实训流程修改&贵装备课程查询逻辑修改
|
2020-11-25 16:38:17 +08:00 |
|
|
|
d9eb31e884
|
地图数据保存历史版本相关功能修正
|
2020-11-25 11:05:39 +08:00 |
|
|
|
2d6b93009b
|
修改信号机生成实训逻辑——兼容哈尔滨操作
抽象仿真对象添加移除任务功能
|
2020-11-25 10:57:27 +08:00 |
|
|
|
fbaadf8ae8
|
删除地图版本xml文件
|
2020-11-24 19:06:09 +08:00 |
|
|
|
8b1f35406f
|
实训一键生成bug修改
|
2020-11-24 15:17:26 +08:00 |
|
|
|
3b7dcaeada
|
Merge branch 'master' into test
|
2020-11-24 14:33:43 +08:00 |
|
|
|
04d44bab3e
|
地图数据版本相关（记录、更新等）（导入导出和其它一些用的地图数据的地方还没做处理）
|
2020-11-24 13:04:37 +08:00 |
|
|
|
f05737ca56
|
task移植
|
2020-11-23 19:23:42 +08:00 |
|
|
|
94a59c86a9
|
Merge remote-tracking branch 'origin/master'
|
2020-11-23 17:00:00 +08:00 |
|
|
|
590f36e4ce
|
用户仿真统计接口迁移
|
2020-11-23 16:58:53 +08:00 |
|
|
|
ec806b5780
|
添加构建文件
|
2020-11-20 17:23:55 +08:00 |
|
|
|
6dc2e56d4c
|
文件/代码，删除/位置调整
|
2020-11-20 14:42:46 +08:00 |
|
|
|
9114e56582
|
监听器和语音识别bug修改
|
2020-11-20 13:04:27 +08:00 |
|
|
|
132246ae49
|
报错消除
|
2020-11-20 09:07:46 +08:00 |
|
|
|
248413ef2e
|
追commit
|
2020-11-19 19:53:12 +08:00 |
|
|
|
5552022eb8
|
bug修改
|
2020-11-19 19:20:50 +08:00 |
|
|
|
cfa404807c
|
Merge remote-tracking branch 'origin/master'
|
2020-11-19 19:08:19 +08:00 |
|
|
|
3fffeaa6d6
|
报错消除（完）
|
2020-11-19 19:08:03 +08:00 |
|
|
|
efc94c813f
|
轨道交通项目迁出问题修改6(日志配置修改)
|
2020-11-19 19:06:53 +08:00 |
|
|
|
0a066a3f95
|
轨道交通项目迁出问题修改5(数据库访问修改)
|
2020-11-19 18:28:54 +08:00 |
|
|
|
1073fc66b6
|
轨道交通项目迁出问题修改4(可以启动了)
|
2020-11-19 18:12:24 +08:00 |
|
|
|
413a2c2b94
|
报错消除（未完）
|
2020-11-19 17:56:12 +08:00 |
|
|
|
bcc570afe9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/rtss/services/MessagePushService.java
# src/main/java/club/joylink/rtss/services/draftData/DraftIbpServiceImpl.java
# src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java
# src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java
# src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java
|
2020-11-19 17:33:08 +08:00 |
|
|
|
88e49ce5b0
|
报错消除（未完）
|
2020-11-19 17:31:26 +08:00 |
|
|
|
3495375246
|
轨道交通项目迁出问题修改3
|
2020-11-19 17:28:47 +08:00 |
|
|
|
4f0dd338dd
|
轨道交通项目迁出问题修改2
|
2020-11-19 16:58:43 +08:00 |
|
|
|
d761ef143b
|
报错消除（未完）
|
2020-11-19 15:59:53 +08:00 |
|
|
|
4598550fb3
|
轨道交通项目迁出问题修改
|
2020-11-19 15:13:06 +08:00 |
|
|
|
d1b2d4fde0
|
Merge remote-tracking branch 'origin/master'
|
2020-11-19 13:58:44 +08:00 |
|
|
|
9774912108
|
轨道交通项目迁出问题修改
|
2020-11-19 13:58:24 +08:00 |
|
|
|
bb26bfeec9
|
报错消除（未完）
|
2020-11-19 13:57:58 +08:00 |
|
|
|
4cc89f9c2d
|
轨道交通项目迁出
|
2020-11-19 10:07:10 +08:00 |
|
|
|
ee5c36469d
|
轨道交通项目迁出
|
2020-11-19 10:05:24 +08:00 |
|
