Commit Graph

3761 Commits

Author SHA1 Message Date
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
tiger_zhou
377d3d989f 数据配置 2023-04-14 17:16:13 +08:00
tiger_zhou
cfe6eb91e0 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-04-14 17:04:04 +08:00
tiger_zhou
4cf212a5a6 语音配置 2023-04-14 17:03:50 +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