|
|
6e36afa3ec
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-17 17:51:38 +08:00 |
|
|
|
7266cd32f8
|
道岔和信号机操作功能调整
|
2024-01-17 17:49:11 +08:00 |
|
|
|
9595fe9f6f
|
处理应答器报文数据类型问题
|
2024-01-17 17:15:35 +08:00 |
|
|
|
5198855faa
|
Merge remote-tracking branch 'origin/master'
|
2024-01-17 17:03:41 +08:00 |
|
|
|
886e6d46f6
|
Merge remote-tracking branch 'origin/master'
|
2024-01-17 17:02:46 +08:00 |
|
tiger_zhou
|
79356df717
|
动力学列车数据配置
|
2024-01-17 17:02:17 +08:00 |
|
|
|
2b6093af4f
|
修改道岔状态数据结构
|
2024-01-17 17:01:43 +08:00 |
|
tiger_zhou
|
8f54503ab3
|
动力学列车数据配置
|
2024-01-17 15:53:14 +08:00 |
|
tiger_zhou
|
72374630de
|
动力学列车数据配置
|
2024-01-17 13:09:45 +08:00 |
|
|
|
cc2b2e6715
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-17 09:32:20 +08:00 |
|
|
|
87d81c58b3
|
删除旧代码
|
2024-01-17 09:27:00 +08:00 |
|
tiger_zhou
|
7833e4bb55
|
动力学列车数据配置
|
2024-01-16 17:53:54 +08:00 |
|
|
|
14896b2dce
|
与前端传递的应答器报文改为16进制字符串
|
2024-01-16 13:44:28 +08:00 |
|
|
|
b22202ac21
|
修改应答器移位操作：必须在link边界或相邻应答器之间，越过或重叠时报错
|
2024-01-11 13:55:19 +08:00 |
|
|
|
49ec42e546
|
修改proto文件编译逻辑；修改proto文件编译位置并修改其它文件对生成的文件的引用
|
2024-01-11 10:24:56 +08:00 |
|
|
|
d4f8d3416f
|
解决代码冲突
|
2024-01-10 14:17:15 +08:00 |
|
|
|
41839e2210
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bj-rtss-message
# rtss_simulation
# ts/protos/state/device_state.pb.go
# ts/simulation/wayside/memory/wayside_memory_transponder.go
|
2024-01-10 14:09:23 +08:00 |
|
|
|
0818438098
|
proto文件增加设备状态；实现应答器的相关接口
|
2024-01-10 14:06:01 +08:00 |
|
|
|
c27ef7c675
|
merge调整
|
2024-01-10 11:17:32 +08:00 |
|
|
|
92e5491927
|
Merge branches 'master' and 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-10 11:14:51 +08:00 |
|
|
|
fb6d401a15
|
继电器操作功能实现
|
2024-01-10 11:13:13 +08:00 |
|
weizhihong
|
c1c11779eb
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-09 16:02:04 +08:00 |
|
weizhihong
|
302f1c5e76
|
【删除半实物打印】
|
2024-01-09 16:00:18 +08:00 |
|
|
|
32b4b9ba02
|
处理循环引用问题
|
2024-01-09 14:51:57 +08:00 |
|
|
|
ffa2dfc6bf
|
应答器的Link位置作为组件存在；增加应答器移位接口
|
2024-01-08 17:45:24 +08:00 |
|
weizhihong
|
a8ea59f082
|
【打印发送给半实物消息生命周期】
|
2024-01-05 17:19:27 +08:00 |
|
weizhihong
|
5e65421e7d
|
【增加半实物信息打印】
|
2024-01-05 16:49:38 +08:00 |
|
weizhihong
|
e0085c4513
|
【修改地图数据缓存结构】【数据版本处理】
|
2023-12-15 17:02:42 +08:00 |
|
weizhihong
|
bd9542fd8d
|
【列车状态结构处理】
|
2023-12-15 09:48:42 +08:00 |
|
weizhihong
|
52cdb57d47
|
【地图元素ID类型改变】
|
2023-12-14 13:04:48 +08:00 |
|
weizhihong
|
3edeec44c6
|
【增加地图元素commonId转换方法】
|
2023-12-13 15:05:42 +08:00 |
|
|
|
20c38ec96d
|
修改命名
|
2023-12-13 11:24:22 +08:00 |
|
|
|
f0fd68b5d6
|
初步实现联锁驱采Modbus服务
|
2023-12-13 11:22:30 +08:00 |
|
|
|
999d3b2767
|
修改道岔挤岔状态采集问题
添加git子模块jl-iot
|
2023-12-11 13:13:56 +08:00 |
|
joylink_zhangsai
|
61f6a52dcc
|
修改屏蔽门操作逻辑
|
2023-12-08 17:43:21 +08:00 |
|
joylink_zhangsai
|
685a3b0902
|
修改屏蔽门ecs逻辑
|
2023-12-08 16:46:50 +08:00 |
|
weizhihong
|
feace07dea
|
【增加日志打印】
|
2023-12-07 16:15:29 +08:00 |
|
weizhihong
|
7545bd2ca6
|
【修改IBP设备UID逻辑】
|
2023-12-07 10:17:48 +08:00 |
|
weizhihong
|
7cb868dcfc
|
【修改IBP设备组合逻辑】（消息未修改）
|
2023-12-06 14:00:55 +08:00 |
|
weizhihong
|
745fb55110
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-05 13:59:34 +08:00 |
|
weizhihong
|
a7e051648d
|
【增加过滤其他线路逻辑】
|
2023-12-05 13:59:27 +08:00 |
|
xzb
|
163c0f53c2
|
balise detect 预测实现
|
2023-12-05 09:37:34 +08:00 |
|
weizhihong
|
f2c13335c2
|
【删除多余方法】
|
2023-11-30 15:14:16 +08:00 |
|
weizhihong
|
f7c9c2ab36
|
【修改UID初始化逻辑】
|
2023-11-30 10:59:34 +08:00 |
|
xzb
|
7cdde1b7ef
|
btm
|
2023-11-28 13:30:10 +08:00 |
|
xzb
|
5a20d78aa3
|
btm
|
2023-11-24 15:20:05 +08:00 |
|
xzb
|
09e1ad68f9
|
应答器实体
|
2023-11-23 13:30:08 +08:00 |
|
xzb
|
896558d116
|
应答器实体
|
2023-11-23 13:20:00 +08:00 |
|
xzb
|
82f7e0bae9
|
无源应答器固定报文
|
2023-11-23 10:55:38 +08:00 |
|
weizhihong
|
e1532532f9
|
【重新编译proto文件】
|
2023-11-22 17:09:33 +08:00 |
|
weizhihong
|
2a0265941d
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
# ts/protos/graphicData/stationLayoutGraphics.pb.go
|
2023-11-22 17:07:08 +08:00 |
|
weizhihong
|
1434fb0f01
|
【发布数据管理逻辑修改】
|
2023-11-22 17:05:38 +08:00 |
|
xzb
|
1db6385821
|
应答器固定报文
|
2023-11-22 13:43:43 +08:00 |
|
xzb
|
37ee3a0256
|
应答器固定报文
|
2023-11-22 13:27:03 +08:00 |
|
weizhihong
|
1453b4877c
|
【IBP灯匹配组合逻辑】
|
2023-11-20 16:17:37 +08:00 |
|
weizhihong
|
0c581d815e
|
【删除Index】
|
2023-11-17 18:15:27 +08:00 |
|
|
|
58dd1b5391
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-17 17:02:50 +08:00 |
|
|
|
993790038f
|
删除centrifugog的grpc客户端相关代码
调整仿真订阅topic
修改仿真id生成
|
2023-11-17 17:01:12 +08:00 |
|
weizhihong
|
b8efe7e11b
|
【修改地图发布逻辑】【列车参数修改】【删除原来的link生成逻辑】【电机UDP逻辑处理】
|
2023-11-17 16:22:22 +08:00 |
|
xzb
|
d08183f4dc
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
# go.work.sum
|
2023-11-16 17:22:30 +08:00 |
|
xzb
|
cf43b850aa
|
信号机模型枚举
|
2023-11-16 17:21:05 +08:00 |
|
|
|
69a12bb224
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-16 16:54:31 +08:00 |
|
|
|
2abd4e4f92
|
添加mqtt发布客户端及配置
注销centrifugo发布客户端grpc及配置
调整go mod
|
2023-11-16 16:54:23 +08:00 |
|
xzb
|
a3fa6f07df
|
信号机模型枚举
|
2023-11-16 11:11:25 +08:00 |
|
weizhihong
|
60f58060ad
|
【删除多余方法】
|
2023-11-15 15:03:37 +08:00 |
|
weizhihong
|
bef31c4dbb
|
【注释轮径信息】
|
2023-11-15 11:03:46 +08:00 |
|
weizhihong
|
40662afc18
|
【推送半实物信息时增加列车轮径信息】
|
2023-11-15 09:54:16 +08:00 |
|
xzb
|
9595b11f52
|
rssp axle test
|
2023-11-14 17:57:54 +08:00 |
|
xzb
|
3f89c45891
|
rssp axle test
|
2023-11-14 10:31:06 +08:00 |
|
weizhihong
|
7893db2b5c
|
【仿真修改轮径接口】
|
2023-11-13 15:57:32 +08:00 |
|
weizhihong
|
b6a68777c6
|
【修改轮径管理，增加列车轮径属性】
|
2023-11-13 14:15:56 +08:00 |
|
xzb
|
2693c92bb0
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-10 10:54:57 +08:00 |
|
xzb
|
c3db583545
|
计轴rssp 集成
|
2023-11-10 10:54:44 +08:00 |
|
weizhihong
|
f0a8ce97ad
|
【修改列车占用逻辑】
|
2023-11-10 10:54:35 +08:00 |
|
weizhihong
|
e160fa1aaf
|
【动力学列车长度修改】
|
2023-11-10 09:28:27 +08:00 |
|
weizhihong
|
fccd954494
|
【道岔物理区段占用状态处理】
|
2023-11-09 18:13:32 +08:00 |
|
weizhihong
|
065330e445
|
【修改列车占用逻辑】
|
2023-11-09 17:54:31 +08:00 |
|
weizhihong
|
fd12c74e6f
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 15:58:23 +08:00 |
|
weizhihong
|
1c074ff258
|
【动力学列车信息变化逻辑修改】
|
2023-11-09 15:58:16 +08:00 |
|
|
|
2387b9e90a
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 14:27:40 +08:00 |
|
|
|
2f17438079
|
修改零散组合构建
|
2023-11-09 14:27:35 +08:00 |
|
weizhihong
|
de7d72b92a
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 14:19:54 +08:00 |
|
weizhihong
|
feb497b5b5
|
【增加车头车尾寻找物理区段方法】
|
2023-11-09 14:19:48 +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
|
c10f989935
|
【修改注释】
|
2023-11-09 10:20:50 +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 |
|
|
|
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
|
bc15e99d93
|
【站台状态】
|
2023-11-06 17:15:00 +08:00 |
|
weizhihong
|
41f55ba9eb
|
【修改联锁采集结构体信息】
|
2023-11-06 15:20:45 +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 |
|
|
|
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 |
|
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 |
|
|
|
50d8050da6
|
修改屏蔽门状态；修改滑动门ecs实体构建bug
|
2023-11-03 10:41:53 +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 |
|
|
|
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 |
|
xzb
|
12ed5b6b1f
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-01 17:46:54 +08:00 |
|
xzb
|
5f81e591ef
|
rssp
|
2023-11-01 17:46:24 +08:00 |
|
weizhihong
|
dffd941c80
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-01 16:55:28 +08:00 |
|
weizhihong
|
5a7a834510
|
【列车增加所在设备UID字段,删除列车废弃的操作代码】
|
2023-11-01 16:55:16 +08:00 |
|
|
|
7170a695ab
|
重新划分屏蔽门系统组件并实现门控箱控制屏蔽门逻辑（ecs）
|
2023-11-01 16:52:08 +08:00 |
|
xzb
|
ebc2bc7cc6
|
计轴区段状态
|
2023-11-01 11:18:09 +08:00 |
|
xzb
|
c54760276f
|
计轴区段
|
2023-11-01 11:08:26 +08:00 |
|
xzb
|
a83a28832f
|
物理区段-集中站
|
2023-10-31 16:53:39 +08:00 |
|
xzb
|
97c05cd99e
|
axle section request
|
2023-10-31 16:28:07 +08:00 |
|
xzb
|
deb49b393c
|
axle section request
|
2023-10-31 16:00:28 +08:00 |
|
weizhihong
|
4e110e94fe
|
【修改联锁udp客户端初始化逻辑】
|
2023-10-31 15:23:29 +08:00 |
|
|
|
0457d58eeb
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-10-31 13:03:36 +08:00 |
|
xzb
|
6730a45c46
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-10-31 11:30:39 +08:00 |
|
xzb
|
b7715b5276
|
axle section request
|
2023-10-31 11:30:18 +08:00 |
|
|
|
f006cfae2b
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-10-31 11:24:39 +08:00 |
|
|
|
340d1371d2
|
道岔添加强制操作
添加应答器编解码器部分代码
|
2023-10-31 11:22:50 +08:00 |
|
weizhihong
|
289c82de80
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-10-31 09:39:47 +08:00 |
|
weizhihong
|
3bb5e210da
|
【修改联锁采集逻辑】
|
2023-10-31 09:39:40 +08:00 |
|
xzb
|
1a79058c8f
|
axle section request
|
2023-10-31 09:19:58 +08:00 |
|
weizhihong
|
9f56970f75
|
【增加仿真暂停、错误消息】
|
2023-10-30 11:13:36 +08:00 |
|
weizhihong
|
b36040fc6f
|
【删除无用方法】
|
2023-10-30 10:48:07 +08:00 |
|
weizhihong
|
672060a497
|
【修改联锁收集继电器状态】
|
2023-10-30 10:09:58 +08:00 |
|
weizhihong
|
8b971c621b
|
【修改联锁采集逻辑】
|
2023-10-27 17:57:12 +08:00 |
|
weizhihong
|
c7f1137e59
|
【修改第三方服务报错后没有销毁问题】
|
2023-10-27 17:23:44 +08:00 |
|
weizhihong
|
821aa88a9e
|
【注释继电器消息报错逻辑】
【对仿真地图列表排序】
|
2023-10-27 15:45:43 +08:00 |
|
weizhihong
|
172f65b14c
|
【删除废弃文件夹中代码】
【调整消息服务代码】
【删除多余代码】
【调整方法、结构体名称】
|
2023-10-27 14:57:37 +08:00 |
|
