Commit Graph

317 Commits

Author SHA1 Message Date
xzb
754049d011 信号机模型类型 2023-10-19 17:11:28 +08:00
8f23c4062d 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:36 +08:00
weizhihong
cff3d23475 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-19 16:08:16 +08:00
weizhihong
57e0118a53 【修改灯激活属性】 2023-10-19 16:08:09 +08:00
xzb
97319ed5b8 signal 故障 2023-10-19 15:06:41 +08:00
xzb
4ea207ebba Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-19 14:15:39 +08:00
xzb
d7435063ab signal 故障 2023-10-19 14:15:01 +08:00
joylink_zhaoerwei
7fa55788f5 字段名字调整 2023-10-19 10:33:44 +08:00
joylink_zhaoerwei
fa48e1cd4f 加注释 2023-10-19 10:13:04 +08:00
joylink_zhaoerwei
5ec37803d5 站台关联字段调整 2023-10-19 08:57:54 +08:00
weizhihong
43345d1094 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-18 14:53:41 +08:00
weizhihong
c108e156eb 【修改延时时间位置】 2023-10-18 14:53:33 +08:00
fan
df8a26fc7f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-18 14:41:39 +08:00
fan
d6e94b4560 pslButton数据调整 2023-10-18 14:41:34 +08:00
Yuan
4db072e4cd ibp按钮是否带灯 2023-10-18 11:08:42 +08:00
weizhihong
291c568905 【按钮增加灯状态】 2023-10-18 10:11:23 +08:00
weizhihong
7b83f10ef6 【增加列车更新时间字段】 2023-10-17 18:03:33 +08:00
weizhihong
0868e9273f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-17 15:46:33 +08:00
weizhihong
d1b6798d30 【增加按钮、指示灯、警铃状态】 2023-10-17 15:46:27 +08:00
fan
6ca28f502f spks调整 2023-10-17 14:20:22 +08:00
xzb
7a105e7c0e signal 2023-10-17 09:23:38 +08:00
xzb
c3893c5b49 信号机状态 2023-10-16 11:10:54 +08:00
xzb
3f409d717b 信号机状态 2023-10-16 11:01:12 +08:00
c18ac281a6 添加请求消息文件 2023-10-13 17:51:38 +08:00
fan
f43d8dbec4 ibp proto文件调整 2023-10-13 16:37:47 +08:00
fan
4a20e38f8c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 16:11:44 +08:00
fan
4becdaf8b0 spks调整 2023-10-13 16:11:40 +08:00
Yuan
4901aa6c0d Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-13 16:07:38 +08:00
Yuan
d0e2f78203 ibp关联组合 2023-10-13 16:07:36 +08:00
fan
73dcb43c76 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:57:52 +08:00
fan
58977714f4 psl关联设备数据调整 2023-10-13 15:57:48 +08:00
xzb
d5ef2b4d1b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:53:44 +08:00
xzb
62c82bd041 信号机状态推送 2023-10-13 15:53:32 +08:00
Yuan
cc23df9076 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-13 15:22:23 +08:00
Yuan
2f5db03f59 ibp灯 2023-10-13 15:22:20 +08:00
xzb
bbead938bb Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:18:27 +08:00
xzb
8c5cf8f0d5 信号机状态推送 2023-10-13 15:18:12 +08:00
xzb
ad518abef0 信号机 2023-10-13 14:56:23 +08:00
Yuan
7d027a7e5e ibp 2023-10-13 14:02:12 +08:00
Yuan
3c13e9122b merge 2023-10-13 13:59:35 +08:00
Yuan
593a7c477e ibp 2023-10-13 13:58:53 +08:00
fan
b33cc6eee0 proto文件调整 2023-10-13 13:36:39 +08:00
fan
3179930523 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 13:32:46 +08:00
fan
9eedbdd555 proto文件调整 2023-10-13 13:32:41 +08:00
xzb
7a24c7aae2 信号机显示枚举定义 2023-10-13 10:47:46 +08:00
xzb
e92189e023 信号机显示枚举定义 2023-10-13 10:34:39 +08:00
xzb
b14d5add8a 信号机显示枚举定义 2023-10-13 10:18:30 +08:00
Yuan
5604ad84ed Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-12 16:21:18 +08:00
Yuan
9041048e5a ibp 2023-10-12 16:21:12 +08:00
fan
608836a628 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 15:47:25 +08:00
fan
4867ce05a6 门控箱数据调整 2023-10-12 15:47:20 +08:00
joylink_zhaoerwei
23160cc746 屏蔽门增加编组列表数据管理 2023-10-12 15:14:03 +08:00
fan
6a2a393bf0 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 13:22:32 +08:00
fan
25a46b7963 地图数据调整 2023-10-12 13:22:26 +08:00
joylink_zhaoerwei
0a58cc6327 设备关联关系增加类型 2023-10-12 10:14:38 +08:00
fan
85290a8ba9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 10:12:08 +08:00
fan
2b6e6b32a2 psl数据调整 2023-10-12 10:12:02 +08:00
joylink_zhaoerwei
c772733535 屏蔽门 2023-10-11 17:35:10 +08:00
fan
a8fa6fec18 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-11 10:36:52 +08:00
fan
44feb5e6e2 关联站台调整 2023-10-11 10:36:46 +08:00
joylink_zhaoerwei
43b8a965ff 站台增加关联车站和子屏蔽门数量可变 2023-10-10 15:38:45 +08:00
fan
6a27f93fe9 psl调整 2023-10-09 18:24:22 +08:00
Yuan
9945a2001a 新增ibp盘界面 2023-10-09 16:45:26 +08:00
fan
da65562e42 psl数据调整 2023-10-08 15:48:51 +08:00
fan
8403e90692 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-08 10:31:45 +08:00
fan
d46d0c8197 psl设备数据调整 2023-10-08 10:31:38 +08:00
weizhihong
b25e7d6d34 【增加加速度字段】 2023-10-07 16:49:22 +08:00
weizhihong
6702c9ad58 【道岔逻辑】 2023-10-07 15:38:52 +08:00
weizhihong
62bbe3a0de 【失表状态】 2023-10-07 09:32:07 +08:00
weizhihong
19514bc550 【增加增量继电器属性】 2023-09-28 10:14:39 +08:00
weizhihong
35e347cd89 【添加继电器状态】 2023-09-27 17:04:13 +08:00
weizhihong
60ea471ebf 【增加道岔转动状态】 2023-09-27 14:52:59 +08:00
dong
8c5f325dbc 添加公里标转换列表 2023-09-26 09:23:00 +08:00
joylink_zhaoerwei
14730acd01 断相保护器 2023-09-25 17:34:55 +08:00
0495b44dfc 增加公里标转换proto message;修改部分bug 2023-09-25 10:34:21 +08:00
joylink_zhaoerwei
79d14ba8e8 继电器注掉字段 2023-09-22 17:55:06 +08:00
joylink_zhaoerwei
87f8129766 继电器类型枚举加unknow 2023-09-22 15:56:34 +08:00
joylink_zhaoerwei
38b3c74776 继电器相关字段修改--枚举 2023-09-22 15:19:46 +08:00
fan
071f751068 站台删除集中站数据 2023-09-22 10:08:21 +08:00
fan
0413df374c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-09-21 13:11:35 +08:00
fan
5090c91e9e 设备所属集中站添加 2023-09-21 13:11:29 +08:00
joylink_zhaoerwei
db19234f9e uniqueId字段修改 2023-09-21 11:03:35 +08:00
joylink_zhaoerwei
62dfd5b37d uniqueId信号布置图 2023-09-21 09:09:07 +08:00
joylink_zhaoerwei
90cdd389e5 uniqueId配置 2023-09-20 15:31:56 +08:00
joylink_zhaoerwei
473f7da13f 去除虚拟计轴 2023-09-20 14:36:15 +08:00
weizhihong
be738fbf2d 【仿真状态增加属性】 2023-09-19 10:49:06 +08:00
joylink_zhaoerwei
b6bb68aa99 继电器柜 2023-09-13 17:26:44 +08:00
Yuan
fad24da7d9 道岔增加转辙机型号 2023-09-13 15:32:57 +08:00
weizhihong
d1f19ee2d5 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-09-12 16:11:48 +08:00
weizhihong
15dbd56d82 【增加列车公里标信息】 2023-09-12 16:11:41 +08:00
Yuan
53175169cb 轨道区段支持曲线 2023-09-12 15:42:39 +08:00
Yuan
b5f6da2c21 物理区段曲线分段数 2023-09-12 14:56:39 +08:00
weizhihong
a5e5d1a2df Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-09-12 08:55:36 +08:00
weizhihong
754f89f69a 【增加udp服务终端属性】 2023-09-12 08:55:20 +08:00
joylink_zhaoerwei
8a77cea2d8 继电器柜图增加集中站属性 2023-09-11 17:46:30 +08:00
joylink_zhaoerwei
5b9b1500b8 继电器关联列表 2023-09-08 17:57:19 +08:00
Yuan
cede84e136 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-09-07 16:54:34 +08:00
Yuan
192e3b77b6 区段增加曲线 2023-09-07 16:54:32 +08:00
joylink_zhaoerwei
79afa31556 修改继电器柜的proto 2023-09-06 09:31:44 +08:00
weizhihong
9f5ab0590c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-09-05 15:06:58 +08:00
weizhihong
bf7aec42f0 【将列车速度修改为整型】 2023-09-05 15:06:51 +08:00
joylink_zhaoerwei
c1a43c1179 增加计轴选项--区段边界 2023-09-05 11:29:16 +08:00
weizhihong
e33f466f12 【增加状态属性】 2023-08-30 10:30:38 +08:00
weizhihong
b3ade07007 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-30 10:26:47 +08:00
weizhihong
c3e115d92f 【增加仿真管理状态消息】 2023-08-30 10:26:35 +08:00
fan
489b023b4b psl数据调整 2023-08-29 17:40:10 +08:00
fan
57784d00f2 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-28 16:36:31 +08:00
fan
7ffdcae0ed psl数据调整 2023-08-28 16:36:24 +08:00
joylink_zhaoerwei
cb2eeca59b 继电器柜 2023-08-25 17:14:44 +08:00
weizhihong
e8d0e1e675 修改属性名 2023-08-25 15:57:57 +08:00
weizhihong
df702204a2 修改属性类型 2023-08-25 15:54:52 +08:00
weizhihong
cb1ae7482d 修改字段类型 2023-08-25 15:45:06 +08:00
weizhihong
25d731c9ca 列车增加初始速度 2023-08-25 15:43:56 +08:00
weizhihong
47f5b0d171 修改状态字段索引 2023-08-25 15:39:08 +08:00
weizhihong
5c10464724 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-25 15:38:03 +08:00
weizhihong
f7ee15d822 【将动力学信息提出】 2023-08-25 15:37:55 +08:00
e39db47396 草稿数据增加类型 2023-08-25 15:37:27 +08:00
fan
cf291d6372 增加psl数据 2023-08-25 14:41:21 +08:00
fan
45f19cff37 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-25 09:01:45 +08:00
fan
4ccc0478af 增加画面枚举 2023-08-25 09:01:39 +08:00
weizhihong
8cb151ed76 【增加列车车头方向,vobc的设备状态】 2023-08-23 09:37:58 +08:00
fan
5d09a37666 停车标调整 2023-08-18 15:44:25 +08:00
Yuan
db3e78e4a6 merge 2023-08-15 11:14:53 +08:00
Yuan
0c23c16549 轨道区段 2023-08-15 11:13:55 +08:00
weizhihong
ab41f6836f 【增加列车状态属性】 2023-08-14 10:39:18 +08:00
weizhihong
5618f0586e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-11 16:09:52 +08:00
weizhihong
f71e3cd5c7 【去除link多余属性】 2023-08-11 16:09:35 +08:00
dong
3fa3c21212 标注曲度半径 2023-08-11 10:43:25 +08:00
weizhihong
b301710b88 【计算link增加属性,是否从设备A端到B端字段】 2023-08-10 14:33:04 +08:00
weizhihong
269cba242a 列车增加设备端口信息 2023-08-09 17:30:44 +08:00
weizhihong
36b8fa6abf 【列车增加车头设备ID、车头偏移量】 2023-08-09 17:20:18 +08:00
weizhihong
7bc8fe7113 link关联设备增加设备类型 2023-08-08 18:01:57 +08:00
fan
bb62bff23f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-08 11:13:38 +08:00
fan
2c8dc282ed 格式调整 2023-08-08 11:13:32 +08:00
dong
1d3261ea7e 注释修改 2023-08-08 10:36:22 +08:00
dong
569f238b59 添加曲度 2023-08-07 17:54:44 +08:00
Yuan
c592e915a2 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-08-07 16:20:39 +08:00
Yuan
e59c4849f0 曲度公里标 2023-08-07 16:20:31 +08:00
weizhihong
9830db4a12 修改link唯一标识名字 2023-08-07 16:06:41 +08:00
weizhihong
7e1295fe21 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-08-07 16:05:14 +08:00
weizhihong
e50c1ad8b5 【增加link唯一标识字段】 2023-08-07 16:04:58 +08:00
Yuan
469df6f62c 曲度公里标 2023-08-07 15:27:43 +08:00
Yuan
76917f9e01 大小写 2023-08-07 15:21:19 +08:00
Yuan
b62e9b13e4 merge 2023-08-07 15:04:45 +08:00
Yuan
bc099e6530 坡度和弯径公里标数据设为repeated 2023-08-07 15:04:09 +08:00
joylink_zhaoerwei
08c15c1533 注释 2023-08-07 14:33:32 +08:00
dong
216c0eca14 添加应答器关联关系 2023-08-07 11:06:22 +08:00
joylink_zhaoerwei
1db196077c 坡度字段修改 2023-08-04 17:45:08 +08:00
Yuan
86bf1f0c76 merge 2023-08-04 17:29:07 +08:00
Yuan
9581fc07dd merge 2023-08-04 16:36:55 +08:00