Commit Graph

894 Commits

Author SHA1 Message Date
walker 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
tiger_zhou 487ae08939 Merge remote-tracking branch 'origin/master' 2024-01-18 10:11:31 +08:00
tiger_zhou 1fe577c830 动力学列车数据配置 2024-01-18 10:11:08 +08:00
joylink_zhangsai 66d31f80f2 修改应答器移位操作的报错提示信息 2024-01-18 10:08:55 +08:00
walker bf9d65c5a7 信号机强制点灯开发 2024-01-18 09:26:04 +08:00
walker 93f2a74f86 git屏蔽go.work.sum文件提交 2024-01-17 18:07:30 +08:00
walker b6588ef0d7 重新生成proto 2024-01-17 17:54:30 +08:00
walker 3953b89c95 重新生成proto 2024-01-17 17:53:53 +08:00
walker 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
walker 7266cd32f8 道岔和信号机操作功能调整 2024-01-17 17:49:11 +08:00
joylink_zhangsai 9595fe9f6f 处理应答器报文数据类型问题 2024-01-17 17:15:35 +08:00
tiger_zhou ec691ab12c Merge remote-tracking branch 'origin/master' 2024-01-17 17:05:22 +08:00
tiger_zhou 7d8ab26712 动力学列车数据配置 2024-01-17 17:05:08 +08:00
joylink_zhangsai 5198855faa Merge remote-tracking branch 'origin/master' 2024-01-17 17:03:41 +08:00
joylink_zhangsai 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
joylink_zhangsai 2b6093af4f 修改道岔状态数据结构 2024-01-17 17:01:43 +08:00
tiger_zhou 7cf33862be 动力学列车数据配置 2024-01-17 16:02:59 +08:00
tiger_zhou 8f54503ab3 动力学列车数据配置 2024-01-17 15:53:14 +08:00
tiger_zhou 72374630de 动力学列车数据配置 2024-01-17 13:09:45 +08:00
walker 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
walker 12ba09d8df go work sum 2024-01-17 09:27:37 +08:00
walker 87d81c58b3 删除旧代码 2024-01-17 09:27:00 +08:00
tiger_zhou 7833e4bb55 动力学列车数据配置 2024-01-16 17:53:54 +08:00
joylink_zhangsai 14896b2dce 与前端传递的应答器报文改为16进制字符串 2024-01-16 13:44:28 +08:00
joylink_zhangsai b22202ac21 修改应答器移位操作:必须在link边界或相邻应答器之间,越过或重叠时报错 2024-01-11 13:55:19 +08:00
joylink_zhangsai 91eeb6c89e link中增加与link上设备的关联(以此修复了应答器移位可以越过相邻应答器的问题) 2024-01-11 11:04:35 +08:00
joylink_zhangsai 49ec42e546 修改proto文件编译逻辑;修改proto文件编译位置并修改其它文件对生成的文件的引用 2024-01-11 10:24:56 +08:00
joylink_zhangsai d4f8d3416f 解决代码冲突 2024-01-10 14:17:15 +08:00
joylink_zhangsai 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
joylink_zhangsai 0818438098 proto文件增加设备状态;实现应答器的相关接口 2024-01-10 14:06:01 +08:00
walker c27ef7c675 merge调整 2024-01-10 11:17:32 +08:00
walker 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
walker 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
joylink_zhangsai 32b4b9ba02 处理循环引用问题 2024-01-09 14:51:57 +08:00
joylink_zhangsai 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 18b1edb235 【还原本地测试数据库连接】 2024-01-05 11:30:44 +08:00
weizhihong d946536e66 【修改本地测试数据库连接】 2024-01-05 11:27:22 +08:00
weizhihong 2947dee109 【修改北京测试项目数据库IP】 2024-01-05 11:07:11 +08:00
weizhihong bafff0315d 【增加消息topic注释】 2023-12-26 13:27:09 +08:00
weizhihong 96cf5e844b 【删除多余的case条件】 2023-12-25 14:25:24 +08:00
weizhihong e886d5f4ef Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	message_server/simulation_state_ms.go
2023-12-25 14:18:16 +08:00
weizhihong 7e9c9c969d 【仿真消息修改】 2023-12-25 14:15:22 +08:00
walker 7e9a1816fa 适配ecs调整 2023-12-25 13:28:24 +08:00
walker e179497de9 修改modbus配置描述 2023-12-21 13:35:04 +08:00
walker fef6fe46a4 适配IOT模块调整 2023-12-20 14:13:23 +08:00