Commit Graph

722 Commits

Author SHA1 Message Date
tiger_zhou
79484bea97 动力学列车数据配置 2024-01-17 13:09:44 +08:00
655a0712af link中增加与link上设备的关联(以此修复了应答器移位可以越过相邻应答器的问题) 2024-01-11 10:59:02 +08:00
0316b398d5 解决代码冲突 2024-01-10 14:17:11 +08:00
ef48c7ba0b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	component/common.go
#	entity/balise.go
2024-01-10 14:08:19 +08:00
e8c0d58799 proto文件增加设备状态;实现应答器的相关接口 2024-01-10 14:06:00 +08:00
972bac0561 merge处理 2024-01-10 11:12:19 +08:00
3f5b459460 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2024-01-10 11:01:54 +08:00
a9ea711f00 继电器强制前/后位及取消强制功能实现 2024-01-10 10:57:47 +08:00
xzb
cf5fa3210b Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2024-01-09 09:40:56 +08:00
xzb
f215374f9b iscs bas 大系统 2024-01-09 09:40:28 +08:00
xzb
d443ee3c41 iscs bas 大系统 2024-01-09 09:39:03 +08:00
a4c17218f7 应答器的Link位置作为组件存在;增加应答器移位接口 2024-01-08 17:45:15 +08:00
xzb
9b16941d2f Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2024-01-05 15:21:58 +08:00
xzb
7bb420cffd iscs bas 大系统 2024-01-05 15:21:29 +08:00
weizhihong
1c2ce2d9a9 【注释component_data/ci.pb.go、component_data/common.pb.go初始化方法】
【调整singletion时间组件大小写】
2024-01-05 14:07:43 +08:00
xzb
8688c7b371 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2024-01-05 13:02:33 +08:00
xzb
7a4ad7d1bb iscs bas 大系统 2024-01-05 11:30:39 +08:00
4dc5c17a89 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2024-01-02 18:24:38 +08:00
7751d9d926 组件定义调整
道岔命名调整,道岔实体构建重构
2024-01-02 18:22:28 +08:00
xzb
3cb6678a19 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	repo/dto/cg_repo.pb.go
2024-01-02 17:39:05 +08:00
xzb
b6f9a0af22 iscs bas 大系统 2024-01-02 17:38:39 +08:00
xzb
3c0fc2293b iscs bas 大系统 2024-01-02 17:32:09 +08:00
weizhihong
f1897c75d8 【删除无用系统】 2024-01-02 16:35:30 +08:00
weizhihong
c166adfaa1 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	repo/dto/cg_repo.pb.go
#	repository/model/proto/model.pb.go
2023-12-29 18:00:44 +08:00
weizhihong
4f91be427e 【区段增加关联站台属性】 2023-12-29 17:58:39 +08:00
80585dbf7a Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-29 17:49:02 +08:00
2282ad9f56 重构组件及组件数据定义 2023-12-29 17:48:57 +08:00
xzb
2803f32329 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-29 17:01:01 +08:00
xzb
5c169edfbc iscs bas 大系统 2023-12-29 17:00:26 +08:00
weizhihong
27bd611893 【proto增加进路结构】 2023-12-29 16:52:16 +08:00
weizhihong
c9e89e2b02 【atp地面设备状态】 2023-12-29 10:53:36 +08:00
weizhihong
5d66ac7bb5 【地面设备状态组件】 2023-12-28 18:17:35 +08:00
c4bc8c640f 重构singleton组件及相关方法接口
调整repo目录结构和命名
初步开始重构仿真实体加载
2023-12-28 16:49:28 +08:00
50b588ca15 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-28 14:35:17 +08:00
375d0a86a3 城轨repo接口定义及管理功能实现 2023-12-28 14:35:11 +08:00
xzb
8a938a451c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-28 13:54:39 +08:00
xzb
b8a4b0d16e iscs bas 大系统 2023-12-28 13:54:06 +08:00
2bff91955a Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-28 11:06:50 +08:00
fea4eae8d1 模型接口定义 2023-12-28 11:06:46 +08:00
xzb
556ed6e2d6 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-27 18:12:21 +08:00
xzb
2dfe213742 iscs bas 大系统 2023-12-27 18:11:27 +08:00
e64d27df67 model接口定义 2023-12-27 18:09:20 +08:00
7b80d6e736 调整repo包名 2023-12-27 15:59:46 +08:00
3b4a017b3d Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-27 15:51:34 +08:00
1e71d51feb 考虑repo只提供抽象接口,具体实现由应用层实现 2023-12-27 15:51:28 +08:00
xzb
411a5e0157 iscs bas 大系统 2023-12-27 14:45:46 +08:00
xzb
f0b6cd1b71 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-27 13:35:50 +08:00
xzb
a922cf8133 iscs bas 大系统-阀门 2023-12-27 13:35:33 +08:00
75723b31e6 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-12-27 13:04:24 +08:00
1101edd1d3 调整repo定义
城轨和国铁分开
2023-12-27 13:04:19 +08:00