Commit Graph

138 Commits

Author SHA1 Message Date
tiger_zhou
dff8cbab87 动力学列车数据配置 2024-01-18 17:17:48 +08:00
tiger_zhou
118fe91900 动力学列车数据配置 2024-01-18 16:33:27 +08:00
1237abc9e9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-18 14:11:52 +08:00
21484afa21 道岔、信号机状态调整 2024-01-18 14:11:47 +08:00
tiger_zhou
21d04e9e4c 动力学列车数据配置 2024-01-18 13:57:57 +08:00
b253a18791 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-18 13:11:55 +08:00
4c229abc03 道岔,信号机设置参数功能开发实现 2024-01-18 13:10:28 +08:00
tiger_zhou
550049efa6 动力学列车数据配置 2024-01-18 10:48:04 +08:00
1db384297b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2024-01-18 10:20:40 +08:00
66d31f80f2 修改应答器移位操作的报错提示信息 2024-01-18 10:08:55 +08:00
bf9d65c5a7 信号机强制点灯开发 2024-01-18 09:26:04 +08:00
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
52cdb57d47 【地图元素ID类型改变】 2023-12-14 13:04:48 +08:00
weizhihong
3edeec44c6 【增加地图元素commonId转换方法】 2023-12-13 15:05:42 +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