tiger_zhou
|
89a1884588
|
权限同步调整，及应急系统日志调整
|
2022-12-01 14:48:42 +08:00 |
|
tiger_zhou
|
181ced36b4
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-12-01 14:48:13 +08:00 |
|
tiger_zhou
|
c3bd3a330b
|
权限同步调整，及应急系统日志调整
|
2022-12-01 14:47:57 +08:00 |
|
weizhihong
|
675b3c5107
|
【修改实训设备筛选逻辑】
|
2022-12-01 14:38:11 +08:00 |
|
|
|
adbfedbff0
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 14:19:56 +08:00 |
|
|
|
f0d68d2f31
|
增加退出仿真接口；删除仿真邀请消息
|
2022-12-01 14:19:46 +08:00 |
|
tiger_zhou
|
a299c3471f
|
权限同步调整，及应急系统日志调整
|
2022-12-01 14:07:46 +08:00 |
|
weizhihong
|
37d9a6d8c8
|
【修改实训区段筛选条件】
|
2022-12-01 13:19:00 +08:00 |
|
|
|
977029410d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 13:08:53 +08:00 |
|
|
|
a5f22ad154
|
仿真用户数据里增加creator字段
|
2022-12-01 13:08:38 +08:00 |
|
weizhihong
|
54599af87a
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-12-01 10:58:05 +08:00 |
|
weizhihong
|
bc02cc9595
|
【增加区故解、分路不良实训生成】
|
2022-12-01 10:57:47 +08:00 |
|
|
|
993c081dbd
|
MapSystem->RtsMapFunction修改
|
2022-12-01 10:57:45 +08:00 |
|
|
|
13a7f01a77
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 10:57:10 +08:00 |
|
|
|
f719603446
|
将实迹运行图消息订阅路径独立出来；仿真用户增加类型
|
2022-12-01 10:56:47 +08:00 |
|
weizhihong
|
e83a3d2525
|
【修改属性与实训属性一致】
|
2022-12-01 09:51:23 +08:00 |
|
weizhihong
|
4fec906849
|
【道岔定反位背景】
|
2022-11-30 16:22:20 +08:00 |
|
weizhihong
|
1753c0dd12
|
【实训规则地图ID修改为仿真类型】
|
2022-11-30 16:06:21 +08:00 |
|
|
|
45882142b3
|
增加MapSystem->RtsMapFunction数据转化接口
|
2022-11-30 15:43:01 +08:00 |
|
weizhihong
|
27a4dbd5b2
|
【进路列表筛选】
|
2022-11-30 14:48:24 +08:00 |
|
|
|
9871e37f81
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-30 14:01:29 +08:00 |
|
|
|
59cb703042
|
将“管理员”销毁仿真的接口从之前的清理仿真接口里独立出来，清理仿真接口仅用于仿真创建者退出时销毁仿真用
|
2022-11-30 14:01:21 +08:00 |
|
weizhihong
|
e2ff7e2b5d
|
【重算实训地图定位】
|
2022-11-30 13:35:03 +08:00 |
|
weizhihong
|
59ddb040ff
|
【根据实训规则生成实训，实训场景连续两步为机器人不执行BUG】
|
2022-11-30 13:18:39 +08:00 |
|
weizhihong
|
cf44dc3ad2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-11-30 10:35:51 +08:00 |
|
weizhihong
|
066c4133fc
|
【会话判断修改】
|
2022-11-30 10:35:45 +08:00 |
|
|
|
3974e96c99
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-30 10:25:43 +08:00 |
|
|
|
bc160fdf35
|
暂时取消加入仿真的综合演练仿真检查
|
2022-11-30 10:25:17 +08:00 |
|
weizhihong
|
2da9680c6f
|
【修改创建会话逻辑】
|
2022-11-29 16:59:13 +08:00 |
|
|
|
078a49471e
|
加载背景时，仿真的运行图已加载才发布运行图重载事件
|
2022-11-29 14:11:38 +08:00 |
|
|
|
2e6c06c0cc
|
修改按计划行车请求方法(上次改错了）
|
2022-11-29 13:56:13 +08:00 |
|
|
|
6338ccce21
|
修改按计划行车请求方法
|
2022-11-29 13:52:04 +08:00 |
|
|
|
c176030f8e
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-29 10:35:36 +08:00 |
|
|
|
8e1bf07869
|
修改Dom配置；修改地图功能生成的Dom配置
|
2022-11-29 10:35:18 +08:00 |
|
weizhihong
|
0d2ad18c2a
|
【学员机登录逻辑修改】
|
2022-11-28 18:27:56 +08:00 |
|
weizhihong
|
c2c663f483
|
【通过ID获取系统功能信息】
|
2022-11-28 16:16:42 +08:00 |
|
|
|
f77404029b
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-28 14:56:36 +08:00 |
|
|
|
44a77be43a
|
大铁仿真创建后自动按计划行车；增加大铁按计划行车逻辑
|
2022-11-28 14:56:25 +08:00 |
|
tiger_zhou
|
e628916d52
|
应急系统测试调整
|
2022-11-28 14:55:02 +08:00 |
|
tiger_zhou
|
a2ee2e1858
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-11-28 14:10:36 +08:00 |
|
tiger_zhou
|
6bbda91f08
|
应急系统测试调整
|
2022-11-28 14:10:15 +08:00 |
|
|
|
1a9c156379
|
增加两个Dom配置
|
2022-11-28 11:28:42 +08:00 |
|
weizhihong
|
6552caaec2
|
【查询有效的组织信息】
|
2022-11-28 11:00:47 +08:00 |
|
weizhihong
|
753ad674f4
|
【取消用户列表条数限制】
|
2022-11-28 10:46:33 +08:00 |
|
weizhihong
|
9ac0ad8f44
|
【实训查询所有信息列表】
|
2022-11-28 10:23:14 +08:00 |
|
tiger_zhou
|
2598afe378
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-11-28 10:16:47 +08:00 |
|
tiger_zhou
|
7c0ab9af83
|
考试管理接口
|
2022-11-28 10:16:32 +08:00 |
|
weizhihong
|
d1255c931d
|
【修改项目信息查询】
|
2022-11-28 10:04:53 +08:00 |
|
weizhihong
|
6a1b8b73f3
|
【根据项目Code获取项目信息】
|
2022-11-28 09:49:38 +08:00 |
|
weizhihong
|
9ccbce9bea
|
【绑定组织bug】
|
2022-11-28 09:00:07 +08:00 |
|
weizhihong
|
2c360a2c00
|
【项目设置增加地图ID、功能ID】
|
2022-11-24 17:23:53 +08:00 |
|
weizhihong
|
8c86917bf2
|
【查询用户列表数目限制、实训运行状态标识】
|
2022-11-24 15:13:02 +08:00 |
|
weizhihong
|
bc5c79bcb4
|
【账号存储电话属性】
|
2022-11-24 13:35:22 +08:00 |
|
weizhihong
|
bd69d749b4
|
【实训详情缺少client问题】
|
2022-11-23 17:15:12 +08:00 |
|
weizhihong
|
31688227ed
|
【创建仿真时，保存功能ID】
【根据地图ID与功能ID获取仿真】
【组织用户管理接口】
【实训增加client字段】
|
2022-11-23 16:50:31 +08:00 |
|
weizhihong
|
47f9385fa7
|
【重置方法修改DELETE方式】
|
2022-11-22 15:59:23 +08:00 |
|
weizhihong
|
3f1a6fb508
|
【修改websocket传输数据大小限制，修改为1M】
|
2022-11-22 15:21:49 +08:00 |
|
tiger_zhou
|
730bf6670d
|
权限显示全部数据
|
2022-11-22 11:10:21 +08:00 |
|
weizhihong
|
e04600a2d6
|
【实训暂停死循环处理】
|
2022-11-21 09:03:37 +08:00 |
|
weizhihong
|
e8b2b0117e
|
【步骤ID类型修改】
|
2022-11-18 15:49:11 +08:00 |
|
weizhihong
|
e9eed02897
|
【实训删除全前端操作限制】
|
2022-11-18 14:11:31 +08:00 |
|
weizhihong
|
da4cd76c2a
|
【实训加载时，增加指令时间控制；实训加载时过滤不必要指令】
|
2022-11-18 13:51:42 +08:00 |
|
weizhihong
|
9e1448b053
|
【处理步骤ID】
|
2022-11-17 16:09:01 +08:00 |
|
weizhihong
|
db55b8b832
|
【删除步骤ID生成操作】
|
2022-11-15 16:13:16 +08:00 |
|
weizhihong
|
6d11859981
|
【修改实训操作属性】
|
2022-11-15 13:54:27 +08:00 |
|
weizhihong
|
fc950dbd57
|
【实训保存背景时加载列车，修改生成联锁数据报错问题】
|
2022-11-15 09:49:16 +08:00 |
|
weizhihong
|
55abfd21b2
|
【实训草稿存档功能】
|
2022-11-14 18:07:59 +08:00 |
|
tiger_zhou
|
26d8683e76
|
武汉8号线合并test 代码调整
|
2022-11-10 13:24:31 +08:00 |
|
tiger_zhou
|
894ce10b40
|
Merge branch 'test' into test-training2-zhouyin
# Conflicts:
# pom.xml
# src/main/java/club/joylink/rtss/services/iscs/interactive/IscsInteractiveService.java
# src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
# src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java
# src/main/java/club/joylink/rtss/simulation/cbtc/message/SimulationSubscribeTopic.java
# src/main/java/club/joylink/rtss/vo/client/factory/SocketMessageFactory.java
# src/main/resources/application.yml
|
2022-11-10 11:27:44 +08:00 |
|
tiger_zhou
|
c5b680b8eb
|
武汉8号线
|
2022-11-10 11:06:07 +08:00 |
|
tiger_zhou
|
3cd2f52f38
|
武汉8号线
|
2022-11-10 10:28:07 +08:00 |
|
weizhihong
|
a5a0b3f105
|
【实训完成后评分统计】
|
2022-11-09 10:02:11 +08:00 |
|
|
|
e379a0a95f
|
增加订阅设备状态时发送所有设备状态逻辑
|
2022-11-08 10:16:52 +08:00 |
|
|
|
b4f7b305b6
|
新版仿真恢复大客流任务加载逻辑
|
2022-11-07 18:01:04 +08:00 |
|
tiger_zhou
|
380bc6df65
|
用户权限同步调整，北交大登录按照通用方式
|
2022-11-07 17:11:50 +08:00 |
|
|
|
f132220891
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-07 17:08:59 +08:00 |
|
|
|
8092557b56
|
增加ws路径；增加Dom参数
|
2022-11-07 17:08:43 +08:00 |
|
tiger_zhou
|
502db59fdc
|
用户权限同步调整
|
2022-11-04 11:00:05 +08:00 |
|
tiger_zhou
|
b415133f5e
|
用户权限同步调整
|
2022-11-04 10:56:16 +08:00 |
|
|
|
6eecb0e6bc
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-03 17:38:46 +08:00 |
|
|
|
4cff884c4b
|
增加生成大客流线路功能接口
|
2022-11-03 17:38:33 +08:00 |
|
tiger_zhou
|
741494e965
|
用户权限同步调整
|
2022-11-03 16:46:59 +08:00 |
|
|
|
f56eb47d53
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-03 16:17:17 +08:00 |
|
|
|
a2b3e9f282
|
增加生成应急调度线路功能逻辑；前端配置增加大客流
|
2022-11-03 16:15:52 +08:00 |
|
tiger_zhou
|
4a6454d6ae
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java
|
2022-11-03 15:50:13 +08:00 |
|
tiger_zhou
|
76d9ce5339
|
用户权限同步
|
2022-11-03 15:48:13 +08:00 |
|
|
|
c0c2e81ebf
|
增加仿真工作参数变更后发送ws消息逻辑；
|
2022-11-03 15:37:17 +08:00 |
|
weizhihong
|
19775a11ce
|
【删除多余jar】
|
2022-11-02 17:03:06 +08:00 |
|
|
|
001e343459
|
大铁生成子系统增加综合演练和实训设计
|
2022-11-02 15:58:35 +08:00 |
|
|
|
28ff6dd8d9
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-02 13:44:59 +08:00 |
|
|
|
329a36ef48
|
增加通过地图功能id创建仿真的接口
|
2022-11-02 13:44:43 +08:00 |
|
tiger_zhou
|
539c41ba85
|
客户端权限列表
|
2022-11-01 10:42:38 +08:00 |
|
|
|
5a197b5e90
|
修改仿真不加载运行图bug
|
2022-10-31 15:54:42 +08:00 |
|
|
|
ddfa763746
|
地图子系统改线路功能
|
2022-10-31 14:31:56 +08:00 |
|
|
|
784918e8f1
|
消除报错
|
2022-10-31 13:58:22 +08:00 |
|
|
|
617e72bfb0
|
消除报错
|
2022-10-31 13:50:37 +08:00 |
|
|
|
a0c8c424be
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-31 13:41:39 +08:00 |
|
|
|
6d55b7fd2d
|
地图子系统Dom配置增加实训设计
|
2022-10-31 13:41:14 +08:00 |
|
weizhihong
|
06089d5e24
|
【删除操作websocket提示】
【实训步骤全部为前端操作时，交于前端执行，后端只判断步骤状态】
|
2022-10-31 13:40:39 +08:00 |
|
tiger_zhou
|
9e26790cf8
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-28 16:50:28 +08:00 |
|
tiger_zhou
|
fe4190deb7
|
试卷支持线路
|
2022-10-28 16:50:14 +08:00 |
|
weizhihong
|
8e2d2e6a01
|
【修改实训发布轨迹表名】
|
2022-10-28 16:46:11 +08:00 |
|
tiger_zhou
|
e1d431ecb6
|
试卷生成代码调整（支持线路）
|
2022-10-28 16:01:53 +08:00 |
|
tiger_zhou
|
aedab56c37
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-28 15:59:04 +08:00 |
|
tiger_zhou
|
507c8fc83f
|
试卷生成代码调整（支持线路）
|
2022-10-28 15:58:50 +08:00 |
|
weizhihong
|
f226d2eb76
|
【实训规则测试类】
|
2022-10-28 15:16:27 +08:00 |
|
weizhihong
|
8eab737a64
|
【实训规则生成实训逻辑】
|
2022-10-28 15:14:29 +08:00 |
|
tiger_zhou
|
fddaddb699
|
试卷生成代码调整
|
2022-10-28 13:47:44 +08:00 |
|
tiger_zhou
|
93c32f9d32
|
试卷生成代码调整
|
2022-10-28 13:34:18 +08:00 |
|
tiger_zhou
|
d16e4275c0
|
试卷生成代码调整
|
2022-10-28 13:31:53 +08:00 |
|
tiger_zhou
|
69f81d56a9
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-28 13:25:58 +08:00 |
|
tiger_zhou
|
f3960db9b0
|
试卷生成代码调整
|
2022-10-28 13:25:38 +08:00 |
|
weizhihong
|
ac6e8b212e
|
【实训生成成员规则】
|
2022-10-28 13:17:24 +08:00 |
|
weizhihong
|
9938671184
|
【调整实训参数类型】
|
2022-10-28 13:05:20 +08:00 |
|
tiger_zhou
|
0589157cc7
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-28 11:24:22 +08:00 |
|
tiger_zhou
|
2ef33927ea
|
试卷生成代码调整
|
2022-10-28 11:24:09 +08:00 |
|
weizhihong
|
bb9d407a8e
|
【增加实训角色获取规则】
|
2022-10-28 11:16:19 +08:00 |
|
tiger_zhou
|
6561c722c0
|
题库导入 标签分类为空字符串问题
|
2022-10-28 10:48:58 +08:00 |
|
tiger_zhou
|
5e2889e2ce
|
题库导入 标签分类为空字符串问题
|
2022-10-28 10:48:23 +08:00 |
|
tiger_zhou
|
0a1381b63d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-28 10:38:24 +08:00 |
|
tiger_zhou
|
1b71490dd1
|
试卷规则修改
|
2022-10-28 10:38:11 +08:00 |
|
weizhihong
|
c97528bcec
|
【实训属性名称修改】
|
2022-10-28 09:44:30 +08:00 |
|
tiger_zhou
|
9733dac257
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-28 09:09:40 +08:00 |
|
tiger_zhou
|
d4c7cbf1e8
|
权限分发代码调整
|
2022-10-28 09:09:20 +08:00 |
|
|
|
60d126cb28
|
修改注释
|
2022-10-27 18:10:40 +08:00 |
|
|
|
999f6dd971
|
增加实训反射调用方法
|
2022-10-27 18:09:31 +08:00 |
|
weizhihong
|
2302913a7a
|
【实训规则增加子系统、客户端】
|
2022-10-27 17:32:38 +08:00 |
|
tiger_zhou
|
bf9199ef37
|
题库更改错误文字
|
2022-10-27 17:28:32 +08:00 |
|
weizhihong
|
7b208af820
|
【修改实训，增加子系统、客户端字段】
|
2022-10-27 17:12:14 +08:00 |
|
|
|
27e9d0b48e
|
增加项目JJJLM
|
2022-10-27 16:08:44 +08:00 |
|
tiger_zhou
|
00b504f7b3
|
试卷规则分类只支持一个
|
2022-10-27 15:37:49 +08:00 |
|
tiger_zhou
|
987dbbe43c
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-27 14:42:58 +08:00 |
|
tiger_zhou
|
6eca4a5b5b
|
题库标签最多只支持一个，试卷重复问题
|
2022-10-27 14:42:40 +08:00 |
|
weizhihong
|
cb66ac91c0
|
【实训规则修改】
|
2022-10-26 16:06:22 +08:00 |
|
tiger_zhou
|
e8d0207e49
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-26 15:55:09 +08:00 |
|
tiger_zhou
|
ebf3377cc1
|
用户权限修改status数据类型，用户权限查询过滤，试卷标签筛选从 or 变更为 and
|
2022-10-26 15:54:56 +08:00 |
|
weizhihong
|
f847b306f4
|
【步骤增加仿真操作属性】
【修改实训运行逻辑】
|
2022-10-26 14:18:24 +08:00 |
|
tiger_zhou
|
d05ce9ccef
|
权限分发，查询调整
|
2022-10-26 14:07:59 +08:00 |
|
tiger_zhou
|
4a8f71ad1e
|
新（支持前端多个权限）权限分发,目前接口不支持二次分发
|
2022-10-26 10:49:00 +08:00 |
|
|
|
4252c56961
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-26 09:34:00 +08:00 |
|
|
|
6e6e3f7114
|
增加第三方账户配置接口；修改地图数据导入bug
|
2022-10-26 09:33:47 +08:00 |
|
weizhihong
|
746cea77b4
|
【生成实训规则实体】
|
2022-10-25 15:17:52 +08:00 |
|
weizhihong
|
7442082a7a
|
【空指针BUG】
|
2022-10-25 14:01:25 +08:00 |
|
weizhihong
|
6a7d89bfe5
|
【修改表名】
|
2022-10-25 13:31:42 +08:00 |
|
xiazengbin
|
ec09da1efc
|
permission
|
2022-10-25 13:12:15 +08:00 |
|
xiazengbin
|
150e4dc1b5
|
permission
|
2022-10-25 12:37:30 +08:00 |
|
|
|
9114da604b
|
仿真信息接口增加仿真工作参数；地图复制接口修改
|
2022-10-25 10:46:13 +08:00 |
|
|
|
0f506ce2ad
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-25 09:19:35 +08:00 |
|
|
|
6627018a02
|
注释掉大客流的监听器（行调工作站按计划行车报错）
|
2022-10-25 09:19:16 +08:00 |
|
tiger_zhou
|
a3d0545da1
|
试卷筛选出现没有选择类型的题目
|
2022-10-24 17:57:56 +08:00 |
|
|
|
1e3475bb62
|
修改导入/导出接口
|
2022-10-24 17:02:32 +08:00 |
|
tiger_zhou
|
6fcbf24d13
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-24 16:45:02 +08:00 |
|
tiger_zhou
|
c8a77c9034
|
权限功能提供列表接口
|
2022-10-24 16:44:48 +08:00 |
|
weizhihong
|
c2c31ce3b3
|
【地图数据所属项目为空时，处理默认项目】
|
2022-10-24 15:36:10 +08:00 |
|
weizhihong
|
b0330e85cf
|
【登录时，处理用户项目列表】
|
2022-10-24 14:45:56 +08:00 |
|
tiger_zhou
|
616d8898b4
|
权限功能注释不必要的接口
|
2022-10-24 13:52:41 +08:00 |
|
tiger_zhou
|
7880ced128
|
答题试卷可以重复答题，并且修改的时候返回上次答题的答案
|
2022-10-24 10:12:46 +08:00 |
|
tiger_zhou
|
231171b6c8
|
用户权限支持查看已很配领取的权限，答题试卷在创建的时候及有开始时间
|
2022-10-21 17:14:56 +08:00 |
|
tiger_zhou
|
e398d0c364
|
用户权限禁用接口调整
|
2022-10-21 14:31:53 +08:00 |
|
tiger_zhou
|
16276f80f7
|
用户权限禁用接口调整
|
2022-10-21 14:30:52 +08:00 |
|
tiger_zhou
|
78e91eb573
|
权限查询支持昵称及功能列表，用户权限禁用接口调整
|
2022-10-21 14:30:20 +08:00 |
|
tiger_zhou
|
f0a420311c
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-21 11:03:09 +08:00 |
|
tiger_zhou
|
688654d7d4
|
语音识别调整
|
2022-10-21 11:02:55 +08:00 |
|
weizhihong
|
d94039c8bb
|
【MINIO删除对象方法】
|
2022-10-21 09:43:15 +08:00 |
|
tiger_zhou
|
6b6fd85cc6
|
权限功能调整
|
2022-10-20 18:03:12 +08:00 |
|
tiger_zhou
|
e52ffe07a8
|
权限功能调整
|
2022-10-20 18:01:02 +08:00 |
|
tiger_zhou
|
4f0a10bb6d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-20 17:27:10 +08:00 |
|
tiger_zhou
|
17fb69073e
|
权限功能调整
|
2022-10-20 17:26:54 +08:00 |
|
tiger_zhou
|
b5c186aa13
|
权限功能调整
|
2022-10-20 15:23:20 +08:00 |
|
|
|
47ec3e5ecc
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-20 15:12:16 +08:00 |
|
|
|
1ae745b377
|
增加新的根据用户信息查询地图接口
|
2022-10-20 15:12:00 +08:00 |
|
tiger_zhou
|
b838e4dd3c
|
应急预警调整
|
2022-10-20 14:50:45 +08:00 |
|
tiger_zhou
|
1101841879
|
权限功能调整
|
2022-10-20 14:25:52 +08:00 |
|
tiger_zhou
|
8d74d09d80
|
权限功能调整
|
2022-10-20 13:52:00 +08:00 |
|
tiger_zhou
|
d142179cb7
|
权限功能调整
|
2022-10-20 13:45:09 +08:00 |
|
tiger_zhou
|
81c4db28a7
|
权限功能调整
|
2022-10-20 13:39:05 +08:00 |
|
tiger_zhou
|
ad319c094e
|
权限功能调整
|
2022-10-20 13:37:12 +08:00 |
|
tiger_zhou
|
0b04b23537
|
权限功能调整及权限主体禁用功能(未完成)
|
2022-10-20 13:33:58 +08:00 |
|
tiger_zhou
|
f9b02894e0
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-20 09:54:07 +08:00 |
|
tiger_zhou
|
484ff18eed
|
理论试题管理代码调整支持清空
|
2022-10-20 09:52:36 +08:00 |
|
tiger_zhou
|
1f63bd48e2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-20 09:27:18 +08:00 |
|
xzb
|
a20a57b5c0
|
修改试卷定义时间判断
|
2022-10-20 09:24:31 +08:00 |
|
xzb
|
d29a869c26
|
permission
|
2022-10-19 17:47:42 +08:00 |
|
xzb
|
4b43640085
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 17:07:34 +08:00 |
|
xzb
|
677f9ab163
|
permission
|
2022-10-19 17:07:16 +08:00 |
|
weizhihong
|
5ad0bec6ba
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-10-19 16:49:36 +08:00 |
|
weizhihong
|
73f73a426e
|
【删除登录信息中所有的组织信息】
|
2022-10-19 16:49:29 +08:00 |
|
xzb
|
315e956927
|
permission
|
2022-10-19 16:46:36 +08:00 |
|
tiger_zhou
|
d37b10f207
|
应急系统添加速度及调整
|
2022-10-19 16:06:13 +08:00 |
|
tiger_zhou
|
e14286f329
|
应急系统添加速度及调整
|
2022-10-19 15:59:51 +08:00 |
|
xzb
|
074f49a2a9
|
permission
|
2022-10-19 15:59:19 +08:00 |
|
xzb
|
3c4a678db0
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 15:59:00 +08:00 |
|
xzb
|
9c12891135
|
permission
|
2022-10-19 15:58:36 +08:00 |
|
tiger_zhou
|
4201b1165d
|
应急系统添加速度及调整
|
2022-10-19 15:53:41 +08:00 |
|
tiger_zhou
|
1b7e46d5c7
|
权限主体
|
2022-10-19 15:49:36 +08:00 |
|
|
|
e9e45d5cb6
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-19 15:41:03 +08:00 |
|
|
|
72b4ac8fd5
|
修改生成子系统逻辑
|
2022-10-19 15:40:39 +08:00 |
|
xzb
|
6135e912f2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 15:02:50 +08:00 |
|
xzb
|
9a0d0d2980
|
permission
|
2022-10-19 15:02:33 +08:00 |
|
tiger_zhou
|
66ac5d7b02
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-19 14:00:51 +08:00 |
|
tiger_zhou
|
1680097d72
|
新权限分发及题库代码调整
|
2022-10-19 14:00:07 +08:00 |
|
xzb
|
ebe85d7c26
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 13:55:30 +08:00 |
|
xzb
|
7de63057a3
|
permission
|
2022-10-19 13:55:13 +08:00 |
|
tiger_zhou
|
d454a2a51c
|
新权限分发代码调整
|
2022-10-19 13:39:25 +08:00 |
|
tiger_zhou
|
4c1ce8e593
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
Conflicts:
src/main/java/club/joylink/rtss/entity/permission/PermissionDistribute.java
src/main/java/club/joylink/rtss/entity/permission/PermissionDistributeExample.java
src/main/resources/mybatis/mapper/permission/PermissionSubjectDAO.xml
|
2022-10-19 13:35:37 +08:00 |
|
|
|
ef389ca8f4
|
导入导出增加运行图交路数据
|
2022-10-19 13:34:23 +08:00 |
|
tiger_zhou
|
c2dbbbb715
|
应急系统添加速度及调整
|
2022-10-19 13:25:25 +08:00 |
|
|
|
5a3179df5a
|
修改新仿真创建接口参数；修改生成子系统接口（未完）
|
2022-10-19 11:16:22 +08:00 |
|
xzb
|
b7a25fb070
|
permission
|
2022-10-19 11:09:44 +08:00 |
|
xzb
|
3eae7d7672
|
permission
|
2022-10-19 10:06:03 +08:00 |
|
xzb
|
ec4509d7ef
|
permission
|
2022-10-19 10:04:21 +08:00 |
|
xzb
|
6c36d6f753
|
permission
|
2022-10-19 09:54:56 +08:00 |
|
xzb
|
54c73004d9
|
permission
|
2022-10-19 09:49:38 +08:00 |
|
weizhihong
|
d0d517450f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-10-19 08:53:09 +08:00 |
|
weizhihong
|
afc62e8f4e
|
【修改顶级组织ID获取逻辑】
|
2022-10-19 08:53:03 +08:00 |
|
xzb
|
f81041afa1
|
permission
|
2022-10-18 17:45:34 +08:00 |
|
xzb
|
0d758f8ca5
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-18 17:41:20 +08:00 |
|
xzb
|
14ad0dfce5
|
permission
|
2022-10-18 17:40:56 +08:00 |
|
weizhihong
|
853dd2fe35
|
【修改查询班级时，获取组织逻辑】
|
2022-10-18 15:27:26 +08:00 |
|
|
|
a652d06bb6
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/services/draftData/DraftMapDisStationService.java
|
2022-10-18 14:21:23 +08:00 |
|
|
|
3a5fbb16e9
|
增加生成子系统的接口；增加仿真客户端类型；
|
2022-10-18 14:19:40 +08:00 |
|
xzb
|
df6e9fd578
|
permission
|
2022-10-18 13:50:29 +08:00 |
|
xzb
|
0a752feb47
|
permission
|
2022-10-18 13:19:15 +08:00 |
|
xzb
|
24dd1cead9
|
permission
|
2022-10-18 13:08:19 +08:00 |
|
xzb
|
b40ccfe775
|
permission
|
2022-10-18 10:29:05 +08:00 |
|
xzb
|
013b58f6bd
|
page
|
2022-10-18 09:52:42 +08:00 |
|
xzb
|
fe9333fbb5
|
permission
|
2022-10-18 09:43:55 +08:00 |
|
xzb
|
a912a25c51
|
permission
|
2022-10-18 09:38:54 +08:00 |
|
tiger_zhou
|
c8a8bdc6ee
|
新权限分发领取功能
|
2022-10-18 09:27:16 +08:00 |
|
xzb
|
0e34851966
|
paper
|
2022-10-17 17:07:42 +08:00 |
|
xzb
|
5310fc7819
|
paper
|
2022-10-17 16:28:46 +08:00 |
|
xzb
|
522d446516
|
paper
|
2022-10-17 16:13:16 +08:00 |
|
xzb
|
44e1c38a74
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-17 16:04:33 +08:00 |
|
xzb
|
d869ce06da
|
paper
|
2022-10-17 16:04:16 +08:00 |
|
|
|
761d7e353b
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-17 14:52:45 +08:00 |
|
|
|
5c06c0105b
|
增加查询地图车站列表接口；修改仿真成员设备查找逻辑bug；
|
2022-10-17 14:52:34 +08:00 |
|
xzb
|
158d436a61
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-17 14:45:17 +08:00 |
|
xzb
|
4f1029f5b6
|
paper
|
2022-10-17 14:45:01 +08:00 |
|
xzb
|
3b944a63db
|
paper
|
2022-10-17 14:43:28 +08:00 |
|
weizhihong
|
7547b6b14b
|
【选择组织修改登录信息】
|
2022-10-17 14:23:57 +08:00 |
|
tiger_zhou
|
bc0969e6e5
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-17 14:19:31 +08:00 |
|
tiger_zhou
|
c68978cd1b
|
理论试题管理代码调整
|
2022-10-17 14:19:13 +08:00 |
|
xzb
|
47388d250e
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-17 14:18:26 +08:00 |
|
xzb
|
c9e16545d4
|
paper
|
2022-10-17 14:17:27 +08:00 |
|
tiger_zhou
|
1910f7a1c7
|
理论试题管理代码调整
|
2022-10-17 14:02:05 +08:00 |
|
tiger_zhou
|
6f404ceb88
|
理论试题管理代码调整
|
2022-10-17 13:20:45 +08:00 |
|
tiger_zhou
|
5f08745963
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-17 08:54:41 +08:00 |
|
xzb
|
b3ecb6c1d2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-14 17:51:41 +08:00 |
|
xzb
|
7a0b9eb2de
|
paper
|
2022-10-14 17:51:05 +08:00 |
|
tiger_zhou
|
b8cf53b572
|
理论试题管理代码调整
|
2022-10-14 17:05:50 +08:00 |
|
