Commit Graph

596 Commits

Author SHA1 Message Date
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
joylink_zhangsai 2c02384b4e Merge remote-tracking branch 'origin/master' 2023-11-07 14:31:10 +08:00
joylink_zhangsai 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
joylink_zhangsai 1e2b0bd729 Merge remote-tracking branch 'origin/master' 2023-11-07 10:03:57 +08:00
joylink_zhangsai 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
walker 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
walker 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
joylink_zhangsai 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
joylink_zhangsai 01b16f30ef 增加屏蔽门故障操作及逻辑 2023-11-06 10:53:06 +08:00
walker 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
walker 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
xzb 3ba386ed60 rssp 2023-11-03 17:12:52 +08:00
weizhihong 20949cc937 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-03 13:36:15 +08:00
weizhihong 9820e4aa05 【修改发送动力学道岔信息逻辑,减少循环】 2023-11-03 13:35:58 +08:00
xzb 55c8302d3d Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-03 13:05:37 +08:00
xzb 4cf7784fb3 rssp 2023-11-03 13:04:28 +08:00
joylink_zhangsai 50d8050da6 修改屏蔽门状态;修改滑动门ecs实体构建bug 2023-11-03 10:41:53 +08:00
xzb 9d139a74ea Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-02 18:06:07 +08:00
xzb 0d9aac840d Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-02 18:05:01 +08:00
xzb 11b4302d0a rssp 2023-11-02 18:04:37 +08:00
weizhihong 9654bc4bea 【站场图SPKS状态】 2023-11-02 18:00:18 +08:00
weizhihong d9e7a130d3 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	ts/simulation/wayside/memory/wayside_memory_map_init.go
2023-11-02 16:40:49 +08:00