|
|
1facbfeb2b
|
【bug】车库门强制开关门无效；洗车机取消故障后依然有紧急停车
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m38s
|
2024-04-07 13:38:30 +08:00 |
|
tiger_zhou
|
9b58348297
|
列车pc仿真
|
2024-04-02 18:20:10 +08:00 |
|
|
|
f12b72cc04
|
【bug】洗车机状态发送及洗车机操作
|
2024-04-02 15:59:55 +08:00 |
|
|
|
49e3199c06
|
【新增】洗车机模型构建、ecs实体构建
【修改】洗车机ecs电路系统逻辑
|
2024-04-02 14:09:42 +08:00 |
|
|
|
c9dda72725
|
【新增】继电器组合的设备类型是防淹门时，视同车库门
|
2024-04-01 14:07:56 +08:00 |
|
|
|
3ae2f14a16
|
【新增】防淹门构建为车库门模型逻辑
【bug】当缺少继电器时，车库门的ecs系统逻辑和状态发送逻辑执行出错
|
2024-04-01 13:31:38 +08:00 |
|
|
|
32c575125f
|
【修改】车库门继电器状态丢失的故障由应用层实现；不再影响继电器的实际状态；也不再导致门故障继电器接通；
|
2024-03-29 16:46:31 +08:00 |
|
|
|
6f327f751b
|
【新增】防淹门模型构建（暂时与车库门用相同模型）
【修改】因车库门PSL盘对象被删除，修改相应的构建逻辑
|
2024-03-29 14:59:20 +08:00 |
|
|
|
ef9e431afd
|
【bug】车库门操作、状态发送等逻辑中的bug
|
2024-03-27 14:15:35 +08:00 |
|
|
|
141cc633b9
|
【新增】车库门PSL模型构建及相关ecs逻辑；
【改动】车库门ecs逻辑
|
2024-03-26 13:12:17 +08:00 |
|
|
|
da98777b04
|
【新增】车库门及车库门控制盒操作接口
|
2024-03-20 14:35:35 +08:00 |
|
tiger_zhou
|
774355ca4d
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-19 14:49:44 +08:00 |
|
tiger_zhou
|
6958259e03
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-19 11:00:19 +08:00 |
|
tiger_zhou
|
38f586dea4
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-19 09:58:06 +08:00 |
|
tiger_zhou
|
752dfa11eb
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-19 09:54:32 +08:00 |
|
tiger_zhou
|
82979f5ab1
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-19 09:19:38 +08:00 |
|
tiger_zhou
|
12145b8539
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-19 08:28:50 +08:00 |
|
tiger_zhou
|
51a715bf7a
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-15 17:50:18 +08:00 |
|
tiger_zhou
|
837c39f11f
|
列车前端操作接口，列车连接三方映射接口及ws返回列车连接状态
|
2024-03-15 16:03:47 +08:00 |
|
tiger_zhou
|
4540528528
|
速传，雷达输出数值功能
|
2024-03-11 16:15:02 +08:00 |
|
|
|
23d441981c
|
修改添加列车时初速度的处理逻辑；修改本地模拟半实物逻辑
|
2024-02-26 10:48:45 +08:00 |
|
|
|
fee0bed151
|
删除列车后可再次添加相同编号列车
|
2024-02-23 10:43:06 +08:00 |
|
|
|
a040d2f502
|
修改列车BTM信息的报文为最后收到的报文；修改BTM探测逻辑执行不需要【车载应答器天线功率放大器】为开启状态；修改车尾位置计算bug
|
2024-02-21 14:54:17 +08:00 |
|
|
|
2c197360e8
|
修改【取消停止发送报文】接口无效bug
|
2024-02-20 14:48:40 +08:00 |
|
|
|
0c6e9a37d8
|
修改IBP盘构建逻辑、操作接口、状态收集逻辑；修改PSL构建bug
|
2024-02-20 14:18:42 +08:00 |
|
|
|
420b18fccd
|
修改PSL和IBP构建模型的逻辑
|
2024-02-20 09:20:52 +08:00 |
|
|
|
ef05b8a253
|
门控箱相关继电器不再能直接控制屏蔽门，而是被联锁采集后由联锁发起控制；MPJ和JXTCPLJ改为仅供联锁采集
|
2024-02-18 18:26:13 +08:00 |
|
|
|
0bdc8481e2
|
增加车尾设备及偏移量状态赋值逻辑
|
2024-02-06 18:00:39 +08:00 |
|
|
|
a2487c225b
|
列车状态增加BTM状态（逻辑中为BTM状态字段赋值）
|
2024-02-06 16:39:56 +08:00 |
|
tiger_zhou
|
b525015853
|
摁钮旁路及旁路复位还原
|
2024-02-06 10:51:25 +08:00 |
|
|
|
46f8eba8c2
|
增加应答器停止发送报文故障；增加应答器工作状态状态；增加列车车尾位置（仅数据结构，无赋值逻辑）
|
2024-02-06 09:30:58 +08:00 |
|
tiger_zhou
|
ce71540de2
|
列车添加参数调整，列车全部删除，摁钮旁路，旁路复位功能
|
2024-02-04 18:22:52 +08:00 |
|
|
|
09ebf4293f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bj-rtss-message
# dto/state_proto/device_state.pb.go
|
2024-01-29 14:42:57 +08:00 |
|
|
|
f50f847819
|
增加继电器驱采表状态；修改Repo构建时基础检查逻辑
|
2024-01-29 14:42:12 +08:00 |
|
tiger_zhou
|
1a7385e513
|
动力学列车故障参数调整
|
2024-01-29 14:22:12 +08:00 |
|
tiger_zhou
|
30ec740426
|
加速计
|
2024-01-26 17:57:35 +08:00 |
|
|
|
ec48b5f48a
|
应答器增加可变报文状态及操作
|
2024-01-24 17:45:16 +08:00 |
|
tiger_zhou
|
5ee14ba52e
|
雷达发送功能
|
2024-01-24 17:12:34 +08:00 |
|
|
|
4dfe137658
|
修改屏蔽门操作请求
|
2024-01-23 18:02:39 +08:00 |
|
|
|
007ec388b8
|
Merge remote-tracking branch 'origin/master'
|
2024-01-23 16:46:20 +08:00 |
|
|
|
5c0f16e352
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-23 09:37:36 +08:00 |
|
|
|
93d71f6125
|
添加第三方服务状态发送
修改仿真状态发送为定时发送
|
2024-01-23 09:37:31 +08:00 |
|
|
|
19c67811d0
|
Merge remote-tracking branch 'origin/master'
|
2024-01-23 09:20:10 +08:00 |
|
|
|
f96797d6e3
|
修改重置应答器报文bug；修改转发列车控制消息逻辑bug
|
2024-01-23 09:19:01 +08:00 |
|
tiger_zhou
|
7a92dab7b3
|
动力学列车数据配置调整
|
2024-01-22 17:46:26 +08:00 |
|
|
|
71bda3db44
|
区段操作调整
|
2024-01-22 15:56:40 +08:00 |
|
|
|
f6a6ef3175
|
修改proto文件[应答器固定用户报文]字段名
|
2024-01-22 11:27:18 +08:00 |
|
|
|
d184cd961d
|
应答器增加[固定报文]和[固定用户报文]状态及修改功能
|
2024-01-22 11:06:30 +08:00 |
|
|
|
46552b9b9d
|
修改发送给动力学的道岔信息的code
|
2024-01-19 11:17:36 +08:00 |
|
tiger_zhou
|
dff8cbab87
|
动力学列车数据配置
|
2024-01-18 17:17:48 +08:00 |
|
tiger_zhou
|
118fe91900
|
动力学列车数据配置
|
2024-01-18 16:33:27 +08:00 |
|
|
|
1237abc9e9
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-18 14:11:52 +08:00 |
|
|
|
21484afa21
|
道岔、信号机状态调整
|
2024-01-18 14:11:47 +08:00 |
|
tiger_zhou
|
21d04e9e4c
|
动力学列车数据配置
|
2024-01-18 13:57:57 +08:00 |
|
|
|
b253a18791
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2024-01-18 13:11:55 +08:00 |
|
|
|
4c229abc03
|
道岔，信号机设置参数功能开发实现
|
2024-01-18 13:10:28 +08:00 |
|
tiger_zhou
|
550049efa6
|
动力学列车数据配置
|
2024-01-18 10:48:04 +08:00 |
|
|
|
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 |
|
|
|
66d31f80f2
|
修改应答器移位操作的报错提示信息
|
2024-01-18 10:08:55 +08:00 |
|
|
|
bf9d65c5a7
|
信号机强制点灯开发
|
2024-01-18 09:26:04 +08:00 |
|
|
|
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 |
|
|
|
7266cd32f8
|
道岔和信号机操作功能调整
|
2024-01-17 17:49:11 +08:00 |
|
|
|
9595fe9f6f
|
处理应答器报文数据类型问题
|
2024-01-17 17:15:35 +08:00 |
|
|
|
5198855faa
|
Merge remote-tracking branch 'origin/master'
|
2024-01-17 17:03:41 +08:00 |
|
|
|
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 |
|
|
|
2b6093af4f
|
修改道岔状态数据结构
|
2024-01-17 17:01:43 +08:00 |
|
tiger_zhou
|
8f54503ab3
|
动力学列车数据配置
|
2024-01-17 15:53:14 +08:00 |
|
tiger_zhou
|
72374630de
|
动力学列车数据配置
|
2024-01-17 13:09:45 +08:00 |
|
|
|
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 |
|
|
|
87d81c58b3
|
删除旧代码
|
2024-01-17 09:27:00 +08:00 |
|
tiger_zhou
|
7833e4bb55
|
动力学列车数据配置
|
2024-01-16 17:53:54 +08:00 |
|
|
|
14896b2dce
|
与前端传递的应答器报文改为16进制字符串
|
2024-01-16 13:44:28 +08:00 |
|
|
|
b22202ac21
|
修改应答器移位操作：必须在link边界或相邻应答器之间，越过或重叠时报错
|
2024-01-11 13:55:19 +08:00 |
|
|
|
49ec42e546
|
修改proto文件编译逻辑；修改proto文件编译位置并修改其它文件对生成的文件的引用
|
2024-01-11 10:24:56 +08:00 |
|
|
|
d4f8d3416f
|
解决代码冲突
|
2024-01-10 14:17:15 +08:00 |
|
|
|
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 |
|
|
|
0818438098
|
proto文件增加设备状态；实现应答器的相关接口
|
2024-01-10 14:06:01 +08:00 |
|
|
|
c27ef7c675
|
merge调整
|
2024-01-10 11:17:32 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
32b4b9ba02
|
处理循环引用问题
|
2024-01-09 14:51:57 +08:00 |
|
|
|
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
|
e0085c4513
|
【修改地图数据缓存结构】【数据版本处理】
|
2023-12-15 17:02:42 +08:00 |
|
weizhihong
|
52cdb57d47
|
【地图元素ID类型改变】
|
2023-12-14 13:04:48 +08:00 |
|
weizhihong
|
3edeec44c6
|
【增加地图元素commonId转换方法】
|
2023-12-13 15:05:42 +08:00 |
|
|
|
f0fd68b5d6
|
初步实现联锁驱采Modbus服务
|
2023-12-13 11:22:30 +08:00 |
|
|
|
999d3b2767
|
修改道岔挤岔状态采集问题
添加git子模块jl-iot
|
2023-12-11 13:13:56 +08:00 |
|
joylink_zhangsai
|
61f6a52dcc
|
修改屏蔽门操作逻辑
|
2023-12-08 17:43:21 +08:00 |
|
joylink_zhangsai
|
685a3b0902
|
修改屏蔽门ecs逻辑
|
2023-12-08 16:46:50 +08:00 |
|
weizhihong
|
feace07dea
|
【增加日志打印】
|
2023-12-07 16:15:29 +08:00 |
|
weizhihong
|
7545bd2ca6
|
【修改IBP设备UID逻辑】
|
2023-12-07 10:17:48 +08:00 |
|
weizhihong
|
7cb868dcfc
|
【修改IBP设备组合逻辑】（消息未修改）
|
2023-12-06 14:00:55 +08:00 |
|
weizhihong
|
745fb55110
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-05 13:59:34 +08:00 |
|
weizhihong
|
a7e051648d
|
【增加过滤其他线路逻辑】
|
2023-12-05 13:59:27 +08:00 |
|
xzb
|
163c0f53c2
|
balise detect 预测实现
|
2023-12-05 09:37:34 +08:00 |
|
weizhihong
|
f7c9c2ab36
|
【修改UID初始化逻辑】
|
2023-11-30 10:59:34 +08:00 |
|
xzb
|
7cdde1b7ef
|
btm
|
2023-11-28 13:30:10 +08:00 |
|
xzb
|
5a20d78aa3
|
btm
|
2023-11-24 15:20:05 +08:00 |
|
xzb
|
09e1ad68f9
|
应答器实体
|
2023-11-23 13:30:08 +08:00 |
|
xzb
|
1db6385821
|
应答器固定报文
|
2023-11-22 13:43:43 +08:00 |
|
weizhihong
|
1453b4877c
|
【IBP灯匹配组合逻辑】
|
2023-11-20 16:17:37 +08:00 |
|
weizhihong
|
0c581d815e
|
【删除Index】
|
2023-11-17 18:15:27 +08:00 |
|
weizhihong
|
b8efe7e11b
|
【修改地图发布逻辑】【列车参数修改】【删除原来的link生成逻辑】【电机UDP逻辑处理】
|
2023-11-17 16:22:22 +08:00 |
|
xzb
|
d08183f4dc
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
# go.work.sum
|
2023-11-16 17:22:30 +08:00 |
|
xzb
|
cf43b850aa
|
信号机模型枚举
|
2023-11-16 17:21:05 +08:00 |
|
|
|
2abd4e4f92
|
添加mqtt发布客户端及配置
注销centrifugo发布客户端grpc及配置
调整go mod
|
2023-11-16 16:54:23 +08:00 |
|
weizhihong
|
60f58060ad
|
【删除多余方法】
|
2023-11-15 15:03:37 +08:00 |
|
weizhihong
|
bef31c4dbb
|
【注释轮径信息】
|
2023-11-15 11:03:46 +08:00 |
|
weizhihong
|
40662afc18
|
【推送半实物信息时增加列车轮径信息】
|
2023-11-15 09:54:16 +08:00 |
|
xzb
|
9595b11f52
|
rssp axle test
|
2023-11-14 17:57:54 +08:00 |
|
xzb
|
3f89c45891
|
rssp axle test
|
2023-11-14 10:31:06 +08:00 |
|
weizhihong
|
7893db2b5c
|
【仿真修改轮径接口】
|
2023-11-13 15:57:32 +08:00 |
|
weizhihong
|
f0a8ce97ad
|
【修改列车占用逻辑】
|
2023-11-10 10:54:35 +08:00 |
|
weizhihong
|
e160fa1aaf
|
【动力学列车长度修改】
|
2023-11-10 09:28:27 +08:00 |
|
weizhihong
|
065330e445
|
【修改列车占用逻辑】
|
2023-11-09 17:54:31 +08:00 |
|
weizhihong
|
fd12c74e6f
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 15:58:23 +08:00 |
|
weizhihong
|
1c074ff258
|
【动力学列车信息变化逻辑修改】
|
2023-11-09 15:58:16 +08:00 |
|
|
|
2387b9e90a
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 14:27:40 +08:00 |
|
|
|
2f17438079
|
修改零散组合构建
|
2023-11-09 14:27:35 +08:00 |
|
weizhihong
|
de7d72b92a
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 14:19:54 +08:00 |
|
weizhihong
|
feb497b5b5
|
【增加车头车尾寻找物理区段方法】
|
2023-11-09 14:19:48 +08:00 |
|
xzb
|
dbb34d94bf
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-09 13:06:27 +08:00 |
|
xzb
|
4dc9f06d27
|
计轴rssp 集成
|
2023-11-09 13:05:29 +08:00 |
|
|
|
8198f1895d
|
Merge remote-tracking branch 'origin/master'
|
2023-11-09 10:54:28 +08:00 |
|
|
|
9b5f7454bc
|
增加间隙探测继电器及相关逻辑；修改屏蔽门控制逻辑实现
|
2023-11-09 10:53:32 +08:00 |
|
weizhihong
|
c10f989935
|
【修改注释】
|
2023-11-09 10:20:50 +08:00 |
|
weizhihong
|
e461e762e4
|
【删除列车头部所在UID】
|
2023-11-08 15:19:42 +08:00 |
|
weizhihong
|
256a9bc4cc
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-08 11:02:57 +08:00 |
|
weizhihong
|
b2dfb124e1
|
【重构link与设备转换关系】
|
2023-11-08 11:02:41 +08:00 |
|
xzb
|
0887ac8d68
|
计轴rssp 集成
|
2023-11-07 17:47:47 +08:00 |
|
xzb
|
4cd8ada0ff
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-07 15:10:49 +08:00 |
|
xzb
|
d15ad494e0
|
计轴rssp 集成
|
2023-11-07 15:10:19 +08:00 |
|
|
|
2c02384b4e
|
Merge remote-tracking branch 'origin/master'
|
2023-11-07 14:31:10 +08:00 |
|
|
|
efa53c2354
|
修改模型数据构建bug；屏蔽门所有继电器都会构建为实体
|
2023-11-07 14:30:08 +08:00 |
|
xzb
|
26db808d23
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-07 13:23:20 +08:00 |
|
xzb
|
155f0b4f8a
|
计轴rssp 集成
|
2023-11-07 13:22:47 +08:00 |
|
weizhihong
|
68c51bab51
|
【处理获取地图类型不存在的问题】【处理屏蔽门双车站问题】
|
2023-11-07 10:49:15 +08:00 |
|
|
|
1e2b0bd729
|
Merge remote-tracking branch 'origin/master'
|
2023-11-07 10:03:57 +08:00 |
|
|
|
01bd98a4d5
|
门控箱继电器数据中的PDBJ视为PABJ
|
2023-11-07 10:03:12 +08:00 |
|
weizhihong
|
0cc01420ba
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-07 09:22:54 +08:00 |
|
weizhihong
|
ff655d0748
|
【站台继电器状态】
|
2023-11-07 09:22:46 +08:00 |
|
|
|
d6b4e25478
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-11-06 17:33:14 +08:00 |
|
|
|
8d9b120a98
|
零散组合数据构建
|
2023-11-06 17:33:09 +08:00 |
|
weizhihong
|
bc15e99d93
|
【站台状态】
|
2023-11-06 17:15:00 +08:00 |
|
weizhihong
|
41f55ba9eb
|
【修改联锁采集结构体信息】
|
2023-11-06 15:20:45 +08:00 |
|
