Commit Graph

1012 Commits

Author SHA1 Message Date
859561b6a7 Merge remote-tracking branch 'origin/local-test' into local-test
# Conflicts:
#	dto/state_proto/device_state.pb.go
#	rts-sim-testing-message
2024-04-03 16:08:17 +08:00
3f91e6cbe7 【bug】车库门状态未发送
【新增】车库门增加本地/远程状态
2024-04-03 16:04:39 +08:00
tiger_zhou
1d77dd0fec Merge branch 'develop' into local-test
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 1m2s
2024-04-02 18:29:32 +08:00
tiger_zhou
b4b2fc9e72 列车pc仿真 2024-04-02 18:29:00 +08:00
tiger_zhou
fddb10af77 Merge branch 'develop' into local-test
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 38s
2024-04-02 18:25:10 +08:00
tiger_zhou
edf154afa3 列车pc仿真 2024-04-02 18:24:46 +08:00
tiger_zhou
224670fa15 Merge branch 'develop' into local-test
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 40s
2024-04-02 18:20:30 +08:00
tiger_zhou
9b58348297 列车pc仿真 2024-04-02 18:20:10 +08:00
tiger_zhou
1221cd89d4 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 46s
2024-04-02 18:17:16 +08:00
tiger_zhou
dedca1e149 Merge branch 'develop' into local-test
Some checks failed
local-test分支打包构建docker并发布运行 / Docker-Build (push) Failing after 42s
2024-04-02 18:00:10 +08:00
tiger_zhou
089d62cfc2 列车控制修改列车参数类型 2024-04-02 17:42:27 +08:00
91bb4ecb46 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m40s
2024-04-02 16:00:22 +08:00
f12b72cc04 【bug】洗车机状态发送及洗车机操作 2024-04-02 15:59:55 +08:00
80b45be543 【新增】洗车机状态发送 2024-04-02 14:17:18 +08:00
49e3199c06 【新增】洗车机模型构建、ecs实体构建
【修改】洗车机ecs电路系统逻辑
2024-04-02 14:09:42 +08:00
a0cee6634e Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m36s
2024-04-01 14:08:52 +08:00
c9dda72725 【新增】继电器组合的设备类型是防淹门时,视同车库门 2024-04-01 14:07:56 +08:00
9e5304a270 Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m41s
2024-04-01 13:32:19 +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
24c0254c01 【bug】车库门ecs系统逻辑没有对MMSJ做处理 2024-03-27 17:11:24 +08:00
c004aa9e57 子模块同步 2024-03-27 16:45:25 +08:00
ffd989b13b Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-service into develop 2024-03-27 16:44:23 +08:00
772de0b017 调整任务及步骤名称
添加清理tag为none镜像步骤
2024-03-27 16:44:07 +08:00
3d8f41b309 【补档】
All checks were successful
CI / Docker-Build (push) Successful in 1m27s
2024-03-27 15:14:05 +08:00
237c6b5297 Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m37s
2024-03-27 14:19:43 +08:00
ef9e431afd 【bug】车库门操作、状态发送等逻辑中的bug 2024-03-27 14:15:35 +08:00
9d6acd9c20 【新增】测试模块车库门状态proto定义及车库门状态发送逻辑
【删除】ecs的车库门状态及相关逻辑
2024-03-26 16:48:37 +08:00
141cc633b9 【新增】车库门PSL模型构建及相关ecs逻辑;
【改动】车库门ecs逻辑
2024-03-26 13:12:17 +08:00
da98777b04 【新增】车库门及车库门控制盒操作接口 2024-03-20 14:35:35 +08:00
6f3154ec19 Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m8s
2024-03-19 21:25:49 +08:00
5856236b12 Merge branch 'master' into develop 2024-03-19 21:24:46 +08:00
4339ea2d73 submodule update 2024-03-19 21:24:06 +08:00
cf6db6ef40 更新local-setup-go版本,实现缓存go build依赖包
删除dockerfile赋予权限步骤
2024-03-19 16:27:57 +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
9cee828d0d 修改submodule url 2024-03-19 09:38:11 +08:00
tiger_zhou
8f04d8bcb8 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:26:11 +08:00
tiger_zhou
82979f5ab1 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:19:38 +08:00
tiger_zhou
849c324717 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:16:30 +08:00
tiger_zhou
2238a5ee0d 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 09:11:14 +08:00
tiger_zhou
12145b8539 列车前端操作接口,列车连接三方映射接口及ws返回列车连接状态 2024-03-19 08:28:50 +08:00
3f64881096 Merge pull request '更新Dockerfile添加文件执行权限' (#4) from develop into local-test
All checks were successful
CI / Docker-Build (push) Successful in 1m55s
Reviewed-on: #4
2024-03-18 18:36:45 +08:00
77991dbbdd 更新Dockerfile添加文件执行权限 2024-03-18 18:34:30 +08:00
f176602179 Merge pull request '修改ci为local-test分支的CI,并添加SSH发布步骤' (#3) from develop into local-test
All checks were successful
CI / Docker-Build (push) Successful in 1m46s
Reviewed-on: #3
2024-03-18 18:15:16 +08:00
b123e8b921 修改ci为local-test分支的CI,并添加SSH发布步骤 2024-03-18 17:20:34 +08:00
accbe3c216 更新setup buildx版本为插件安装版本
All checks were successful
CI / Docker-Build (push) Successful in 2m4s
2024-03-18 14:31:47 +08:00