Commit Graph

160 Commits

Author SHA1 Message Date
weizhihong
7c455d0bf5 【ibp盘元素匹配逻辑修改】 2023-11-21 10:25:37 +08:00
weizhihong
2c486618d7 【修改emp\spk设备code匹配】 2023-11-20 16:09:28 +08:00
xzb
870a8f4b09 信号机模型枚举 2023-11-16 17:21:03 +08:00
xzb
7b44437fb1 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-11-09 14:59:41 +08:00
xzb
8ba6576eaf 计轴rssp 集成 2023-11-09 14:59:18 +08:00
c57198c10d 修改零散组合相关继电器及实体的创建 2023-11-09 14:26:08 +08:00
d05706b3e5 增加间隙探测继电器及相关逻辑;修改屏蔽门控制逻辑实现 2023-11-09 10:53:18 +08:00
a6dfa6fffb 修改模型数据构建bug;屏蔽门所有继电器都会构建为实体 2023-11-07 14:30:07 +08:00
13af2d6ff9 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-06 17:32:39 +08:00
46507159c5 将零散组合的继电器加载进仿真 2023-11-06 17:32:34 +08:00
xzb
618af297ae 计轴 2023-11-06 15:30:57 +08:00
xzb
846b48ee20 计轴 2023-11-06 14:35:32 +08:00
4bcc1c0b16 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-11-03 17:26:37 +08:00
a0352ee5e8 实现联锁驱采卡系统功能
调整道岔驱动电路逻辑
2023-11-03 17:26:32 +08:00
d080a2a1fc 修改屏蔽门状态;修改滑动门ecs实体构建bug 2023-11-03 10:41:47 +08:00
weizhihong
b87c8425af 【ibp盘电路逻辑处理】 2023-11-02 14:38:17 +08:00
weizhihong
c09a999bb5 【紧急关闭电路逻辑修改】 2023-11-02 13:51:42 +08:00
weizhihong
6a9bb6b286 【IBP灯组件问题】 2023-11-02 13:21:14 +08:00
a8cb4228f5 重新划分屏蔽门系统组件并实现门控箱控制屏蔽门逻辑(ecs) 2023-11-01 16:52:03 +08:00
xzb
a612c78c4e 计轴区段 2023-11-01 11:08:24 +08:00
xzb
8743d68657 计轴区段 2023-10-31 17:42:52 +08:00
xzb
a0af120528 计轴区段 2023-10-31 17:39:10 +08:00
xzb
3a6e690473 axle section request 2023-10-31 15:55:16 +08:00
xzb
ac0609e9fa axle section request 2023-10-31 11:30:17 +08:00
3c65650745 Merge remote-tracking branch 'origin/master' 2023-10-24 09:06:24 +08:00
b30da891d7 消除报错 2023-10-24 09:05:40 +08:00
xzb
f5e9aeecc8 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD 2023-10-23 17:40:13 +08:00
xzb
dccb6164f4 计轴区段ecs 2023-10-23 17:39:39 +08:00
51df0c521e 修改屏蔽门相关组件、系统 2023-10-23 17:35:57 +08:00
weizhihong
903f4a1ae7 【IBP旁路按钮匹配】 2023-10-23 11:23:15 +08:00
89dd583d19 修改门控箱/屏蔽门交互及ecs系统逻辑bug 2023-10-20 16:12:42 +08:00
weizhihong
864c718d33 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-20 15:51:01 +08:00
weizhihong
1d858e15b7 【修改属性错误赋值】 2023-10-20 15:50:51 +08:00
7fb253612e Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-20 15:06:51 +08:00
5c41a01e69 调整仿真创建接口返回error
调整一些接口返回添加error
2023-10-20 15:05:56 +08:00
weizhihong
d8c2e04e18 【修改EMP灯匹配条件】 2023-10-20 14:36:04 +08:00
weizhihong
caeff9b089 【修改转动钥匙挡位按钮】 2023-10-20 13:20:05 +08:00
weizhihong
41460f29c1 【增加IBP钥匙组件】 2023-10-20 13:13:44 +08:00
xzb
41a7f7a585 不带电路的信号机 2023-10-20 10:55:03 +08:00
xzb
ec53a8e204 不带电路的信号机 2023-10-20 10:31:06 +08:00
xzb
7e05997668 不带电路的信号机 2023-10-20 10:21:35 +08:00
xzb
80bcb33db6 信号机实体添加SignalTag 2023-10-20 09:46:49 +08:00
234882de58 增加门控箱交互接口;修改门控箱构建逻辑bug;增加屏蔽门状态 2023-10-19 17:09:47 +08:00
weizhihong
0aa3290e73 【生产地图公里标信息】 2023-10-19 16:38:46 +08:00
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
6a4c488835 signal 2023-10-16 17:59:35 +08:00
1babd47d28 删除信号机中重复定义的Code方法;提交屏蔽门和门控箱的ecs内容 2023-10-13 18:20:15 +08:00
weizhihong
a9c004a0f0 【修改报错】 2023-10-13 16:24:28 +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
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
18ed7f9214 增加草稿数据列表查询接口;增加屏蔽门ecs相关内容 2023-10-12 17:55:40 +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
9a21c4bfd2 signal dcxh 驱采 2023-10-12 16:59:08 +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
weizhihong
dbb5eaa417 【IBP操作】 2023-10-12 15:03:11 +08:00
xzb
691a4efdc9 signal 3xh2 驱采 2023-10-12 14:19:00 +08:00
xzb
da8485c036 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 13:55:13 +08:00
xzb
c23e141691 signal 3xh1 驱采 2023-10-12 13:54:53 +08:00
weizhihong
dae56425d4 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-12 13:53:38 +08:00
weizhihong
a4fcdd1706 【增加实体初始化】 2023-10-12 13:47:57 +08:00
c5cef5eb4e 双机转辙机添加驱动采集电路相关组件和逻辑 2023-10-12 13:04:38 +08:00
xzb
90e373d3fd signal 2xh1 驱采 2023-10-12 11:06:20 +08:00
xzb
406cfe6c0a signal 2xh1 驱采 2023-10-12 11:00:56 +08:00
xzb
b6bdcc8748 signal 2xh1 驱采 2023-10-12 10:07:40 +08:00
xzb
b5cfb5b8b7 signal 3xh3 2023-10-11 17:44:44 +08:00
xzb
ff32f14e12 signal 3xh2 2023-10-11 17:25:25 +08:00
xzb
819f157f23 signal 3xh1 2023-10-11 16:57:48 +08:00
xzb
1a809f1af4 signal 2xh1 2023-10-11 14:12:51 +08:00
xzb
059ae03678 灯控制系统 2023-10-11 13:46:34 +08:00
xzb
d3f4111007 灯控制系统 2023-10-11 13:38:33 +08:00
xzb
9d66798163 2023-10-11 13:22:14 +08:00
9e1d108c77 升级go版本到1.21
切换fmt输出为slog输出
继电器entity构建添加整流型
2023-10-10 18:28:28 +08:00
1dc64115db ecs接口变化,实体创建接口相应调整 2023-10-09 14:24:53 +08:00
6592c42a0c Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-09 11:19:40 +08:00
0bba8f0934 删除donburi包引用
修改filter导入为从ecs项目导入
整理包结构,将弃用的包放入deprecated文件中
2023-10-09 11:17:25 +08:00
xzb
1a843be8aa signal jdxh 2023-10-09 11:09:29 +08:00
xzb
b09216f783 signal jckxh 2023-10-09 10:30:44 +08:00
xzb
14b3521057 signal dcxh 2023-10-09 10:06:01 +08:00
xzb
07978de264 signal 3xh4 2023-10-08 18:03:07 +08:00
xzb
660465478c signal 3xh3 2023-10-08 17:19:50 +08:00
xzb
4a15ff21f3 signal 3xh2 2023-10-08 16:48:10 +08:00
xzb
56e36c1c6f signal 3xh1 2023-10-08 16:00:05 +08:00
xzb
545027d0c3 signal 2xh1 2023-10-08 13:59:15 +08:00
xzb
964f697409 Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation 2023-10-08 13:11:55 +08:00
xzb
b12b050f5a signal 2xh1 2023-10-08 13:11:34 +08:00
6a6d0657ca 添加继电器控制接口 2023-10-08 09:59:59 +08:00
a60a390708 修改断相保护器实体创建bug 2023-10-07 17:03:34 +08:00
9faf98f1eb 添加计数器系统
断相保护器逻辑修改
转辙机电路代码整理
2023-10-07 17:00:36 +08:00
3b5b62f00d 修改转辙机电路逻辑bug
修改继电器缓放bug
2023-10-07 15:19:03 +08:00
46a3618e22 修改继电器实体构建,添加偏极继电器构建 2023-10-07 14:47:14 +08:00