 joylink_zhangsai
|
d4f8d3416f
|
解决代码冲突
|
2024-01-10 14:17:15 +08:00 |
|
joylink_zhangsai
|
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 |
|
joylink_zhangsai
|
0818438098
|
proto文件增加设备状态；实现应答器的相关接口
|
2024-01-10 14:06:01 +08:00 |
 walker
|
c27ef7c675
|
merge调整
|
2024-01-10 11:17:32 +08:00 |
|
walker
|
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 |
|
walker
|
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 |
|
joylink_zhangsai
|
32b4b9ba02
|
处理循环引用问题
|
2024-01-09 14:51:57 +08:00 |
|
joylink_zhangsai
|
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
|
18b1edb235
|
【还原本地测试数据库连接】
|
2024-01-05 11:30:44 +08:00 |
|
weizhihong
|
d946536e66
|
【修改本地测试数据库连接】
|
2024-01-05 11:27:22 +08:00 |
|
weizhihong
|
2947dee109
|
【修改北京测试项目数据库IP】
|
2024-01-05 11:07:11 +08:00 |
|
weizhihong
|
bafff0315d
|
【增加消息topic注释】
|
2023-12-26 13:27:09 +08:00 |
|
weizhihong
|
96cf5e844b
|
【删除多余的case条件】
|
2023-12-25 14:25:24 +08:00 |
|
weizhihong
|
e886d5f4ef
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
# message_server/simulation_state_ms.go
|
2023-12-25 14:18:16 +08:00 |
|
weizhihong
|
7e9c9c969d
|
【仿真消息修改】
|
2023-12-25 14:15:22 +08:00 |
|
walker
|
7e9a1816fa
|
适配ecs调整
|
2023-12-25 13:28:24 +08:00 |
|
walker
|
e179497de9
|
修改modbus配置描述
|
2023-12-21 13:35:04 +08:00 |
|
walker
|
fef6fe46a4
|
适配IOT模块调整
|
2023-12-20 14:13:23 +08:00 |
|
weizhihong
|
42a5523e4a
|
【删除无用注释】
|
2023-12-20 10:38:48 +08:00 |
|
weizhihong
|
1ff7a8f28c
|
【修改MQTT消息发送逻辑】
|
2023-12-20 10:37:54 +08:00 |
|
walker
|
ee4c04cf3d
|
修改modbus驱采仿真更新逻辑使用注册驱采处理任务方式实现
|
2023-12-18 17:59:56 +08:00 |
|
walker
|
d527e528fd
|
iot接口适配
|
2023-12-18 16:26:17 +08:00 |
|
walker
|
e1498dc348
|
删除无用打印
|
2023-12-15 17:54:50 +08:00 |
|
weizhihong
|
e0085c4513
|
【修改地图数据缓存结构】【数据版本处理】
|
2023-12-15 17:02:42 +08:00 |
|
weizhihong
|
bd9542fd8d
|
【列车状态结构处理】
|
2023-12-15 09:48: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 |
|
walker
|
e4818dae33
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-13 11:24:26 +08:00 |
|
walker
|
20c38ec96d
|
修改命名
|
2023-12-13 11:24:22 +08:00 |
|
weizhihong
|
9e86faa3bc
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-13 11:23:23 +08:00 |
|
weizhihong
|
40132704b8
|
【发布地图数据回退功能】
|
2023-12-13 11:23:16 +08:00 |
|
walker
|
f0fd68b5d6
|
初步实现联锁驱采Modbus服务
|
2023-12-13 11:22:30 +08:00 |
|
walker
|
999d3b2767
|
修改道岔挤岔状态采集问题
添加git子模块jl-iot
|
2023-12-11 13:13:56 +08:00 |
|
joylink_zhangsai
|
3c19601247
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 18:04:11 +08:00 |
|
joylink_zhangsai
|
3d97a78d25
|
修改ecs屏蔽门开关门bug
|
2023-12-08 18:03:17 +08:00 |
|
weizhihong
|
edc502a16e
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-08 17:56:02 +08:00 |
|
weizhihong
|
c9db6917b9
|
【注释日志打印】
|
2023-12-08 17:55:37 +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
|
83f49b80c9
|
【处理IBP不存在的按钮实体】
|
2023-12-07 10:43:20 +08:00 |
|
weizhihong
|
7545bd2ca6
|
【修改IBP设备UID逻辑】
|
2023-12-07 10:17:48 +08:00 |
|
weizhihong
|
74b86a9b12
|
【修改IBP EMP继电器状态获取逻辑】
|
2023-12-06 17:02:35 +08:00 |
|
weizhihong
|
ab595ab402
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-06 14:01:01 +08:00 |
|
weizhihong
|
7cb868dcfc
|
【修改IBP设备组合逻辑】（消息未修改）
|
2023-12-06 14:00:55 +08:00 |
|
xzb
|
821f181ba3
|
Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
|
2023-12-06 10:23:18 +08:00 |