Commit Graph

210 Commits

Author SHA1 Message Date
tiger_zhou
a41cd63038 设备添加集中站id 2023-08-03 11:00:57 +08:00
Yuan
605c24f4e3 区段 2023-07-27 15:05:23 +08:00
Yuan
ec5889fd03 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-message 2023-07-26 13:06:40 +08:00
Yuan
189703de4e 道岔 2023-07-26 13:06:37 +08:00
7567e2953e 报警记录增加报警地点数据;AlertType和AlertLocation使用proto文件定义 2023-07-26 09:56:53 +08:00
b3b9885e27 Merge remote-tracking branch 'origin/master' 2023-07-24 16:20:10 +08:00
e9ebd34921 修改报警信息内容(proto文件同步修改) 2023-07-24 16:19:49 +08:00
weizhihong
c9a07e75f0 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-07-21 16:59:37 +08:00
weizhihong
c29caf7b89 设备公里标信息修改 2023-07-21 16:59:30 +08:00
edc9973662 Merge remote-tracking branch 'origin/master' 2023-07-21 10:24:53 +08:00
e521fa9d33 增加模拟故障接口;增加绘图数据维护;注释循环故障报警逻辑 2023-07-21 10:23:33 +08:00
joylink_zhaoerwei
81363b68ea 字段修改 2023-07-21 10:00:25 +08:00
weizhihong
4f27cc3670 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-07-20 17:39:09 +08:00
weizhihong
0f5294b09d 增加区段目的地码 2023-07-20 17:39:03 +08:00
fan
bdcbbf2c04 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-07-20 15:50:35 +08:00
fan
ed8634ea3e 运行线添加虚线部分 2023-07-20 15:50:29 +08:00
joylink_zhaoerwei
e9804dd24b 车站名字--站台上下行和关联车站 2023-07-20 11:10:25 +08:00
tiger_zhou
eb0ad6e430 模拟设备状态变更接口调整 2023-07-19 11:19:20 +08:00
weizhihong
90b6f4600e 修改字段名称 2023-07-19 10:49:30 +08:00
weizhihong
a6d24ad789 将逻辑区段修改为区段ID 2023-07-19 10:23:10 +08:00
weizhihong
d9923fa1db 修改区段设备结构 2023-07-19 10:17:42 +08:00
weizhihong
d08959ee41 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-07-19 09:21:03 +08:00
weizhihong
bce5c4845f 增加父级区段信息 2023-07-19 09:20:54 +08:00
Yuan
2d6ac2275e Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-message 2023-07-19 09:00:03 +08:00
Yuan
bdd3152092 物理区段 2023-07-19 09:00:00 +08:00
joylink_zhaoerwei
f1dfb5e4bd 车次窗关联设备 2023-07-18 13:56:54 +08:00
Yuan
84796ff001 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-message 2023-07-18 10:36:01 +08:00
Yuan
1f8152527e 逻辑区段 2023-07-18 10:35:58 +08:00
tiger_zhou
f86b357685 更新列车目的地码 2023-07-17 17:30:32 +08:00
Yuan
a91685b8de Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-message 2023-07-17 16:12:56 +08:00
Yuan
05d0643e31 逻辑区段 2023-07-17 16:12:51 +08:00
2b1cf46a4b AlertInfo增加设备信息和故障原因字段 2023-07-17 16:00:28 +08:00
fan
64ee293e0d Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-07-17 13:47:52 +08:00
fan
b37c99bc17 改修pathLine 2023-07-17 13:47:47 +08:00
874a6fe4fa 重新生成proto->java;修改报警决策信息CURD接口 2023-07-14 17:42:53 +08:00
6c2387311a alertInfo.proto使用基础数据类型 2023-07-14 15:23:54 +08:00
f34687558e Merge remote-tracking branch 'origin/master' 2023-07-14 10:21:48 +08:00
Yuan
e8ac230708 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-message 2023-07-13 17:59:20 +08:00
Yuan
a097dac7f7 区段 2023-07-13 17:59:18 +08:00
fan
76db5e5781 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-07-13 15:32:48 +08:00
fan
0bfe31c66d 修改轨迹线数据 2023-07-13 15:32:43 +08:00
Yuan
2d4a7c97fe merge 2023-07-13 10:35:59 +08:00
Yuan
539fdc0abf 道岔注释 2023-07-13 10:35:24 +08:00
tiger_zhou
1ab5b1ae7f 模拟设备状态变更接口 2023-07-04 15:15:46 +08:00
weizhihong
8fd000d459 修改道岔名称 2023-07-03 16:28:54 +08:00
269d2b054f Merge remote-tracking branch 'origin/master' 2023-06-30 17:54:41 +08:00
a5229b090f 修改报警的数据结构 2023-06-30 17:54:27 +08:00
fan
549aa2ec10 数据调整 2023-06-30 16:41:09 +08:00
fan
28119c0743 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-30 16:16:30 +08:00
fan
c5c70aad82 添加数据 2023-06-30 16:16:17 +08:00
weizhihong
9a7b4b7a3a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-30 14:04:04 +08:00
weizhihong
4c82f8a81b 【调整道岔公里标】 2023-06-30 14:03:58 +08:00
tiger_zhou
3c2bb59efd 数据存储调整 2023-06-30 13:53:12 +08:00
Yuan
2dad2c17b2 道岔公里标 2023-06-30 13:48:26 +08:00
weizhihong
47b0566e7c 【删除无效属性】 2023-06-30 09:48:00 +08:00
weizhihong
a850c9b8b6 【增加道岔自身的公里标】 2023-06-30 09:25:28 +08:00
Yuan
83bba70b83 道岔增加公里标 2023-06-29 18:00:32 +08:00
weizhihong
c92fd31a30 【修改公里标数据类型】 2023-06-29 16:53:48 +08:00
joylink_zhaoerwei
56adb38a1c 公里标 2023-06-29 16:38:31 +08:00
dong
0a445e4b06 添加分隔符 2023-06-29 16:25:05 +08:00
fan
0e4f2bd6fb Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-29 15:39:11 +08:00
fan
bfcd70246f 公里标系统 2023-06-29 15:39:07 +08:00
weizhihong
562de9540c 【修改公里标类型】 2023-06-29 14:20:37 +08:00
fan
9d4c94399f 公里标使用int64 2023-06-29 14:10:55 +08:00
fan
fc5a162d62 信号机公里标增加坐标系 2023-06-29 14:08:16 +08:00
fan
6c68498829 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-28 13:40:20 +08:00
fan
4b26e8a7c7 数据调整 2023-06-28 13:40:11 +08:00
joylink_zhaoerwei
2cfe2dd12b 计轴 2023-06-28 11:01:35 +08:00
tiger_zhou
51ad8e758b message 调整 2023-06-28 09:52:11 +08:00
weizhihong
39c150153d 【修改设备公里标列表】 2023-06-27 14:56:19 +08:00
joylink_zhaoerwei
7ef7cc8d64 计轴 2023-06-27 14:29:54 +08:00
tiger_zhou
fbe6c9e273 message 调整 2023-06-27 13:18:22 +08:00
fan
fbedbb7457 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-27 11:28:45 +08:00
fan
80f966f7e1 轨迹线数据更改 2023-06-27 11:28:39 +08:00
weizhihong
7d4124b580 【增加ID属性】 2023-06-27 11:24:03 +08:00
weizhihong
2de5ae92a9 【内存中的设备结构】 2023-06-27 10:48:04 +08:00
Yuan
93b999dd97 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-message 2023-06-27 09:54:09 +08:00
Yuan
6fda9b7ad7 区段数据增加 2023-06-27 09:54:05 +08:00
fan
8a7b2a4a3f Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-26 17:22:52 +08:00
fan
157f3ff8b2 运行线字段添加 2023-06-26 17:22:22 +08:00
weizhihong
fcd6072d5b 【增加车组号】 2023-06-26 16:48:02 +08:00
tiger_zhou
b5d0bb7fed 列车数据mode属性调整 2023-06-26 15:32:25 +08:00
weizhihong
ff4d94b1b3 websocket线网列车位置数据 2023-06-26 15:00:44 +08:00
tiger_zhou
a2006168c3 拆分列车信息 2023-06-26 14:47:27 +08:00
weizhihong
f69dbc04a0 区段增加公里标属性 2023-06-26 14:38:15 +08:00
weizhihong
32ac71bd13 【发布时构建的区段结构】 2023-06-26 14:34:25 +08:00
tiger_zhou
911d1999d0 线路模拟订阅数据 2023-06-26 09:56:38 +08:00
weizhihong
6f2622cd7f 【修改事件类型】 2023-06-26 09:04:00 +08:00
weizhihong
d6d6168ac1 【增加列车状态】 2023-06-26 08:54:56 +08:00
dong
f42a98cd93 列车调整 2023-06-21 10:07:38 +08:00
weizhihong
3bd4f023cd Merge remote-tracking branch 'origin/master' 2023-06-20 17:31:31 +08:00
weizhihong
524612094b 【列车增加列车标识号】 2023-06-20 17:31:22 +08:00
xzb
a305eb8072 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-20 15:56:56 +08:00
xzb
040e4cc10d 删除TransProto.proto相关 2023-06-20 15:54:36 +08:00
weizhihong
85bb4dd430 【列车模式字段类型修改】 2023-06-20 15:50:26 +08:00
weizhihong
01222c99ba 【列车增加线路ID】 2023-06-20 09:23:07 +08:00
weizhihong
1695d7f64e 【增加列车字段】 2023-06-19 17:34:56 +08:00
Yuan
b9f03f3d98 merge 2023-06-19 17:18:00 +08:00
Yuan
af3b4e09df 道岔和区段关联关系 2023-06-19 17:17:09 +08:00
weizhihong
e294d5bce0 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message 2023-06-19 16:34:26 +08:00