|
|
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 |
|
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 |
|
|
|
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 |
|
weizhihong
|
58b81b1d13
|
【增加站场图上SPKS状态】
|
2023-11-02 16:37:57 +08:00 |
|
|
|
27a9a99d85
|
proto重新生成
|
2023-11-02 15:56:25 +08:00 |
|
|
|
424d63264c
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-02 15:54:59 +08:00 |
|
|
|
3c68b9bebb
|
添加返回前端的道岔状态
|
2023-11-02 15:54:26 +08:00 |
|
|
|
b9d25e8c7f
|
增加屏蔽门操作接口；实现屏蔽门操作
|
2023-11-02 15:50:03 +08:00 |
|
weizhihong
|
8598553359
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-02 14:51:16 +08:00 |
|
weizhihong
|
8a775f8ea7
|
【IBP盘电路逻辑】
|
2023-11-02 14:51:07 +08:00 |
|
xzb
|
79e2d4c93e
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-02 14:38:08 +08:00 |
|
xzb
|
66d1b272b3
|
rssp lfsr
|
2023-11-02 14:37:50 +08:00 |
|
weizhihong
|
7ce06f41fa
|
【更新IBP按钮组件信息】
|
2023-11-02 13:26:00 +08:00 |
|
xzb
|
c843f5b1ce
|
rssp
|
2023-11-02 09:24:11 +08:00 |
|
