Commit Graph

167 Commits

Author SHA1 Message Date
0b7c35dbea 物理区段的LinkRange的start一定小于end 2023-11-10 15:26:35 +08:00
1ada6c5fa9 Repository构建过程填充物理区段的LinkRanges 2023-11-10 15:07:17 +08:00
5667b3fcd1 物理区段增加LinkRange 2023-11-10 11:05:07 +08:00
d8efe7c24c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-09 14:26:12 +08:00
c57198c10d 修改零散组合相关继电器及实体的创建 2023-11-09 14:26:08 +08:00
weizhihong
6c09377b4a 【增加根据ID查找设备】 2023-11-09 14:18:02 +08:00
weizhihong
fa5ed10810 【获取道岔对应端口的设备关系】 2023-11-09 13:16:42 +08:00
weizhihong
8bc1145eea Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-09 13:09:15 +08:00
weizhihong
2b7120831a 【增加获取道岔绑定的物理区段方法】 2023-11-09 13:09:01 +08:00
xzb
3c08644dde Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD
# Conflicts:
#	repository/repository_manager.go
2023-11-07 17:55:59 +08:00
xzb
45b4f4f0fe 计轴rssp 集成 2023-11-07 17:47:41 +08:00
fce28e57e9 Merge remote-tracking branch 'origin/master' 2023-11-07 14:31:08 +08:00
a6dfa6fffb 修改模型数据构建bug;屏蔽门所有继电器都会构建为实体 2023-11-07 14:30:07 +08:00
xzb
3b13603d65 计轴rssp 集成 2023-11-07 13:26:29 +08:00
46507159c5 将零散组合的继电器加载进仿真 2023-11-06 17:32:34 +08:00
a0352ee5e8 实现联锁驱采卡系统功能
调整道岔驱动电路逻辑
2023-11-03 17:26:32 +08:00
8cf9e419b8 proto重新生成 2023-11-02 16:06:32 +08:00
470f2289aa Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-02 15:51:41 +08:00
weizhihong
d3c2cfd003 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-02 13:08:38 +08:00
weizhihong
9a817a4741 【修改按钮带灯实体初始化】 2023-11-02 13:08:31 +08:00
d78a861a87 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-01 16:56:55 +08:00
7543b034cd 继电器添加所属车站属性
构思联锁采集、驱动相关组件
2023-11-01 16:55:58 +08:00
a8cb4228f5 重新划分屏蔽门系统组件并实现门控箱控制屏蔽门逻辑(ecs) 2023-11-01 16:52:03 +08:00
xzb
31b081f293 物理区段-集中站 2023-10-31 16:53:37 +08:00
xzb
718b89c480 物理区段-集中站 2023-10-31 16:46:13 +08:00
xzb
622f63a21c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-31 15:57:07 +08:00
xzb
3a6e690473 axle section request 2023-10-31 15:55:16 +08:00
weizhihong
b0608320d3 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-31 14:42:50 +08:00
weizhihong
ab2036ee89 【增加获取车站code方法】 2023-10-31 14:42:42 +08:00
xzb
ac0609e9fa axle section request 2023-10-31 11:30:17 +08:00
09df862049 道岔添加强制相关组件和逻辑 2023-10-31 11:21:27 +08:00
weizhihong
e21995b695 【修改方法名】 2023-10-31 09:26:36 +08:00
weizhihong
d650595166 【增加获取集中在配置方法】 2023-10-31 09:24:39 +08:00
weizhihong
9885a94cac 【删除多余字段】 2023-10-31 09:21:03 +08:00
weizhihong
a6402e38ae 【增加采集、驱动的位置信息】 2023-10-31 09:10:35 +08:00
weizhihong
97e0974107 【空指针异常】 2023-10-31 08:58:40 +08:00
weizhihong
c5dae5bb22 【增加采集、驱动配置】 2023-10-31 08:55:29 +08:00
weizhihong
d45ee86aa4 【添加集中站配置信息 2023-10-30 16:21:23 +08:00
weizhihong
085bfdc6f9 【删除repository中的采集配置】 2023-10-26 17:15:02 +08:00
weizhihong
50a502ba10 【采集配置】 2023-10-26 17:08:55 +08:00
xzb
f5e9aeecc8 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-23 17:40:13 +08:00
xzb
dccb6164f4 计轴区段ecs 2023-10-23 17:39:39 +08:00
51df0c521e 修改屏蔽门相关组件、系统 2023-10-23 17:35:57 +08:00
89dd583d19 修改门控箱/屏蔽门交互及ecs系统逻辑bug 2023-10-20 16:12:42 +08:00
7fb253612e Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-20 15:06:51 +08:00
5c41a01e69 调整仿真创建接口返回error
调整一些接口返回添加error
2023-10-20 15:05:56 +08:00
weizhihong
41460f29c1 【增加IBP钥匙组件】 2023-10-20 13:13:44 +08:00
xzb
7e05997668 不带电路的信号机 2023-10-20 10:21:35 +08:00
xzb
4e26ee104f 信号机模型类型 2023-10-20 09:41:49 +08:00
xzb
5d85a92dc4 信号机模型类型 2023-10-20 09:37:31 +08:00
xzb
78c09bc533 信号机模型类型 2023-10-19 18:09:47 +08:00
weizhihong
1c9779ebcf Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	proto/src/model.proto
#	repository/model/proto/model.pb.go
2023-10-19 17:37:57 +08:00
weizhihong
7ee674a484 【坐标系类型处理】 2023-10-19 17:36:39 +08:00
234882de58 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:47 +08:00
weizhihong
0505dd3b70 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-19 16:38:54 +08:00
weizhihong
0aa3290e73 【生产地图公里标信息】 2023-10-19 16:38:46 +08:00
xzb
22e91bc1e5 signal 故障 2023-10-19 10:31:05 +08:00
weizhihong
30c4210a5d 【修改按钮带灯属性名称】 2023-10-18 14:08:10 +08:00
weizhihong
a65799ed77 【修改IBP旁路按钮实体】 2023-10-18 11:17:08 +08:00
weizhihong
05de54f450 【IBP构建逻辑】 2023-10-17 17:47:19 +08:00
weizhihong
8b5391554c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	repository/repository_manager.go
2023-10-17 15:08:30 +08:00
weizhihong
8d9ea2a084 【创建车站实体】 2023-10-17 15:05:13 +08:00
67c416e96d 增加按name查询发布地图接口;增加门控箱ecs内容 2023-10-17 10:26:31 +08:00
weizhihong
1521868a88 【去掉按钮所属车站属性】 2023-10-16 10:05:23 +08:00
weizhihong
67b172c52c 【修改车站关联关系】 2023-10-16 09:55:44 +08:00
weizhihong
a9c004a0f0 【修改报错】 2023-10-13 16:24:28 +08:00
weizhihong
affc86e005 【增加车站repository】 2023-10-13 15:26:25 +08:00
xzb
d3dd59d720 信号机 2023-10-13 14:59:08 +08:00
f9d845a0cf 消除报错 2023-10-13 09:29:43 +08:00
fe3ce44bdc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jl-ecs-go
#	proto/src/model.proto
#	repository/model/proto/model.pb.go
2023-10-13 09:09:07 +08:00
18ed7f9214 增加草稿数据列表查询接口;增加屏蔽门ecs相关内容 2023-10-12 17:55:40 +08:00
weizhihong
bfec6804ce Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 17:47:21 +08:00
weizhihong
abeeb595dc 【初始化IBP盘实例】 2023-10-12 17:46:43 +08:00
2d64e2b3bb Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 16:29:49 +08:00
949c4a883a 添加道岔故障组件、定义、接口、实现逻辑 2023-10-12 16:29:00 +08:00
weizhihong
dbb5eaa417 【IBP操作】 2023-10-12 15:03:11 +08:00
weizhihong
a4fcdd1706 【增加实体初始化】 2023-10-12 13:47:57 +08:00
xzb
f7d64c1b6b Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	jl-ecs-go
2023-10-10 16:52:00 +08:00
xzb
528f5b9252 信号机2xh1测试 2023-10-10 16:51:07 +08:00
weizhihong
27a07ade5a 【调整按钮,spk系统,emp系统】 2023-10-10 16:15:56 +08:00
weizhihong
b9166cc079 【按钮操作、人员防护电路】 2023-10-10 11:05:26 +08:00
xzb
b12b050f5a signal 2xh1 2023-10-08 13:11:34 +08:00
6a6bd7ec7e 删除公里标坐标系转换的限制 2023-10-07 14:19:46 +08:00
weizhihong
b8db4336fb Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-09-28 14:57:59 +08:00
weizhihong
2f79758a3f 【修改公里标转换逻辑】 2023-09-28 14:57:51 +08:00
fe214fd3bc Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-09-28 14:34:09 +08:00
d3a187e00f 添加创建仿真
完善仿真实体加载
2023-09-28 14:34:00 +08:00
weizhihong
6deb5e61e6 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-09-28 14:22:30 +08:00
weizhihong
fe9499cfcd 【增加坐标转换】 2023-09-28 14:22:21 +08:00
d36ba6fc7d 增加断相保护器模型及相关构建逻辑 2023-09-28 14:10:15 +08:00
weizhihong
634866e55d 【增加获取物理道岔方法】 2023-09-28 09:20:28 +08:00
weizhihong
be88137f2a 【link的ID改为从1开始】 2023-09-27 14:51:51 +08:00
4b22cd1a42 修改构建protoRepository bug;增加获取道岔状态的函数 2023-09-26 13:45:00 +08:00
842a37077a 修改bug以及循环引用 2023-09-26 10:25:00 +08:00
xzb
caa8a60e2c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-09-25 15:39:22 +08:00
xzb
e065eabe64 集成 2023-09-25 15:39:03 +08:00
0dfee80345 修改仿真构建bug;公里标转换不再考虑方向 2023-09-25 14:38:13 +08:00
weizhihong
32ae9d11aa 【获取道岔公里标】 2023-09-22 17:10:33 +08:00
weizhihong
bed967c7ac Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-09-22 16:42:27 +08:00
weizhihong
faa5cfdf61 【增加公里标获取】 2023-09-22 16:42:19 +08:00