Commit Graph

559 Commits

Author SHA1 Message Date
weizhihong
231be3b506 【联锁消息发送Encode处理】 2023-10-25 11:09:29 +08:00
weizhihong
f8dba22a23 【半实物消息解析修改】 2023-10-25 11:03:19 +08:00
cdb9654799 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-25 10:29:09 +08:00
dd3d29149a 调整Centrifugo grpc初始化位置 2023-10-25 10:28:41 +08:00
tiger_zhou
7db35e3e8d Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-25 09:23:55 +08:00
weizhihong
ce657e262a 【增加项目运行环境信息管理】 2023-10-24 16:37:27 +08:00
tiger_zhou
88a0675a73 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	rtss_simulation
2023-10-24 14:16:57 +08:00
xzb
e55122f5bf Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-24 13:21:43 +08:00
xzb
fa3c85558b 计轴区段操作 2023-10-24 13:20:36 +08:00
weizhihong
3bd9d9532c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-24 10:57:23 +08:00
weizhihong
735e46893b 【联锁消息处理】 2023-10-24 10:57:04 +08:00
xzb
40a8616d95 计轴区段操作 2023-10-24 10:22:52 +08:00
xzb
4aecaf4512 计轴区段操作 2023-10-24 10:22:28 +08:00
xzb
840a2baa6a 计轴区段操作 2023-10-24 10:19:51 +08:00
tiger_zhou
f86a988c0b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	rtss_simulation
2023-10-24 10:04:11 +08:00
xzb
20a0f2f829 计轴区段操作 2023-10-24 09:42:10 +08:00
xzb
9d29a35a6c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-24 09:38:42 +08:00
xzb
f521f45cca 计轴区段操作枚举定义 2023-10-24 09:37:36 +08:00
weizhihong
65fb469738 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-24 09:16:26 +08:00
2d9f79fb8e 消除报错 2023-10-24 09:15:07 +08:00
weizhihong
e057d8ec3a 【联锁消息结构】 2023-10-24 09:14:54 +08:00
weizhihong
cb950c8e58 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-24 09:03:45 +08:00
weizhihong
5efd93d91b 【增加获取联锁方法】 2023-10-24 09:03:38 +08:00
xzb
17143a20a3 计轴区段状态推送 2023-10-23 18:01:48 +08:00
18b15ad619 修改屏蔽门相关组件、系统 2023-10-23 17:35:58 +08:00
weizhihong
57dc7850d4 【权限数据操作的部分报错说明】 2023-10-23 13:41:58 +08:00
tiger_zhou
0adc9b2a16 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	rtss_simulation
2023-10-23 11:12:40 +08:00
weizhihong
e84db3a9bf 【修改api异常打印,删除多余文件】 2023-10-23 09:45:04 +08:00
weizhihong
c8e005a639 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-20 18:08:19 +08:00
weizhihong
ec7738c4f6 【修改API报错信息】 2023-10-20 18:08:06 +08:00
66ae6914b5 修改门控箱/屏蔽门交互及ecs系统逻辑bug 2023-10-20 16:12:47 +08:00
weizhihong
a7b7caa9d1 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-20 15:54:31 +08:00
weizhihong
3a48235e00 【提交ecs修改】 2023-10-20 15:53:46 +08:00
weizhihong
7c539309a4 【修改IBP灯归属逻辑】 2023-10-20 15:52:50 +08:00
b321bc65b8 dev配置文件恢复 2023-10-20 15:37:29 +08:00
65e903e16e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-20 15:13:29 +08:00
c9eaef1d6f 添加业务错误结构
修改用户注册和启动测试仿真接口使用业务错误返回
调整一些接口返回error
2023-10-20 15:08:47 +08:00
weizhihong
1ca573c054 【解决发布重复问题】 2023-10-20 14:27:13 +08:00
weizhihong
3648e51863 【IBP钥匙操作】 2023-10-20 13:50:22 +08:00
weizhihong
211e405798 【解决IBP获取车站UID出错问题】 2023-10-20 11:19:39 +08:00
weizhihong
0c9816a1ce Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-20 10:59:34 +08:00
weizhihong
47a175db8b 【修改IBP逻辑(钥匙类型暂定)】 2023-10-20 10:59:27 +08:00
xzb
4d7a2ee670 信号机模型类型 2023-10-20 09:38:23 +08:00
xzb
8e6a39a7ca Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-20 09:15:56 +08:00
xzb
23c1b2dc6e 信号机模型类型 2023-10-20 09:14:54 +08:00
weizhihong
94255947e6 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-19 18:04:29 +08:00
weizhihong
a82728e09e 【列车位置处理逻辑】 2023-10-19 18:04:21 +08:00
xzb
2e4083a75a 信号机模型类型 2023-10-19 17:53:08 +08:00
weizhihong
035daffb3b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-10-19 17:46:33 +08:00
weizhihong
9f4a044e95 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	api/simulation.go
#	ats/verify/protos/state/device_state.pb.go
#	ats/verify/simulation/wayside/memory/wayside_memory_ibp.go
2023-10-19 17:46:26 +08:00