tiger_zhou
|
786a56b8d1
|
列车图例显示位置调整
|
2023-04-24 14:04:27 +08:00 |
|
tiger_zhou
|
590bb3181f
|
列车图例显示位置调整
|
2023-04-24 10:25:21 +08:00 |
|
weizhihong
|
221200cfcd
|
【剧本保存会话群组草稿信息】
|
2023-04-23 18:14:13 +08:00 |
|
tiger_zhou
|
f861256107
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-04-23 18:04:39 +08:00 |
|
tiger_zhou
|
5fb422d3d0
|
列车图例显示位置
|
2023-04-23 18:04:14 +08:00 |
|
weizhihong
|
3e3c977329
|
【增加NCC调度员角色】
|
2023-04-23 16:48:31 +08:00 |
|
weizhihong
|
d9fbac8dd8
|
【仿真创建群组接口增加群头像信息】
|
2023-04-23 15:58:43 +08:00 |
|
weizhihong
|
d2f271fa4e
|
【删除无效的包引入】
|
2023-04-23 09:34:32 +08:00 |
|
weizhihong
|
a9559e2455
|
【批量处理机器人已读操作】
|
2023-04-21 17:50:17 +08:00 |
|
weizhihong
|
a26d883e99
|
【群组消息大小写问题，人员进组时名字获取】
|
2023-04-21 10:41:00 +08:00 |
|
weizhihong
|
e16437b347
|
【调整群组事件处理结构】
|
2023-04-21 10:18:08 +08:00 |
|
tiger_zhou
|
e83d5dfae6
|
列车图例显示位置
|
2023-04-20 17:42:05 +08:00 |
|
weizhihong
|
77ee7005f1
|
【先取消群组语音识别】
|
2023-04-20 16:09:30 +08:00 |
|
tiger_zhou
|
90d6a1200a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-04-20 14:13:22 +08:00 |
|
tiger_zhou
|
d6ae7d4acf
|
列车图例显示位置
|
2023-04-20 14:12:29 +08:00 |
|
weizhihong
|
07aa27bd4e
|
【会话回复逻辑人家机器人消息不做回复操作】
|
2023-04-20 09:58:03 +08:00 |
|
weizhihong
|
550b85b8ea
|
【处理发送消息BUG】
|
2023-04-19 17:59:42 +08:00 |
|
weizhihong
|
f8f7cc03df
|
【修改歧义参数名】
|
2023-04-19 17:50:08 +08:00 |
|
weizhihong
|
91ad315825
|
【增加改方按钮抬起验证】
|
2023-04-19 17:21:35 +08:00 |
|
tiger_zhou
|
3829f12f08
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-04-19 17:13:15 +08:00 |
|
weizhihong
|
dc68b2daeb
|
【用户群组多余操作接口、表删除】
|
2023-04-19 16:53:37 +08:00 |
|
tiger_zhou
|
d87fb8479a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/work/MetroSimulationWorkServiceImpl.java
|
2023-04-19 16:15:38 +08:00 |
|
tiger_zhou
|
734b0bc6a9
|
列车图例显示位置
|
2023-04-19 16:14:01 +08:00 |
|
|
|
56c5c6b3d3
|
Merge remote-tracking branch 'origin/test' into test
|
2023-04-19 13:40:23 +08:00 |
|
|
|
6045cb3c2b
|
增加NCC绘图数据
|
2023-04-19 13:40:00 +08:00 |
|
weizhihong
|
c499eb0ec3
|
【修改会话保存结构】
|
2023-04-19 11:29:19 +08:00 |
|
weizhihong
|
a0ff4e6962
|
【会话组结构调整】
|
2023-04-19 09:28:03 +08:00 |
|
|
|
720154f53a
|
NCC列车延误报警逻辑修改；修改列车最大制动力计算逻辑
|
2023-04-18 18:05:24 +08:00 |
|
|
|
d354ed9fd7
|
Merge remote-tracking branch 'origin/test' into test
|
2023-04-18 18:04:12 +08:00 |
|
weizhihong
|
5359bf1c27
|
【修改群组BUG】
|
2023-04-18 16:33:24 +08:00 |
|
|
|
4a647ffb84
|
Merge remote-tracking branch 'origin/test' into test
|
2023-04-18 15:08:25 +08:00 |
|
tiger_zhou
|
220d47b1a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-04-18 15:03:11 +08:00 |
|
weizhihong
|
04ab5e0aef
|
【增加群组头像字段】
|
2023-04-18 14:31:41 +08:00 |
|
tiger_zhou
|
a51a09c23b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-04-18 13:10:42 +08:00 |
|
weizhihong
|
c02fa14d31
|
【修改语音识别成员解析逻辑】
|
2023-04-18 11:31:47 +08:00 |
|
|
|
57eaa241bb
|
NCC列车延误报警
|
2023-04-18 09:46:53 +08:00 |
|
weizhihong
|
0dddb9b4e8
|
【语音识别与群组会话事件添加】
|
2023-04-17 18:24:00 +08:00 |
|
tiger_zhou
|
6ca90b9b0d
|
修改ctc出入口未关联车站的问题
|
2023-04-17 17:45:07 +08:00 |
|
weizhihong
|
1eb4e2c6cf
|
【群组发送消息】
|
2023-04-17 16:58:12 +08:00 |
|
weizhihong
|
c88ae2b17b
|
【仿真会话群组通知消息事件处理】
|
2023-04-17 16:48:29 +08:00 |
|
weizhihong
|
d83de6f4bd
|
【会话群组消息通知事件】
|
2023-04-17 14:03:23 +08:00 |
|
weizhihong
|
ad2900926e
|
Merge branch 'test-training2' into test
|
2023-04-17 09:45:11 +08:00 |
|
weizhihong
|
8fd00384d4
|
【用户组仿真操作】
|
2023-04-17 09:43:11 +08:00 |
|
|
|
598e5e2491
|
Merge remote-tracking branch 'origin/test-training2' into test
|
2023-04-14 18:36:42 +08:00 |
|
|
|
b90345620a
|
清除报错
|
2023-04-14 18:27:11 +08:00 |
|
weizhihong
|
661c682d85
|
【增加群组会话service】
|
2023-04-14 16:45:01 +08:00 |
|
weizhihong
|
0d1f5bf56b
|
【群组会话实体，仿真获取群组接口】
|
2023-04-14 16:25:33 +08:00 |
|
tiger_zhou
|
3580f135a0
|
Merge remote-tracking branch 'origin/test-training2' into test
|
2023-04-14 15:51:48 +08:00 |
|
tiger_zhou
|
c3b161d9ed
|
共享数据的显示及考试
|
2023-04-14 15:29:00 +08:00 |
|
tiger_zhou
|
4ee7f99e64
|
共享数据的显示及考试
|
2023-04-14 14:30:16 +08:00 |
|
tiger_zhou
|
40069c5354
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-04-14 14:07:45 +08:00 |
|
tiger_zhou
|
972611128b
|
共享数据的显示及考试
|
2023-04-14 14:06:08 +08:00 |
|
tiger_zhou
|
16ff18e738
|
共享数据的显示及考试
|
2023-04-14 13:49:41 +08:00 |
|
weizhihong
|
5a0e1051fb
|
【会话群组基础信息CRUD】
|
2023-04-14 11:28:50 +08:00 |
|
weizhihong
|
81cfda9d20
|
【生成实训删除组织筛选】
|
2023-04-13 18:28:16 +08:00 |
|
weizhihong
|
2de8ff955b
|
【单操实训共享筛选】
|
2023-04-13 17:52:29 +08:00 |
|
weizhihong
|
f33ac9c2c4
|
【发布单操实训共享字段添加】
|
2023-04-13 17:39:53 +08:00 |
|
tiger_zhou
|
593504950d
|
调整 教学管理-》实训管理查询需要根据orgid 过滤，考试管理实训数量过滤根据orgid
|
2023-04-13 17:34:52 +08:00 |
|
tiger_zhou
|
bd2b96ed6d
|
调整 教学管理-》实训管理查询需要根据orgid 过滤，考试管理实训数量过滤根据orgid
|
2023-04-13 17:18:01 +08:00 |
|
weizhihong
|
997a1eac71
|
【修改生成实训时，对应的项目信息】
|
2023-04-13 14:49:17 +08:00 |
|
weizhihong
|
a66023a068
|
【修改项目组织时，增加修改已发布生成的实训组织信息】
【检验项目配置编码逻辑修改】
|
2023-04-12 18:55:18 +08:00 |
|
weizhihong
|
4d5b5ea6c1
|
【参数配置时增加定值设置】
|
2023-04-12 15:54:41 +08:00 |
|
tiger_zhou
|
503563ad05
|
用户实训数据管理/用户考试管理需要添加根据手机号或者用户ID查询
|
2023-04-12 13:32:39 +08:00 |
|
tiger_zhou
|
aea8007a60
|
调整
|
2023-04-12 11:17:01 +08:00 |
|
tiger_zhou
|
91985fd241
|
调整
|
2023-04-12 10:49:46 +08:00 |
|
tiger_zhou
|
851b259f81
|
修改添加指令操作的参数类型
|
2023-04-11 17:53:57 +08:00 |
|
tiger_zhou
|
1ef8a6e41e
|
修改根据已知数据获取未知数据的问题
|
2023-04-11 16:32:06 +08:00 |
|
weizhihong
|
ca6870ae17
|
【人员匹配索引修改】
|
2023-04-11 14:50:22 +08:00 |
|
weizhihong
|
dc461b9fce
|
【修改字符串截取BUG】
|
2023-04-11 14:12:34 +08:00 |
|
weizhihong
|
f38c3bd1ba
|
【修改语音识别字符匹配结束位置索引】
|
2023-04-11 14:00:43 +08:00 |
|
weizhihong
|
83c5d6e644
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2023-04-11 13:39:16 +08:00 |
|
weizhihong
|
4c0f6cae44
|
【删除多余注释、多余引入】
|
2023-04-11 13:39:09 +08:00 |
|
tiger_zhou
|
3fa0549d72
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-04-11 13:25:37 +08:00 |
|
tiger_zhou
|
7382b9af0b
|
数据管理
|
2023-04-11 13:24:56 +08:00 |
|
weizhihong
|
f750e8fd9d
|
【语音识别拼音处理逻辑修改】
【根据语音识别Group索引获取原位置字符串】
|
2023-04-11 13:24:21 +08:00 |
|
tiger_zhou
|
cdd12fd1b8
|
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/services/voice/discriminate/OperateParseServiceImpl.java
src/main/java/club/joylink/rtss/simulation/cbtc/discriminate/ExtractRule.java
|
2023-04-11 13:20:37 +08:00 |
|
tiger_zhou
|
7842e48bc8
|
数据管理
|
2023-04-11 13:17:06 +08:00 |
|
weizhihong
|
2890997cdd
|
【获取解析参数时，索引对应】
|
2023-04-11 10:42:05 +08:00 |
|
weizhihong
|
d967a3c80f
|
【语音识别处理纠正后的信息】
|
2023-04-11 10:36:31 +08:00 |
|
weizhihong
|
621cd8befa
|
【语音识别逻辑修改】
|
2023-04-10 17:13:16 +08:00 |
|
tiger_zhou
|
53fd77af5c
|
数据管理
|
2023-04-10 15:34:42 +08:00 |
|
weizhihong
|
f81c160b21
|
【测试方法】
|
2023-04-10 15:04:13 +08:00 |
|
weizhihong
|
cf592fe9ff
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2023-04-10 15:03:55 +08:00 |
|
weizhihong
|
5ba922c568
|
【操作指令执行测试类，成员匹配BUG】
|
2023-04-10 15:03:50 +08:00 |
|
tiger_zhou
|
c46b4fd97c
|
合并
|
2023-04-10 14:10:53 +08:00 |
|
tiger_zhou
|
c7e13aebe9
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/discriminate/ExtractRule.java
|
2023-04-10 13:52:29 +08:00 |
|
tiger_zhou
|
14da291331
|
语音指令
|
2023-04-10 13:50:08 +08:00 |
|
weizhihong
|
1748f7c42d
|
【实现简单的提取规则（未对入参做校准处理）】
|
2023-04-10 13:42:57 +08:00 |
|
tiger_zhou
|
0eda6a435a
|
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/util/PinYinUtil.java
|
2023-04-10 13:06:01 +08:00 |
|
weizhihong
|
d3bb96d95e
|
【拼音处理】
|
2023-04-10 10:51:40 +08:00 |
|
weizhihong
|
35b1287875
|
【修改参数正则解析逻辑】
|
2023-04-10 10:25:00 +08:00 |
|
weizhihong
|
26719b4685
|
【修改语音指令参数的解析逻辑】
|
2023-04-10 10:11:28 +08:00 |
|
tiger_zhou
|
600f4ebe04
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-04-07 18:09:59 +08:00 |
|
weizhihong
|
e31facba91
|
【调整语音指令实体参数】
|
2023-04-07 17:51:18 +08:00 |
|
tiger_zhou
|
abde6c0e17
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-04-07 16:59:05 +08:00 |
|
weizhihong
|
264306b0dc
|
【语音识别代码调整 v0.0.1】
|
2023-04-07 16:58:00 +08:00 |
|
|
|
6ac172edbd
|
删除一些无用的东西
|
2023-04-07 13:24:57 +08:00 |
|
tiger_zhou
|
96444da8d8
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-04-07 13:16:16 +08:00 |
|
tiger_zhou
|
723de7ce28
|
还原 语音指令
|
2023-04-07 13:16:01 +08:00 |
|
weizhihong
|
81f89a6aec
|
【语音识别处理逻辑流程（初稿）】
|
2023-04-07 13:06:47 +08:00 |
|
tiger_zhou
|
db606a2745
|
Merge branch 'test-training2' into test
|
2023-04-06 18:09:48 +08:00 |
|
tiger_zhou
|
e63cfbf5ad
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-04-04 16:38:19 +08:00 |
|
weizhihong
|
78e8f84382
|
【修复地铁乘客乘降状态不发车BUG】
|
2023-04-03 15:27:30 +08:00 |
|
tiger_zhou
|
e25cfad883
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-04-03 13:36:47 +08:00 |
|
tiger_zhou
|
d141fd8e52
|
语音指令
|
2023-04-03 13:36:36 +08:00 |
|
weizhihong
|
04d46be14c
|
【修改修改预选模式、机器人驾驶代码】
|
2023-03-31 15:10:19 +08:00 |
|
tiger_zhou
|
f6dd8e7a42
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-03-31 14:50:46 +08:00 |
|
tiger_zhou
|
df93f3d0ce
|
修改问题：
综合演练中，非管理员的成员主动退出后（直接叉掉），显示成员掉线，再次输入仿真号进不去综合演练，进来需要管理员踢出去才能进来
|
2023-03-31 13:34:37 +08:00 |
|
tiger_zhou
|
24da4a2e94
|
语音指令
|
2023-03-31 11:21:02 +08:00 |
|
tiger_zhou
|
d5a43c0af9
|
语音指令
|
2023-03-31 10:13:07 +08:00 |
|
tiger_zhou
|
a23bf72997
|
语音指令
|
2023-03-29 17:40:02 +08:00 |
|
tiger_zhou
|
2445287f8c
|
语音指令
|
2023-03-28 15:43:03 +08:00 |
|
joylink_zhangsai
|
01f7105f02
|
增加：导入学生时创建的账号增加orgId参数
|
2023-03-28 11:08:31 +08:00 |
|
joylink_zhangsai
|
8ad4877995
|
修改say生成的PlcGateway配置
|
2023-03-25 16:42:04 +08:00 |
|
joylink_zhangsai
|
8f7bec9854
|
透传服务bug修改-by 卫
|
2023-03-20 14:09:05 +08:00 |
|
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
|
d4fc3ebbe0
|
修改苏安院实体设备逻辑
|
2023-03-11 22:21:21 +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 |
|
