Commit Graph

640 Commits

Author SHA1 Message Date
weizhihong
30c4210a5d 【修改按钮带灯属性名称】 2023-10-18 14:08:10 +08:00
weizhihong
a65799ed77 【修改IBP旁路按钮实体】 2023-10-18 11:17:08 +08:00
weizhihong
05de54f450 【IBP构建逻辑】 2023-10-17 17:47:19 +08:00
weizhihong
8b5391554c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	repository/repository_manager.go
2023-10-17 15:08:30 +08:00
weizhihong
8d9ea2a084 【创建车站实体】 2023-10-17 15:05:13 +08:00
67c416e96d 增加按name查询发布地图接口;增加门控箱ecs内容 2023-10-17 10:26:31 +08:00
xzb
3d3d7dabe7 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-16 17:59:53 +08:00
xzb
6a4c488835 signal 2023-10-16 17:59:35 +08:00
b661545d5b 修改失表故障继电器电路实现bug 2023-10-16 16:10:41 +08:00
56af710040 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-16 15:40:07 +08:00
97b2880c7b 修改断相保护器系统逻辑bug
修改道岔挤岔故障bug
修改计数器系统逻辑bug
2023-10-16 15:40:03 +08:00
xzb
1d3c82825e Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-16 14:57:59 +08:00
xzb
f687aba479 sgianl 测试 2023-10-16 14:57:44 +08:00
93725ce934 修改道岔接口拼写
修改日志打印
2023-10-16 11:11:53 +08:00
weizhihong
1521868a88 【去掉按钮所属车站属性】 2023-10-16 10:05:23 +08:00
weizhihong
511045e2a2 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-16 09:55:52 +08:00
weizhihong
67b172c52c 【修改车站关联关系】 2023-10-16 09:55:44 +08:00
1babd47d28 删除信号机中重复定义的Code方法;提交屏蔽门和门控箱的ecs内容 2023-10-13 18:20:15 +08:00
xzb
6370d8818e Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD
# Conflicts:
#	proto/src/model.proto
#	repository/model/proto/model.pb.go
2023-10-13 17:56:46 +08:00
xzb
e0385a482d 信号机操作集成 2023-10-13 17:50:36 +08:00
xzb
18127bcafb 信号机操作集成 2023-10-13 17:44:16 +08:00
weizhihong
a9c004a0f0 【修改报错】 2023-10-13 16:24:28 +08:00
weizhihong
affc86e005 【增加车站repository】 2023-10-13 15:26:25 +08:00
xzb
b9e687d26a Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD
# Conflicts:
#	repository/model/proto/model.pb.go
2023-10-13 15:01:36 +08:00
xzb
d3dd59d720 信号机 2023-10-13 14:59:08 +08:00
weizhihong
0abe2ca44d 【生成proto文件】提交 2023-10-13 14:13:24 +08:00
weizhihong
f6ff5bdf69 【修改冲突】 2023-10-13 14:07:17 +08:00
weizhihong
fc3defbae3 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	proto/src/model.proto
2023-10-13 14:05:38 +08:00
weizhihong
008dcbc665 【增加设备类型】 2023-10-13 14:03:48 +08:00
xzb
24c455cc6f Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-13 09:32:05 +08:00
xzb
4dbe6e6042 sgianl jdxh 驱采 2023-10-13 09:31:49 +08:00
f9d845a0cf 消除报错 2023-10-13 09:29:43 +08:00
a3f6982dab Merge remote-tracking branch 'origin/master' 2023-10-13 09:13:02 +08:00
fe3ce44bdc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jl-ecs-go
#	proto/src/model.proto
#	repository/model/proto/model.pb.go
2023-10-13 09:09:07 +08:00
xzb
4f05a50503 sgianl jdxh 驱采 2023-10-12 18:06:17 +08:00
xzb
7f5eb71ff5 sgianl jdxh 驱采 2023-10-12 17:58:01 +08:00
18ed7f9214 增加草稿数据列表查询接口;增加屏蔽门ecs相关内容 2023-10-12 17:55:40 +08:00
xzb
51e0f5a4bd Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 17:53:56 +08:00
xzb
4e84c2d0ba fmt 2023-10-12 17:53:30 +08:00
weizhihong
bfec6804ce Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 17:47:21 +08:00
weizhihong
abeeb595dc 【初始化IBP盘实例】 2023-10-12 17:46:43 +08:00
xzb
7864f04cba signal jckxh 驱采 2023-10-12 17:33:20 +08:00
xzb
d2e31012db Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 16:59:25 +08:00
xzb
9a21c4bfd2 signal dcxh 驱采 2023-10-12 16:59:08 +08:00
2d64e2b3bb Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 16:29:49 +08:00
949c4a883a 添加道岔故障组件、定义、接口、实现逻辑 2023-10-12 16:29:00 +08:00
xzb
a1beb531a6 signal 3xh4 驱采 2023-10-12 16:21:55 +08:00
xzb
e5238067a9 signal 3xh4 驱采 2023-10-12 16:13:56 +08:00
xzb
1180549f1d Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
#	jl-ecs-go
2023-10-12 15:13:49 +08:00
xzb
6a9b48b4d3 signal 3xh3 驱采 2023-10-12 15:13:13 +08:00