tiger_zhou
|
deb02d753e
|
1
|
2023-03-13 14:33:54 +08:00 |
|
tiger_zhou
|
9080f7331c
|
1
|
2023-03-13 14:03:10 +08:00 |
|
tiger_zhou
|
55a5b31dee
|
调整ncc 数据发布
|
2023-03-13 13:42:09 +08:00 |
|
tiger_zhou
|
6838e18531
|
修改
|
2023-03-07 16:03:13 +08:00 |
|
weizhihong
|
0396b88c2b
|
【修改NCC更新逻辑】
|
2023-03-02 17:55:51 +08:00 |
|
weizhihong
|
b8cae4edfa
|
【NCC world事件操作】
|
2023-03-02 17:16:40 +08:00 |
|
weizhihong
|
01cd3adc46
|
【NCC world管理器】
|
2023-03-02 15:23:43 +08:00 |
|
weizhihong
|
0d1d726d69
|
【列车状态运行系统】
|
2023-03-01 10:18:47 +08:00 |
|
weizhihong
|
5eeb1997b9
|
Merge branch 'test-module' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-module
|
2023-02-28 15:10:46 +08:00 |
|
weizhihong
|
3490b1e7dc
|
【列车行驶位置系统更新功能】
|
2023-02-28 15:10:19 +08:00 |
|
weizhihong
|
3371b87a43
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-module
|
2023-02-28 14:41:16 +08:00 |
|
tiger_zhou
|
5ab8b74e9b
|
更改uri
|
2023-02-28 14:21:40 +08:00 |
|
tiger_zhou
|
46ceb6599d
|
Merge branch 'test-module' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-module-zhouyin
|
2023-02-28 14:15:59 +08:00 |
|
weizhihong
|
f1aeee553c
|
【ncc消息实体】
|
2023-02-28 13:53:11 +08:00 |
|
tiger_zhou
|
ecbcd20f0d
|
init
|
2023-02-28 13:19:41 +08:00 |
|
tiger_zhou
|
1c745a4af3
|
init
|
2023-02-28 13:07:37 +08:00 |
|
tiger_zhou
|
4e4307d587
|
Merge branch 'test-module-zhouyin' into test-module
|
2023-02-28 09:18:01 +08:00 |
|
tiger_zhou
|
ba90df0c21
|
1
|
2023-02-28 09:17:21 +08:00 |
|
tiger_zhou
|
135eef69e4
|
Merge branch 'test-module-zhouyin' into test-module
# Conflicts:
# jl-rtss-simulation/NCC/pom.xml
# jl-rtss-simulation/ncc/pom.xml
# jl-rtss-simulation/pom.xml
|
2023-02-28 09:07:17 +08:00 |
|
tiger_zhou
|
45bdd630d9
|
Merge branch 'test-module' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-module-zhouyin
Conflicts:
jl-rtss-simulation/NCC/pom.xml
jl-rtss-simulation/ncc/pom.xml
jl-rtss-simulation/pom.xml
|
2023-02-28 08:56:42 +08:00 |
|
tiger_zhou
|
04db1a64f3
|
Merge remote-tracking branch 'origin/test-module' into test-module
|
2023-02-28 08:51:27 +08:00 |
|
tiger_zhou
|
8e1e468b6b
|
init
|
2023-02-28 08:51:15 +08:00 |
|
tiger_zhou
|
8704a5cbb8
|
init
|
2023-02-28 08:48:55 +08:00 |
|
tiger_zhou
|
853a2d80f2
|
init
|
2023-02-28 08:42:37 +08:00 |
|
weizhihong
|
c7e5abcf57
|
【修改pom】
|
2023-02-27 18:46:09 +08:00 |
|
weizhihong
|
c5b31292a2
|
【小写ncc文件夹】
|
2023-02-27 18:28:32 +08:00 |
|
weizhihong
|
12c898cdd8
|
【尝试删除大写NCC文件夹】
|
2023-02-27 18:27:03 +08:00 |
|
tiger_zhou
|
254bed7451
|
Merge branch 'test-module' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-module-zhouyin
Conflicts:
jl-rtss-simulation/ncc/src/main/java/club/joylink/rtss/simulation/ncc/controller/RtsNccMapDataController.java
jl-rtss-simulation/pom.xml
|
2023-02-27 18:02:55 +08:00 |
|
tiger_zhou
|
9b0af3f764
|
init
|
2023-02-27 18:01:29 +08:00 |
|
tiger_zhou
|
e85106ec08
|
init
|
2023-02-27 18:00:37 +08:00 |
|
tiger_zhou
|
dcaeea1b3d
|
init
|
2023-02-27 17:50:06 +08:00 |
|
tiger_zhou
|
a51274f20f
|
init
|
2023-02-27 17:45:26 +08:00 |
|
tiger_zhou
|
566378c4f8
|
init
|
2023-02-27 17:42:29 +08:00 |
|
weizhihong
|
b555ca2ac3
|
【删除message对象】
|
2023-02-27 17:28:29 +08:00 |
|
weizhihong
|
7e3bff68ff
|
Merge branch 'test-module' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-module
# Conflicts:
# jl-rtss-simulation/pom.xml
|
2023-02-27 16:32:35 +08:00 |
|
weizhihong
|
e8438adcb7
|
【仿真NCC模块】
|
2023-02-27 16:28:59 +08:00 |
|
tiger_zhou
|
c095ab84c2
|
ncc
|
2023-02-27 16:19:01 +08:00 |
|
tiger_zhou
|
eda2131f26
|
修改添加ncc模块，添加ncc-message作为子模块
|
2023-02-27 14:18:48 +08:00 |
|
tiger_zhou
|
5b2a704468
|
修改添加ncc模块，添加ncc-message作为子模块
|
2023-02-27 13:50:38 +08:00 |
|
tiger_zhou
|
1ce9312497
|
添加对 ncc，message 的依赖
|
2023-02-27 11:21:53 +08:00 |
|
tiger_zhou
|
05fa2609b7
|
添加对应权限"白名单"功能
|
2023-02-24 18:02:50 +08:00 |
|
weizhihong
|
bbb8c7588b
|
Merge remote-tracking branch 'remotes/origin/test-training2' into test-module
# Conflicts:
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/controller/publish/MapFunctionController.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/controller/training2/TrainingV2PublishController.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/dao/MapFunctionTemplateDAO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/entity/MapFunctionTemplate.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/entity/MapFunctionTemplateExample.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/services/mapFunction/RtsMapFunctionServiceImpl.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/services/org/OrgProjectService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/services/paper/PaperUserSubmitAnswerService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/services/permission/OldPermissionDataSyncService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/services/permission/SystemAbilityService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/services/training2/Training2DraftService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/ATS/operation/handler/StationOperateHandler.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/ATS/operation/vo/OperationModeParam.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/ATS/operation/vo/RouteModelParam.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/ATS/service/AtsStationService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/CI/CiLogic.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/CI/device/CiRouteService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/SimulationServiceImpl.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/data/storage/device/StorageStation.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/data/vr/VirtualRealityPsl.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/simulation/cbtc/onboard/ATP/ATPService.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionBatchModifyVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionCreateVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionGenerateParamVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionGenerateVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionQueryVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionUpdateVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/MapFunctionVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/RtsMapFunctionCreateVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/RtsMapFunctionGenerateParamVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/RtsMapFunctionQueryVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/RtsMapFunctionUpdateVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/client/mapFunction/RtsMapFunctionVO.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/permission/convertor/SystemAbilityConvertor.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/vo/training2/draft/UpdateStepReqVo.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/websocket/WebsocketConfig.java
# jl-rtss-manage/src/main/java/club/joylink/rtss/manage/websocket/interceptor/VSimpleInterceptor.java
# jl-rtss-manage/src/main/resources/mybatis/mapper/MapFunctionTemplateDAO.xml
# jl-rtss-manage/src/test/java/club/joylink/rtss/manage/services/mapSystem/RtsMapFunctionServiceImplTest.java
# src/main/java/club/joylink/rtss/vo/client/mapFunction/RtsMapFunctionCreateVO.java
# src/main/java/club/joylink/rtss/vo/client/mapFunction/RtsMapFunctionGenerateParamVO.java
# src/main/java/club/joylink/rtss/vo/client/mapFunction/RtsMapFunctionQueryVO.java
# src/main/java/club/joylink/rtss/vo/client/mapFunction/RtsMapFunctionUpdateVO.java
# src/main/java/club/joylink/rtss/vo/client/mapFunction/RtsMapFunctionVO.java
# src/main/resources/application.yml
|
2023-02-23 17:55:24 +08:00 |
 walker
|
e21af8c413
|
添加开发路线功能描述
|
2023-02-23 15:29:02 +08:00 |
|
walker
|
8ff3e3218c
|
代码结构调整，模块化，分为auth、simulation、manage三个模块
|
2023-02-23 14:10:11 +08:00 |
|
weizhihong
|
4e242417aa
|
【切换预选模式修改、增加开启ATO操作、大铁列车托管修改行驶至前方站与进路闭塞行车】
|
2023-02-23 13:27:50 +08:00 |
 joylink_zhangsai
|
c4ee87eccc
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-22 16:55:46 +08:00 |
|
joylink_zhangsai
|
2e27c0410f
|
修改组织结构树中的用户名称为 昵称(名称)
|
2023-02-22 16:55:20 +08:00 |
|
weizhihong
|
3b6f476732
|
【MINIO文件上传问题修改】【列车模式转换死循环问题】
|
2023-02-22 14:11:01 +08:00 |
|
weizhihong
|
d215284d1e
|
【MINIO文件上传时，增加版本id,需要在MINIO服务器开启版本配置】
|
2023-02-21 17:32:32 +08:00 |
|
joylink_zhangsai
|
0e8b746f8a
|
增/改线路功能参数时，将value为空字符串的item移除
|
2023-02-21 17:17:26 +08:00 |