joylink_zhangsai
|
a0c94047f6
|
Merge remote-tracking branch 'origin/test-training2' into test
|
2023-03-20 11:41:21 +08:00 |
|
weizhihong
|
246bfbe92c
|
【AFC透传服务协议编码修改】
|
2023-03-20 11:39:01 +08:00 |
|
joylink_zhangsai
|
0a9d878583
|
Merge remote-tracking branch 'origin/test-training2' into test
|
2023-03-20 11:11:06 +08:00 |
|
weizhihong
|
273a33dea1
|
【修改透传协议解析配置】
|
2023-03-20 11:10:31 +08:00 |
|
joylink_zhangsai
|
5a9b7ea436
|
Merge remote-tracking branch 'origin/test-training2' into test
|
2023-03-20 10:15:59 +08:00 |
|
weizhihong
|
60fca3df21
|
【还原modbus服务响应】
|
2023-03-20 10:14:28 +08:00 |
|
tiger_zhou
|
05a8045679
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-03-13 09:17:37 +08:00 |
|
joylink_zhangsai
|
a571e1b897
|
修改苏安院实体设备逻辑
|
2023-03-12 19:36:30 +08:00 |
|
joylink_zhangsai
|
c2f3ddc9a0
|
Merge remote-tracking branch 'origin/test' into test
|
2023-03-11 22:21:33 +08:00 |
|
joylink_zhangsai
|
d4fc3ebbe0
|
修改苏安院实体设备逻辑
|
2023-03-11 22:21:21 +08:00 |
|
joylink_zhangsai
|
7c54f0976b
|
修改苏安院实体设备逻辑
|
2023-03-11 21:50:28 +08:00 |
|
joylink_zhangsai
|
e72837d793
|
修改苏安院实体设备逻辑
|
2023-03-11 21:46:07 +08:00 |
|
joylink_zhangsai
|
b25bf1d0ee
|
修改苏安院实体设备逻辑
|
2023-03-11 21:37:13 +08:00 |
|
joylink_zhangsai
|
587a7bc7cf
|
修改苏安院实体设备逻辑
|
2023-03-11 17:55:14 +08:00 |
|
joylink_zhangsai
|
f8c3c530ad
|
修改配置
|
2023-03-10 09:51:03 +08:00 |
|
tiger_zhou
|
2aea562afc
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-03-08 10:27:10 +08:00 |
|
weizhihong
|
643b63f287
|
【服务写数据无效情况】
|
2023-03-08 10:23:25 +08:00 |
|
tiger_zhou
|
152e144f96
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/device/real/afctransfer/AfcTransferServer.java
|
2023-03-08 09:57:43 +08:00 |
|
tiger_zhou
|
c6256b9d13
|
log 信息
|
2023-03-08 09:57:10 +08:00 |
|
weizhihong
|
6bf292df47
|
【AFC 网关解析逻辑处理（网关部署成功后删除）】
|
2023-03-08 09:45:20 +08:00 |
|
|
|
c1a36a0503
|
添加AFC modbus消息透传tcp服务
|
2023-03-06 17:56:13 +08:00 |
|
|
|
f03143740f
|
Merge remote-tracking branch 'origin/master' into test-training2
|
2023-03-01 16:54:16 +08:00 |
|
|
|
cbfe1fbf87
|
修改仿真设备数据构建bug
|
2023-03-01 15:58:21 +08:00 |
|
weizhihong
|
4e242417aa
|
【切换预选模式修改、增加开启ATO操作、大铁列车托管修改行驶至前方站与进路闭塞行车】
|
2023-02-23 13:27:50 +08:00 |
|
|
|
c4ee87eccc
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-22 16:55:46 +08:00 |
|
|
|
2e27c0410f
|
修改组织结构树中的用户名称为 昵称(名称)
|
2023-02-22 16:55:20 +08:00 |
|
weizhihong
|
3b6f476732
|
【MINIO文件上传问题修改】【列车模式转换死循环问题】
|
2023-02-22 14:11:01 +08:00 |
|
weizhihong
|
d215284d1e
|
【MINIO文件上传时，增加版本id,需要在MINIO服务器开启版本配置】
|
2023-02-21 17:32:32 +08:00 |
|
|
|
0e8b746f8a
|
增/改线路功能参数时，将value为空字符串的item移除
|
2023-02-21 17:17:26 +08:00 |
|
weizhihong
|
37418e84a1
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2023-02-21 15:55:35 +08:00 |
|
weizhihong
|
5a27cc414e
|
【上传MINIO文件时，逻辑删除原有旧数据】
|
2023-02-21 15:55:29 +08:00 |
|
|
|
1692a20fbd
|
增加一个跨线路修改线路功能数据的接口
|
2023-02-21 15:07:37 +08:00 |
|
|
|
e7b817c2d4
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-20 17:26:46 +08:00 |
|
|
|
b36376863e
|
小改动
|
2023-02-20 17:26:27 +08:00 |
|
|
|
a5366241ef
|
增加地图功能模板管理及[使用模板生成地图功能]的功能
|
2023-02-20 17:25:40 +08:00 |
|
weizhihong
|
5d722f43d9
|
【修改为单角色直接同意，多角色则一直等待】
|
2023-02-20 15:59:55 +08:00 |
|
weizhihong
|
2719d30267
|
【将自动模式转换自动审批延迟10s同意】
|
2023-02-20 15:46:58 +08:00 |
|
weizhihong
|
b95df03c65
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2023-02-20 15:05:41 +08:00 |
|
weizhihong
|
b5c6f7a9a2
|
【综合演练模式转换不再做自动同意操作】
|
2023-02-20 15:05:35 +08:00 |
|
|
|
cfd13f863b
|
机器人驾驶bug修改
|
2023-02-20 14:46:35 +08:00 |
|
tiger_zhou
|
8728d9ffa0
|
Merge branch 'test-training2'
|
2023-02-20 09:27:44 +08:00 |
|
tiger_zhou
|
eb81ea59dc
|
用户登录不显示个人权限
|
2023-02-20 09:25:48 +08:00 |
|
tiger_zhou
|
94c07b26dc
|
Merge branch 'test-training2'
|
2023-02-17 18:42:55 +08:00 |
|
tiger_zhou
|
75a1fa43cc
|
权限时间调整
|
2023-02-17 18:42:02 +08:00 |
|
tiger_zhou
|
9b12e5adcb
|
Merge remote-tracking branch 'origin/test-training2'
|
2023-02-17 18:19:03 +08:00 |
|
tiger_zhou
|
f074c4db94
|
权限时间调整
|
2023-02-17 18:16:59 +08:00 |
|
weizhihong
|
5d3a8905c2
|
【单操实训增加组织过滤】【项目过滤无效项目】
|
2023-02-17 17:42:25 +08:00 |
|
weizhihong
|
977834cd4e
|
【分散自律操作模式切换BUG处理】
|
2023-02-17 15:34:47 +08:00 |
|
weizhihong
|
eac12826d1
|
【分散自律同意、不同意逻辑处理】
|
2023-02-17 14:21:52 +08:00 |
|
weizhihong
|
aad3a16d5b
|
【车站控制操作模式BUG处理】
|
2023-02-17 09:56:45 +08:00 |
|
