Commit Graph

807 Commits

Author SHA1 Message Date
xzb
d8b5e2d89c 计轴rssp 集成 2023-11-09 14:04:37 +08:00
xzb
d4a2cf2f80 计轴rssp 集成 2023-11-09 13:43:18 +08:00
xzb
e4ce33867e 计轴rssp 集成 2023-11-09 13:23:26 +08:00
xzb
dbb34d94bf Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-09 13:06:27 +08:00
xzb
4dc9f06d27 计轴rssp 集成 2023-11-09 13:05:29 +08:00
8198f1895d Merge remote-tracking branch 'origin/master' 2023-11-09 10:54:28 +08:00
9b5f7454bc 增加间隙探测继电器及相关逻辑;修改屏蔽门控制逻辑实现 2023-11-09 10:53:32 +08:00
weizhihong
e102a28bb2 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-09 10:21:02 +08:00
weizhihong
c10f989935 【修改注释】 2023-11-09 10:20:50 +08:00
xzb
3347dece7c 计轴rssp 集成 2023-11-09 10:19:32 +08:00
xzb
05c602bcc7 计轴rssp 集成 2023-11-09 10:16:57 +08:00
xzb
4ebf821710 计轴rssp 集成 2023-11-09 10:14:56 +08:00
xzb
3e4eacefc4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-09 09:47:11 +08:00
xzb
b7a31c1363 计轴rssp 集成 2023-11-09 09:46:48 +08:00
weizhihong
e461e762e4 【删除列车头部所在UID】 2023-11-08 15:19:42 +08:00
weizhihong
2f754d1579 【修改站台屏蔽门消息格式】 2023-11-08 11:27:42 +08:00
weizhihong
256a9bc4cc Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-08 11:02:57 +08:00
weizhihong
b2dfb124e1 【重构link与设备转换关系】 2023-11-08 11:02:41 +08:00
xzb
b3c99665e9 计轴rssp 集成 2023-11-07 17:49:08 +08:00
xzb
0887ac8d68 计轴rssp 集成 2023-11-07 17:47:47 +08:00
xzb
4cd8ada0ff Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-07 15:10:49 +08:00
xzb
d15ad494e0 计轴rssp 集成 2023-11-07 15:10:19 +08:00
2c02384b4e Merge remote-tracking branch 'origin/master' 2023-11-07 14:31:10 +08:00
efa53c2354 修改模型数据构建bug;屏蔽门所有继电器都会构建为实体 2023-11-07 14:30:08 +08:00
xzb
26db808d23 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-07 13:23:20 +08:00
xzb
155f0b4f8a 计轴rssp 集成 2023-11-07 13:22:47 +08:00
weizhihong
68c51bab51 【处理获取地图类型不存在的问题】【处理屏蔽门双车站问题】 2023-11-07 10:49:15 +08:00
1e2b0bd729 Merge remote-tracking branch 'origin/master' 2023-11-07 10:03:57 +08:00
01bd98a4d5 门控箱继电器数据中的PDBJ视为PABJ 2023-11-07 10:03:12 +08:00
weizhihong
0cc01420ba Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-07 09:22:54 +08:00
weizhihong
ff655d0748 【站台继电器状态】 2023-11-07 09:22:46 +08:00
xzb
877c7f5850 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 18:10:35 +08:00
xzb
8bc7a9170b 计轴rssp 集成 2023-11-06 18:10:15 +08:00
d6b4e25478 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 17:33:14 +08:00
8d9b120a98 零散组合数据构建 2023-11-06 17:33:09 +08:00
weizhihong
1dfc71ecae Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 17:15:07 +08:00
weizhihong
bc15e99d93 【站台状态】 2023-11-06 17:15:00 +08:00
xzb
00519db8c7 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 15:31:13 +08:00
weizhihong
41f55ba9eb 【修改联锁采集结构体信息】 2023-11-06 15:20:45 +08:00
xzb
9a5246b4b2 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 14:36:14 +08:00
xzb
3fcb286e05 计轴 2023-11-06 14:35:33 +08:00
weizhihong
479538f42b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 14:30:16 +08:00
weizhihong
ff22b4d518 【增加站场图emp状态】【增加操作结果返回处理】 2023-11-06 14:30:09 +08:00
3c76b468b2 修改屏蔽门故障操作bug 2023-11-06 13:54:04 +08:00
xzb
0a73d0b899 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-06 11:15:32 +08:00
xzb
1056ea1ce5 rssp 2023-11-06 11:15:13 +08:00
01b16f30ef 增加屏蔽门故障操作及逻辑 2023-11-06 10:53:06 +08:00
82dc5a6dcb Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-03 17:27:43 +08:00
1130277693 调整联锁驱采数据定义
修改道岔操作接口
完善道岔状态构造返回
2023-11-03 17:27:37 +08:00
xzb
df13fc55d8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-03 17:13:09 +08:00