 joylink_zhangsai
|
dbfd391799
|
分页查询用户信息添加单位名称字段
|
2020-11-30 17:51:22 +08:00 |
|
joylink_zhangsai
|
5eddc4d8e0
|
《实训生成时，未根据prdType筛选》bug修改（考试开始的bug同时消除）；开始考试效率优化
|
2020-11-30 17:12:54 +08:00 |
|
joylink_zhangsai
|
bbeaa73c14
|
添加根据地图查绘图数据接口
|
2020-11-27 18:13:38 +08:00 |
|
joylink_zhangsai
|
ab03faa02b
|
根据mapId获取地图数据接口修改
|
2020-11-27 17:49:24 +08:00 |
|
joylink_zhangsai
|
f564935c40
|
理论题导入bug修改
|
2020-11-27 17:18:23 +08:00 |
|
joylink_zhangsai
|
34c1616a4c
|
理论题导入bug修改
|
2020-11-27 17:00:52 +08:00 |
|
joylink_zhangsai
|
5d743425e5
|
生成课程速度优化
|
2020-11-27 16:11:05 +08:00 |
|
joylink_zhangsai
|
91e23f39fc
|
信号机自排关和进路自动触发实训生成逻辑分开
|
2020-11-27 15:06:02 +08:00 |
|
joylink_zhangsai
|
76df1f7cd0
|
Merge branch 'training-bug' into test
|
2020-11-27 14:11:28 +08:00 |
 walker-sheng
|
788988a3e6
|
添加客流视图开关及通信流程
|
2020-11-27 14:04:22 +08:00 |
|
joylink_zhangsai
|
f2ad219264
|
实训生成bug修改；课程&考试生成去掉没有实训的章节
|
2020-11-27 13:16:20 +08:00 |
|
walker-sheng
|
e3304dbe24
|
添加正式环境docker构建文件
|
2020-11-26 19:42:35 +08:00 |
|
joylink_zhangsai
|
a2ca5c5981
|
信号总取消操作修改；课程查询逻辑修改
|
2020-11-26 19:03:32 +08:00 |
|
joylink_zhangsai
|
ac6a2750df
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:18:32 +08:00 |
|
joylink_zhangsai
|
0afb167ca7
|
语音文件添加类型
|
2020-11-26 18:18:17 +08:00 |
|
walker-sheng
|
215a6bafd0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:10:32 +08:00 |
|
walker-sheng
|
9e4d63f3c2
|
仿真websocket订阅重构，同时修复仿真上线/下线事件逻辑，应该不会再出现进入大屏再关闭大屏标签页导致用户下线继而导致仿真销毁问题
仿真抽象对象添加抽象仿真用户
|
2020-11-26 18:10:16 +08:00 |
|
joylink_zhangsai
|
5892cad910
|
语音文件上传保存bug修改
|
2020-11-26 14:16:21 +08:00 |
|
joylink_zhangsai
|
13ddd0f01a
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 13:49:04 +08:00 |
|
joylink_zhangsai
|
ed6c7809ac
|
语音识别的文件保存的bug修改；本地部署的导入导出修改（未测试）
|
2020-11-26 13:48:48 +08:00 |
|
walker-sheng
|
a6e8c3cc49
|
删除无用线程池配置，修改使用线程池核心数量
|
2020-11-26 13:35:24 +08:00 |
|
walker-sheng
|
6292dee955
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 09:34:56 +08:00 |
|
walker-sheng
|
b303ec5694
|
迁移微信接口消息转换器和配置
|
2020-11-26 09:34:39 +08:00 |
|
joylink_zhangsai
|
ab2270cc99
|
语音文件上传bug修改
|
2020-11-25 19:31:31 +08:00 |
|
joylink_zhangsai
|
d2ec25cfb0
|
语音文件上传正式
|
2020-11-25 18:26:15 +08:00 |
|
joylink_zhangsai
|
de5fa9030f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-25 16:38:27 +08:00 |
|
joylink_zhangsai
|
5cd012cc66
|
实训流程修改&贵装备课程查询逻辑修改
|
2020-11-25 16:38:17 +08:00 |
|
joylink_zhangsai
|
d9eb31e884
|
地图数据保存历史版本相关功能修正
|
2020-11-25 11:05:39 +08:00 |
|
walker-sheng
|
2d6b93009b
|
修改信号机生成实训逻辑——兼容哈尔滨操作
抽象仿真对象添加移除任务功能
|
2020-11-25 10:57:27 +08:00 |
|
joylink_zhangsai
|
fbaadf8ae8
|
删除地图版本xml文件
|
2020-11-24 19:06:09 +08:00 |
|
joylink_zhangsai
|
8b1f35406f
|
实训一键生成bug修改
|
2020-11-24 15:17:26 +08:00 |
|
joylink_zhangsai
|
3b7dcaeada
|
Merge branch 'master' into test
|
2020-11-24 14:33:43 +08:00 |
|
joylink_zhangsai
|
04d44bab3e
|
地图数据版本相关（记录、更新等）（导入导出和其它一些用的地图数据的地方还没做处理）
|
2020-11-24 13:04:37 +08:00 |
|
walker-sheng
|
f05737ca56
|
task移植
|
2020-11-23 19:23:42 +08:00 |
|
joylink_zhangsai
|
94a59c86a9
|
Merge remote-tracking branch 'origin/master'
|
2020-11-23 17:00:00 +08:00 |
|
joylink_zhangsai
|
590f36e4ce
|
用户仿真统计接口迁移
|
2020-11-23 16:58:53 +08:00 |
|
walker-sheng
|
ec806b5780
|
添加构建文件
|
2020-11-20 17:23:55 +08:00 |
|
joylink_zhangsai
|
6dc2e56d4c
|
文件/代码，删除/位置调整
|
2020-11-20 14:42:46 +08:00 |
|
joylink_zhangsai
|
9114e56582
|
监听器和语音识别bug修改
|
2020-11-20 13:04:27 +08:00 |
|
joylink_zhangsai
|
132246ae49
|
报错消除
|
2020-11-20 09:07:46 +08:00 |
|
joylink_zhangsai
|
248413ef2e
|
追commit
|
2020-11-19 19:53:12 +08:00 |
|
joylink_zhangsai
|
5552022eb8
|
bug修改
|
2020-11-19 19:20:50 +08:00 |
|
joylink_zhangsai
|
cfa404807c
|
Merge remote-tracking branch 'origin/master'
|
2020-11-19 19:08:19 +08:00 |
|
joylink_zhangsai
|
3fffeaa6d6
|
报错消除（完）
|
2020-11-19 19:08:03 +08:00 |
|
walker-sheng
|
efc94c813f
|
轨道交通项目迁出问题修改6(日志配置修改)
|
2020-11-19 19:06:53 +08:00 |
|
walker-sheng
|
0a066a3f95
|
轨道交通项目迁出问题修改5(数据库访问修改)
|
2020-11-19 18:28:54 +08:00 |
|
walker-sheng
|
1073fc66b6
|
轨道交通项目迁出问题修改4(可以启动了)
|
2020-11-19 18:12:24 +08:00 |
|
joylink_zhangsai
|
413a2c2b94
|
报错消除（未完）
|
2020-11-19 17:56:12 +08:00 |
|
joylink_zhangsai
|
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 |
|
joylink_zhangsai
|
88e49ce5b0
|
报错消除（未完）
|
2020-11-19 17:31:26 +08:00 |