Commit Graph

731 Commits

Author SHA1 Message Date
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
xzb e0dc136e82 balise detect 预测实现 2023-12-06 10:23:00 +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 8b488ed037 balise detect 预测实现 2023-12-05 13:49:22 +08:00
xzb 3218fddb7d balise detect 预测实现 2023-12-05 11:24:43 +08:00
xzb 83a5ee52e8 balise detect 预测实现 2023-12-05 10:57:31 +08:00
xzb 163c0f53c2 balise detect 预测实现 2023-12-05 09:37:34 +08:00
xzb a499ec1ba9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-12-01 15:38:54 +08:00
xzb 14af6608ea balise detect 预测实现 2023-12-01 15:38:26 +08:00
weizhihong 6e3f0f64f7 【增加发布排序字段】 2023-12-01 15:09:40 +08:00
weizhihong f2c13335c2 【删除多余方法】 2023-11-30 15:14:16 +08:00
weizhihong a13f759c10 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-30 10:59:40 +08:00
weizhihong f7c9c2ab36 【修改UID初始化逻辑】 2023-11-30 10:59:34 +08:00
xzb 7c687972b4 balise detect 2023-11-30 09:57:20 +08:00
xzb f3f1f07fd0 balise detect 2023-11-29 17:28:42 +08:00
xzb 01cf27edb5 btm 2023-11-29 14:10:25 +08:00
xzb c59d3e35ba btm 2023-11-29 13:04:07 +08:00
xzb b28cda6837 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-28 13:30:49 +08:00
xzb 7cdde1b7ef btm 2023-11-28 13:30:10 +08:00
weizhihong d3302b3437 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go 2023-11-27 17:00:40 +08:00
weizhihong 442cc51087 【发布列表增加版本、发布人信息】 2023-11-27 17:00:29 +08:00
xzb c8fb7eb999 btm 2023-11-27 15:09:10 +08:00
xzb 0138e76481 btm 2023-11-27 09:14:20 +08:00
xzb f66960b9f4 btm 2023-11-24 16:01:28 +08:00
xzb 5a20d78aa3 btm 2023-11-24 15:20:05 +08:00
xzb 1784f3a66b btm 2023-11-23 18:14:01 +08:00
xzb be1e0d59d2 btm 2023-11-23 16:30:48 +08:00
xzb 5f005630f5 btm 2023-11-23 15:16:42 +08:00
xzb 09e1ad68f9 应答器实体 2023-11-23 13:30:08 +08:00
xzb 896558d116 应答器实体 2023-11-23 13:20:00 +08:00
xzb 82f7e0bae9 无源应答器固定报文 2023-11-23 10:55:38 +08:00
weizhihong e1532532f9 【重新编译proto文件】 2023-11-22 17:09:33 +08:00
weizhihong 2a0265941d Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go
# Conflicts:
#	ts/protos/graphicData/stationLayoutGraphics.pb.go
2023-11-22 17:07:08 +08:00
weizhihong 1434fb0f01 【发布数据管理逻辑修改】 2023-11-22 17:05:38 +08:00
xzb 1db6385821 应答器固定报文 2023-11-22 13:43:43 +08:00