Commit Graph

381 Commits

Author SHA1 Message Date
fan
68bb38dfe5 缩写 2023-11-16 16:57:47 +08:00
fan
496c1108b8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-16 16:54:33 +08:00
fan
05b24269a8 添加信号机所属车站 2023-11-16 16:54:29 +08:00
joylink_zhaoerwei
7aa3851130 车站增加车辆段和站名简写 2023-11-16 16:22:35 +08:00
weizhihong
dba7ea4f29 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-16 15:59:24 +08:00
weizhihong
2f39506cf6 【列车参数】 2023-11-16 15:59:17 +08:00
fan
9b1d2ca01f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-16 15:52:03 +08:00
fan
7435e2b169 添加发车计时器 2023-11-16 15:51:58 +08:00
xzb
be53fb3438 信号机模型枚举 2023-11-16 11:15:55 +08:00
xzb
443710abd5 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-11-16 11:03:44 +08:00
xzb
f1baf048c5 信号机模型枚举 2023-11-16 11:02:18 +08:00
weizhihong
e388e774f4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-13 14:12:05 +08:00
weizhihong
a0dbaab3dc 【增加列车轮径信息】 2023-11-13 14:11:58 +08:00
joylink_zhaoerwei
2d58198cfc 生成计轴配置增加指定的道岔组不生成计轴 2023-11-10 17:13:56 +08:00
joylink_zhaoerwei
7ab9e3b83c 增加生成计轴配置 2023-11-10 15:07:30 +08:00
fan
c04ff2635f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-10 09:23:32 +08:00
fan
ee2e7aa2d6 增加信标 2023-11-10 09:23:27 +08:00
weizhihong
3d3461d09b 【增加给前端发送的道岔占用状态】 2023-11-09 18:01:39 +08:00
5b6e90cf4e 增加间隙探测继电器及相关逻辑;修改屏蔽门控制逻辑实现 2023-11-09 10:53:22 +08:00
joylink_zhaoerwei
3dddb31503 增加屏蔽门配置--子门和编组 2023-11-08 16:13:36 +08:00
weizhihong
9444331238 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-08 14:49:09 +08:00
weizhihong
11934a1708 去除列车中uid信息 2023-11-08 14:49:02 +08:00
joylink_zhaoerwei
40592a05d1 删除组合类型列表+增加关联设备类型断路器和电源屏 2023-11-08 13:09:06 +08:00
weizhihong
fba9d69795 【修改站台屏蔽门消息格式】 2023-11-08 11:25:44 +08:00
weizhihong
fe2d65a91d 【站台继电器状态修改】 2023-11-06 17:51:54 +08:00
weizhihong
ad46463cdf 【增加门控箱状态】 2023-11-06 17:42:42 +08:00
weizhihong
ffaa979222 【修改spks继电器状态属性】 2023-11-06 17:10:09 +08:00
weizhihong
05f0f5f5d5 【修改站台信息】 2023-11-06 16:48:34 +08:00
weizhihong
85196466da 【删除spks、emp状态,增加站台继电器状态】 2023-11-06 16:41:19 +08:00
weizhihong
d1f0f7ddf5 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-06 14:15:41 +08:00
weizhihong
fe58c72ee0 【站场图emp按钮状态】 2023-11-06 14:15:34 +08:00
ce7d7d49dc 增加屏蔽门故障操作及逻辑 2023-11-06 10:52:53 +08:00
280219a91a 修改屏蔽门状态;修改滑动门ecs实体构建bug 2023-11-03 10:41:46 +08:00
weizhihong
29711ded19 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-02 17:00:48 +08:00
weizhihong
442cdbead9 【增加站场图SPKS状态】 2023-11-02 17:00:41 +08:00
92c5696b7e 增加屏蔽门操作接口;实现屏蔽门操作 2023-11-02 15:49:58 +08:00
weizhihong
ebfb67be9c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-11-01 16:00:39 +08:00
weizhihong
e8d31c56bc 【列车状态增加设备所在UID属性】 2023-11-01 16:00:29 +08:00
xzb
2a14cd39d1 计轴区段 2023-11-01 11:10:54 +08:00
xzb
df9ed054c0 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-31 16:22:33 +08:00
xzb
275dc5659c axle section request 2023-10-31 16:22:01 +08:00
b6e6290cb1 道岔添加状态 2023-10-31 15:13:05 +08:00
c81c2fb311 道岔添加强制操作 2023-10-31 11:21:01 +08:00
Yuan
596dd05920 区段操作 2023-10-30 17:32:11 +08:00
xzb
123622f28c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-30 17:22:21 +08:00
xzb
023d9e9635 计轴区段操作 2023-10-30 17:22:03 +08:00
weizhihong
8afde905e5 【增加仿真状态说明】 2023-10-27 14:18:30 +08:00
weizhihong
f9e8236bd9 【删除仿真状态列表结构】 2023-10-27 14:02:43 +08:00
weizhihong
3927f19f15 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-27 09:24:29 +08:00
weizhihong
d4f48cccc2 【仿真状态增加运行环境ID】 2023-10-27 09:24:16 +08:00
6cf87ed06c 修改go生成的目录 2023-10-26 17:15:57 +08:00
joylink_zhaoerwei
b18218fdb1 驱动继电器列表初提交 2023-10-25 14:36:11 +08:00
dong
60ead5ac3d 物理区段码位列表 2023-10-25 10:47:38 +08:00
joylink_zhaoerwei
f0bfa36757 采集继电器列表初提交 2023-10-24 17:03:53 +08:00
xzb
6827f9671a Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-24 09:35:39 +08:00
xzb
de134d38bb 计轴区段操作枚举定义 2023-10-24 09:35:22 +08:00
joylink_zhaoerwei
60ed5685cf 添加信号机故障报警仪设备,组合里设备类型添加信号机故障报警仪 2023-10-23 16:31:00 +08:00
weizhihong
9b1c6d7801 【增加钥匙状态】 2023-10-20 10:53:39 +08:00
joylink_zhaoerwei
0a7a459560 增加车站名 2023-10-20 10:00:51 +08:00
xzb
8e5d8faf7b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-19 17:39:55 +08:00
xzb
9841fd10c9 信号机模型类型 2023-10-19 17:39:26 +08:00
96ec7a2b07 增加屏蔽门状态返回 2023-10-19 17:31:26 +08:00
joylink_zhaoerwei
1ffe7fa6a5 增加地图的公里标主坐标系 2023-10-19 17:23:44 +08:00
xzb
76edc8de95 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD 2023-10-19 17:12:21 +08:00
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