rt-sim-training-service

Author	SHA1	Message	Date
joylink_zhangsai	f25c5fd5f1	修改：换端操作不再关闭ATO；进路相关移动授权计算	2021-07-06 09:24:59 +08:00
joylink_zhangsai	35d6139ed6	新增：头码车到终点变人工车（线路配置）	2021-07-05 17:41:22 +08:00
joylink_zhangsai	8099ee57e9	修改：非通信车占用判定	2021-07-05 17:12:53 +08:00
joylink_zhangsai	2781568f82	修改：非通信车占用判定bug	2021-07-05 16:55:17 +08:00
joylink_zhangsai	b0bfe7bcc3	新增：登录增加参数（成工业）	2021-07-05 16:18:02 +08:00
joylink_zhangsai	a93df56e55	新增：进路排列增加道岔占用检查	2021-07-05 16:15:33 +08:00
joylink_zhangsai	343ce12cea	修改：计轴故障bug	2021-07-05 16:14:38 +08:00
walker-sheng	b4b5be759f	修改仿真仓库运行图空指针bug	2021-07-05 15:30:56 +08:00
joylink_zhangsai	889f45fe40	新增：列车所在进路道岔位置不正确会导致EB	2021-07-05 13:16:35 +08:00
walker-sheng	9b62d12915	Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct # Conflicts: # src/main/java/club/joylink/rtss/simulation/cbtc/ATS/AtsApiServiceImpl.java # src/main/java/club/joylink/rtss/simulation/cbtc/build/RunPlanBuilder.java # src/main/java/club/joylink/rtss/simulation/cbtc/data/SimulationDataRepository.java	2021-07-02 18:49:19 +08:00
walker-sheng	ee1afdb699	仿真ats重构	2021-07-02 18:47:53 +08:00
joylink_zhangsai	9468e2848b	新增：运行图加线、抽线功能（西铁院）	2021-07-02 13:40:26 +08:00
joylink_zhangsai	517f6bb536	新增：信号机延续保护状态（前端信号机编号显示蓝色）（西安三53）	2021-07-02 13:26:02 +08:00
joylink_zhangsai	39c8eab5c2	新增：线路配置<转换轨进路只能通过区故解取消>（西安三52）	2021-07-02 11:18:57 +08:00
joylink_zhangsai	d335982687	修改：延续保护解锁逻辑（西安三49）	2021-07-02 09:18:17 +08:00
joylink_zhangsai	7119fad066	修改：列车升降级逻辑（因取消通信故障后会直接升级CBTC）	2021-07-01 17:20:33 +08:00
joylink_zhangsai	d83a076f14	修改：ARB故障逻辑	2021-07-01 15:27:59 +08:00
joylink_zhangsai	6c6da7560d	修改：列车信息更新折返策略报错bug	2021-06-30 18:05:09 +08:00
joylink_zhangsai	8d74fe84b1	修改：IBP盘试灯按钮bug	2021-06-30 17:27:45 +08:00
joylink_zhangsai	9e88dcef49	新增：列车加载时更新折返策略和折返状态	2021-06-30 17:11:30 +08:00
joylink_zhangsai	ebc45fdfee	新增：线路配置<设置头码车时检查方向>及逻辑	2021-06-30 17:10:39 +08:00
joylink_zhangsai	ffbb75ea4d	新增：StandStatus增加折返策略	2021-06-30 15:18:54 +08:00
joylink_zhangsai	18fbefcee7	修改：列车信息添加内容（西安三47）	2021-06-30 13:53:44 +08:00
joylink_zhangsai	f04cb9ae19	修改连挂时的列车逻辑；	2021-06-30 13:52:06 +08:00
joylink_zhangsai	d7c5e7cd32	修改：IBP盘部分功能实现	2021-06-30 13:03:16 +08:00
joylink_zhangsai	62027d50ee	修改：列车在第一站跳停无效bug（西安三46）	2021-06-30 09:32:18 +08:00
joylink_zhangsai	af25264080	修改：IBP盘bug	2021-06-29 18:02:06 +08:00
joylink_zhangsai	def44e9db2	Merge remote-tracking branch 'origin/test' into dev	2021-06-28 17:38:46 +08:00
joylink_zhangsai	0ee231475a	修改：列车信息添加内容（西安三47）（未完）	2021-06-28 17:35:37 +08:00
walker-sheng	88dad9cee4	Merge remote-tracking branch 'origin/test' into NTY-simulation	2021-06-25 18:44:04 +08:00
walker-sheng	378f6f43f4	仿真ats重构	2021-06-25 18:43:45 +08:00
joylink_zhangsai	588db159e0	修改：讯飞语音识别关闭动态修正	2021-06-25 15:07:52 +08:00
joylink_zhangsai	2454d53a5e	修改：剧本转换驾驶模式bug	2021-06-25 11:21:44 +08:00
walker-sheng	10b6ebc3c2	Merge remote-tracking branch 'origin/test' into NTY-simulation	2021-06-24 18:58:11 +08:00
walker-sheng	f225f67e4b	压力测试仿真不记录仿真时长	2021-06-24 18:57:59 +08:00
joylink_zhangsai	77c133cb7a	修改列车降级bug	2021-06-24 18:43:54 +08:00
walker-sheng	94d5f4a4ef	添加仿真压力测试接口	2021-06-24 18:06:21 +08:00
walker-sheng	1b1eadb370	站台设置折返策略操作逻辑	2021-06-24 16:47:45 +08:00
joylink_zhangsai	7ef0be2c82	Merge remote-tracking branch 'origin/test' into dev	2021-06-24 14:02:09 +08:00
joylink_zhangsai	0d44bfcab3	ZC增加<无服务>属性	2021-06-24 14:02:00 +08:00
joylink_zhangsai	0cbac09abb	修改列车升级逻辑	2021-06-24 14:00:53 +08:00
walker-sheng	cd0abf3f74	添加项目枚举	2021-06-24 11:26:15 +08:00
joylink_zhangsai	7a3bea2fee	Merge branch 'test' into dev	2021-06-23 18:48:18 +08:00
joylink_zhangsai	be456adf6c	修改ITC移动授权发送方式（通过应答器）	2021-06-23 18:47:54 +08:00
walker-sheng	8d275849a1	Merge remote-tracking branch 'origin/test' into wechat-micro2-login	2021-06-23 18:26:06 +08:00
walker-sheng	80e3d237bc	添加第三方配置管理功能添加第三方用户仿真时长、用户考试结果同步流程	2021-06-23 18:25:43 +08:00
joylink_zhangsai	d22c6f83cd	修改列车升级逻辑（兼容应答器）	2021-06-23 17:30:08 +08:00
joylink_zhangsai	2eee85699e	Merge branch 'test' into dev	2021-06-23 16:04:28 +08:00
joylink_zhangsai	3bcae4a6b8	ZC增加<管理的区段>字段及相关逻辑	2021-06-23 16:04:15 +08:00
joylink_zhangsai	5c98d52006	修改移动授权丢失计时bug	2021-06-23 14:15:20 +08:00
joylink_zhangsai	a949f78450	列车初始化增加内容	2021-06-23 14:10:58 +08:00
joylink_zhangsai	4bf6f3fd5e	修改仿真数据校验bug	2021-06-23 13:37:08 +08:00
walker-sheng	757bd9d497	Merge remote-tracking branch 'origin/test' into wechat-micro2-login	2021-06-23 10:44:07 +08:00
walker-sheng	a5df50e114	添加2d模型数据管理接口调整更新sql	2021-06-23 10:43:38 +08:00
walker-sheng	8f55119b8b	添加2d模型草稿发布接口添加2d模型数据管理接口	2021-06-23 10:39:51 +08:00
joylink_zhangsai	12a82c7dca	修改列车加载bug；修改速度曲线计算bug	2021-06-23 10:32:23 +08:00
walker-sheng	427299528f	Merge remote-tracking branch 'origin/test' into wechat-micro2-login	2021-06-22 17:46:26 +08:00
walker-sheng	65b7c6f9b1	地图数据——道岔添加型号字段	2021-06-22 17:46:07 +08:00
joylink_zhangsai	602ff1df1e	Merge branch 'test' into dev	2021-06-22 13:08:54 +08:00
joylink_zhangsai	2c3fda7dcf	修改ZC移动授权计算bug	2021-06-22 13:08:36 +08:00
walker-sheng	7de1fd64ad	Merge remote-tracking branch 'origin/test' into wechat-micro2-login	2021-06-22 11:26:26 +08:00
walker-sheng	48ae6734ff	smart-doc相关配置调整，可由项目访问	2021-06-22 11:26:13 +08:00
joylink_zhangsai	9a206457fe	Merge branch 'test' into dev	2021-06-22 10:46:55 +08:00
joylink_zhangsai	d741b550fb	仿真对话改用讯飞语音识别	2021-06-22 10:45:43 +08:00
joylink_zhangsai	e720603455	实现ARB计轴预复位逻辑	2021-06-22 10:42:26 +08:00
joylink_zhangsai	b55e81edec	增加车次发音匹配内容	2021-06-21 16:56:43 +08:00
joylink_zhangsai	5a68971025	修改：讯飞语音识别实现	2021-06-21 16:17:46 +08:00
walker-sheng	e8373fc6e6	Merge remote-tracking branch 'origin/test' into wechat-micro2-login	2021-06-21 15:49:51 +08:00
walker-sheng	eb16909a52	删除swagger依赖，将swagger注解替换为Java注释，引入smart-doc的maven插件，可以生成Rest接口的doc文档添加2d模型草稿增删改查接口和实现	2021-06-21 15:49:30 +08:00
joylink_zhangsai	7558c10420	修改：区段进路解锁时不再对区段延续保护解锁	2021-06-21 15:45:17 +08:00
joylink_zhangsai	d350f15260	修改：IBP盘蜂鸣器bug	2021-06-21 14:17:19 +08:00
joylink_zhangsai	2339952cae	新增：设置ARB故障	2021-06-21 13:53:03 +08:00
joylink_zhangsai	eddd0171b7	Revert "修改：恢复ARB判定。新增：<无ARB判定>线路配置" This reverts commit `dce0f88e`	2021-06-21 09:36:44 +08:00
joylink_zhangsai	dce0f88ec4	修改：恢复ARB判定。新增：<无ARB判定>线路配置	2021-06-18 15:15:36 +08:00
joylink_zhangsai	47bf98e80d	修改：IBP盘逻辑及数据	2021-06-18 15:13:59 +08:00
joylink_zhangsai	4929e21076	Merge remote-tracking branch 'origin/test' into dev # Conflicts: # src/main/java/club/joylink/rtss/services/VirtualRealityIbpService.java	2021-06-18 09:12:47 +08:00
joylink_zhangsai	0493597a92	Merge remote-tracking branch 'origin/test' into test	2021-06-17 18:01:59 +08:00
joylink_zhangsai	8deff874d7	修改：IBP盘循环逻辑增加try-catch	2021-06-17 18:01:45 +08:00
walker-sheng	df508e3509	取消旧仿真定时销毁仿真任务，新定时兼容所有仿真定时删除逻辑仿真vo查询接口调整	2021-06-17 17:56:56 +08:00
joylink_zhangsai	737edb9889	修改：IBP盘bug	2021-06-17 17:53:17 +08:00
walker-sheng	a6c43d601d	新仿真——添加定时任务：所有用户都不再订阅时销毁仿真	2021-06-17 16:17:41 +08:00
walker-sheng	f7529fa7f0	列车运行控制——摩擦阻力计算修改	2021-06-17 15:28:52 +08:00
walker-sheng	3639ea5a2f	列车运行控制——修改列车最高速度为350km/h 新仿真逻辑——修改加载运行计划bug	2021-06-17 15:27:53 +08:00
joylink_zhangsai	e51130b690	Merge branch 'test' into dev	2021-06-17 15:22:58 +08:00
walker-sheng	b5c001eacf	Merge remote-tracking branch 'origin/test' into simulation-new-logic	2021-06-17 15:00:20 +08:00
walker-sheng	f7c4fbebbd	列车运行控制——修改列车最高速度为100km/h	2021-06-17 15:00:09 +08:00
joylink_zhangsai	f7910e91cc	Merge remote-tracking branch 'origin/test' into test	2021-06-17 14:59:59 +08:00
joylink_zhangsai	7830e4ed63	修改：运行图加载计划查询bug	2021-06-17 14:59:22 +08:00
walker-sheng	d71ca4f07c	Merge remote-tracking branch 'origin/test' into simulation-new-logic	2021-06-17 14:40:59 +08:00
walker-sheng	da878922fc	仿真抽象——观察者和被观察者接口调整（接口添加属性和值参数）新仿真逻辑——运行计划对象构建列车运行控制——变为自动挡，速度控制问题和逻辑调整	2021-06-17 14:40:16 +08:00
joylink_zhangsai	ad95a35a04	修改：IBP盘个别元素添加影响范围	2021-06-17 14:27:29 +08:00
joylink_zhangsai	7365c9b85f	Merge remote-tracking branch 'origin/test' into dev	2021-06-17 10:50:32 +08:00
joylink_zhangsai	e67d9aa597	修改：设置联锁自动触发的逻辑；联锁自动触发条件检查	2021-06-17 10:48:43 +08:00
walker-sheng	6256f6b8b3	添加到那儿了小程序登录接口调整小程序code换用户信息接口，兼容多小程序	2021-06-16 17:31:15 +08:00
walker-sheng	4ef20d7d62	Merge remote-tracking branch 'origin/test' into rt-simulation	2021-06-16 16:02:26 +08:00
walker-sheng	55e6cbd5e7	修改登录查询根据账号和密码查询账户逻辑：先根据邮箱或手机号查，如果不存在，根据账号查，查询出的用户数量如果等于1并且组织不存在，则找到；否则如果组织存在，根据组织筛选	2021-06-16 16:02:02 +08:00
joylink_zhangsai	c39648bd59	修改：换端逻辑的循环条件	2021-06-16 15:02:55 +08:00
joylink_zhangsai	02e961d5fa	新增：模板运行图编辑名称功能	2021-06-16 14:32:03 +08:00
joylink_zhangsai	b0bc56dd81	修改：IBP盘bug	2021-06-16 13:41:29 +08:00
joylink_zhangsai	344275fb68	修改：IBP盘实现方式	2021-06-16 13:04:03 +08:00
joylink_zhangsai	dea15cefac	新增：地图数据增加描述字段	2021-06-16 13:03:07 +08:00
joylink_zhangsai	fa76a0502a	修改：设置扣车后不触发进路问题（西安三39）	2021-06-16 10:10:51 +08:00
joylink_zhangsai	c3d4688268	Merge remote-tracking branch 'origin/test' into dev	2021-06-11 17:47:49 +08:00
joylink_zhangsai	c64bedaba5	修改：加载备用车时的重叠检测	2021-06-11 17:47:29 +08:00
walker-sheng	cd5d93bd7a	Merge remote-tracking branch 'origin/test' into rt-simulation	2021-06-11 14:53:42 +08:00
walker-sheng	c0dbed5edc	添加根据用户id获取扮演的仿真成员接口	2021-06-11 14:53:31 +08:00
joylink_zhangsai	7d2738a889	新增：IBP盘计轴预复位	2021-06-11 14:49:00 +08:00
joylink_zhangsai	618ec74584	新增：加载备用车时检查列车重叠	2021-06-11 14:39:59 +08:00
joylink_zhangsai	c8c8a2132f	修改：加载备用车时，s/t Number的值改为空字符串（解决加载备用车有上一次的车次的问题）	2021-06-11 11:10:29 +08:00
joylink_zhangsai	92d187684c	Merge remote-tracking branch 'origin/test' into dev	2021-06-11 09:55:40 +08:00
joylink_zhangsai	3b1f08df5d	移除：自动缓解EB逻辑	2021-06-11 09:55:20 +08:00
walker-sheng	bb28a0ab7d	用户管理添加根据账户、父账户条件查询	2021-06-11 09:21:23 +08:00
walker-sheng	680edf87e7	Merge remote-tracking branch 'origin/test' into third-part-control	2021-06-10 18:16:30 +08:00
walker-sheng	e6c6f9335b	第三方登录无企业账户bug修改	2021-06-10 18:16:18 +08:00
joylink_zhangsai	1a0bc76c9d	修改：账户数据插入方式	2021-06-10 17:02:31 +08:00
joylink_zhangsai	96af0971ec	修改：判断抢路逻辑（西安三问题29）	2021-06-10 15:59:13 +08:00
joylink_zhangsai	d7b0e8c065	Merge remote-tracking branch 'origin/test' into dev	2021-06-10 14:39:46 +08:00
joylink_zhangsai	2fe8097887	修改：发布地图一键校验功能以创建仿真的方式校验	2021-06-10 14:39:15 +08:00
walker-sheng	760a2d7768	权限分发管理添加分发给指定用户功能用户根据组织查询报错修复添加用户删除功能（逻辑删除，只是在用户管理列表里不显示）	2021-06-10 13:27:19 +08:00
joylink_zhangsai	57122eed48	修改自定义sql中的sys_user	2021-06-10 11:20:52 +08:00
joylink_zhangsai	0c432a60ca	修改自定义sql中的sys_user	2021-06-10 11:10:31 +08:00
walker-sheng	09de047a74	Merge remote-tracking branch 'origin/test' into third-part-control	2021-06-09 18:30:19 +08:00
walker-sheng	afc937068a	添加第三方账户仿真权限逻辑判断添加在线用户管理接口	2021-06-09 18:30:02 +08:00
joylink_zhangsai	81c691d65d	修改：延续保护解锁bug	2021-06-09 16:13:48 +08:00
joylink_zhangsai	d86ddf5bd4	修改：延续保护解锁bug	2021-06-09 14:50:14 +08:00
walker-sheng	551bdaebf9	Merge remote-tracking branch 'origin/test' into third-part-control	2021-06-09 10:56:56 +08:00
walker-sheng	ec0820abe5	Merge remote-tracking branch 'origin/test' into third-part-control # Conflicts: # src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java # src/main/java/club/joylink/rtss/services/IRealLineService.java # src/main/java/club/joylink/rtss/services/RealLineService.java # src/main/java/club/joylink/rtss/services/SysUserService.java # src/main/java/club/joylink/rtss/services/simulation/ProjectSimulationServiceImpl.java # src/main/java/club/joylink/rtss/services/simulation/SchedulingServiceImpl.java # src/main/java/club/joylink/rtss/simulation/cbtc/ProjectJointSimulationServiceImpl.java # src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/SimulationVO.java # src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java	2021-06-09 10:56:23 +08:00
joylink_zhangsai	1267565d53	Merge branch 'test' into dev	2021-06-09 10:52:43 +08:00
walker-sheng	60d2b7118a	Merge remote-tracking branch 'origin/test' into map-data-handle	2021-06-09 10:51:13 +08:00
joylink_zhangsai	91be05e37a	修改：延续保护解锁bug	2021-06-09 10:50:36 +08:00
walker-sheng	a7315c4adf	添加创建账户接口添加第三方登录接口逻辑	2021-06-09 10:31:34 +08:00
joylink_zhangsai	fe66f80bc7	修改：确认运行至前方站/越红灯指令取消自动升级逻辑（西安三问题36）	2021-06-08 18:12:25 +08:00
joylink_zhangsai	e8c7c524f7	修改：确认运行至前方站/越红灯指令取消自动升级逻辑	2021-06-08 18:08:47 +08:00
walker-sheng	0e9b18db75	修改SysUser为SysAccount，修改相关名称账户表添加第三方相关字段	2021-06-08 16:08:33 +08:00
joylink_zhangsai	5a5f8a4508	新增：IBP盘扣车状态（西安三问题35）	2021-06-08 15:46:54 +08:00
joylink_zhangsai	c3c8ebaf38	新增：计划车车次不能重复（西安三问题28）	2021-06-08 15:40:57 +08:00
joylink_zhangsai	55365d9b12	修改：延续保护解锁时不检查锁闭状态（西安三问题33）	2021-06-08 14:16:56 +08:00
joylink_zhangsai	15338c67d9	新增：列车抵达站台时更新扣车状态	2021-06-08 13:21:06 +08:00
joylink_zhangsai	5807323b89	修改：非通信车占用区段移动授权计算bug	2021-06-07 17:43:19 +08:00
walker-sheng	b1caa5125b	Merge remote-tracking branch 'origin/test' into map-data-handle	2021-06-07 17:01:27 +08:00
walker-sheng	dbdf07fb28	地图vo对象移动到新的文件夹（未完成）	2021-06-07 17:01:02 +08:00
joylink_zhangsai	49f6b357d3	新增：教学管理查看使用时长	2021-06-07 16:11:55 +08:00
joylink_zhangsai	179b880409	修改：PSL逻辑bug	2021-06-07 11:06:30 +08:00
joylink_zhangsai	f25f8f5972	Merge remote-tracking branch 'origin/test' into dev	2021-06-07 08:50:41 +08:00
joylink_zhangsai	1d103955ce	新增：PSL盘逻辑	2021-06-07 08:50:00 +08:00
walker-sheng	6aed3492ba	Merge remote-tracking branch 'origin/test' into rt-train-drive	2021-06-04 18:07:33 +08:00
walker-sheng	ade76fedbd	新接近区段数据生成逻辑联锁触发进路逻辑开发	2021-06-04 18:07:14 +08:00
joylink_zhangsai	a93937c582	新增：限速指令填负数可以取消限速	2021-06-04 16:36:28 +08:00
walker-sheng	ffba9f0dbf	Merge remote-tracking branch 'origin/test' into rt-train-drive	2021-06-04 09:14:57 +08:00
joylink_zhangsai	0b77fe4090	Merge remote-tracking branch 'origin/test' into dev	2021-06-04 08:48:17 +08:00
joylink_zhangsai	4f5d79f008	修改：进路路径构建	2021-06-03 17:57:19 +08:00
walker-sheng	90a1caa759	触发式消息发布对象抽象封装虚拟真实设备状态消息发布逻辑列车运行方向bug修改	2021-06-03 16:20:54 +08:00
joylink_zhangsai	7bba9fb3fa	Merge remote-tracking branch 'origin/test' into dev	2021-06-03 16:15:18 +08:00
joylink_zhangsai	af554059fa	修改：设置头码车的寻路逻辑	2021-06-03 16:01:13 +08:00
joylink_zhangsai	274b5f30cb	修改：设置头码车的寻路逻辑	2021-06-03 15:40:57 +08:00
joylink_zhangsai	b17175b2af	修改：设置头码车时的寻路逻辑	2021-06-03 14:40:45 +08:00
joylink_zhangsai	ce1425198c	修改：设置头码车时的寻路逻辑	2021-06-03 14:15:06 +08:00
joylink_zhangsai	b548a4fed1	修改：查询地图版本接口	2021-06-03 11:29:56 +08:00
joylink_zhangsai	c464a77768	修改：头码车路径构建bug	2021-06-03 10:31:10 +08:00
joylink_zhangsai	ea28f9a0d8	修改：非通信车占用移动授权判断逻辑 --bug292	2021-06-03 09:55:04 +08:00
walker-sheng	9498b710c1	大铁列车驾驶控制和列车运行逻辑重构通用获取仿真成员接口调整仿真消息发布对象重构（分为定时消息发布和触发式消息发布，一个发布器可以支持多个订阅）	2021-06-02 17:56:09 +08:00
joylink_zhangsai	506b908a04	修改机器人驾驶bug	2021-06-02 17:54:14 +08:00
joylink_zhangsai	4f339de3cd	修改ATP自动缓解EB逻辑 --bug286	2021-06-02 17:15:48 +08:00
joylink_zhangsai	a9b21f7609	设置头码车逻辑修改	2021-06-02 16:58:23 +08:00
joylink_zhangsai	f291898071	设置头码车逻辑修改	2021-06-02 10:04:46 +08:00
joylink_zhangsai	b2967dc346	修改：移动授权计算；恢复ATO开启时EB自动缓解	2021-06-01 18:27:05 +08:00
joylink_zhangsai	e250aa9546	新增：运行图按规则加载	2021-06-01 16:34:07 +08:00
joylink_zhangsai	d8dc705efd	修改：信号机状态发送bug	2021-06-01 14:19:07 +08:00
joylink_zhangsai	acc47117f4	Merge remote-tracking branch 'origin/test' into test	2021-06-01 14:00:00 +08:00
joylink_zhangsai	d36928da2b	新增：信号机接近锁闭字段及状态发送；列车操纵杆字段；托管功能选择逻辑区段时，转为物理区段；几个新指令；切除ATP时取消信号EB；ATP循环逻辑检查缓解EB。去掉：自动缓解EB逻辑	2021-06-01 13:59:43 +08:00
walker-sheng	e6d0b5c35f	Merge remote-tracking branch 'origin/test' into test	2021-05-31 15:53:07 +08:00
walker-sheng	7bd75e7c07	仿真消息发布对象抽象调整，仿真推送流程调整（消息订阅/发布取消/user前缀）添加列车车载相关逻辑	2021-05-31 15:52:21 +08:00
joylink_zhangsai	cd8efe1a21	修改设置头码车逻辑	2021-05-31 13:05:00 +08:00
thesai	ac063978f8	对接讯飞语音识别服务；语音训练接口使用讯飞语音识别	2021-05-30 21:29:59 +08:00
joylink_zhangsai	8bd00bdbd9	增加调头指令	2021-05-28 18:08:15 +08:00
joylink_zhangsai	aa40f830fc	修改联锁生成时code构建bug	2021-05-28 18:07:32 +08:00
joylink_zhangsai	ff7f120a43	Merge remote-tracking branch 'origin/test' into test	2021-05-28 17:50:04 +08:00
joylink_zhangsai	5dbba35cdf	修改头码车运行bug	2021-05-28 17:49:53 +08:00
walker-sheng	2383d1d2bf	Merge remote-tracking branch 'origin/test' into test	2021-05-28 16:47:07 +08:00
walker-sheng	ee60ef2d26	新仿真列车运行逻辑调整添加列车驾驶控制操作	2021-05-28 16:46:52 +08:00
joylink_zhangsai	0a2ea4ad09	修改：头码车进路办理逻辑	2021-05-28 15:40:16 +08:00
walker-sheng	7afe126f81	Merge remote-tracking branch 'origin/test' into test	2021-05-28 15:21:41 +08:00
walker-sheng	b5aa56a127	延续保护接口调整	2021-05-28 15:21:17 +08:00
joylink_zhangsai	d57b75ed72	修改：头码车运行逻辑	2021-05-28 15:08:28 +08:00
joylink_zhangsai	bcf133e5f7	修改bug	2021-05-27 18:22:14 +08:00
walker-sheng	b5e9cb50f2	Merge remote-tracking branch 'origin/test' into test	2021-05-27 17:31:03 +08:00
walker-sheng	9a6f5b18ae	添加新的侧防数据管理接口用户管理添加id查询条件	2021-05-27 17:30:40 +08:00
joylink_zhangsai	0414fcb0fd	Merge remote-tracking branch 'origin/test' into test	2021-05-27 17:02:54 +08:00
joylink_zhangsai	e26f0e11af	新增：RM和NRM会断开通信；进路开放信号的信号机所在站台屏蔽门故障时关闭信号。修改：非通信车接近关闭的信号机时没有物理点灯	2021-05-27 17:02:36 +08:00
walker-sheng	e7db4a7382	修改bug	2021-05-27 15:30:10 +08:00
walker-sheng	87881c2c2a	地图绘制进路数据更新逻辑	2021-05-27 15:25:09 +08:00
joylink_zhangsai	5e818e06ec	Merge remote-tracking branch 'origin/test' into test	2021-05-27 13:34:42 +08:00
joylink_zhangsai	5281528c45	语音识别修正	2021-05-27 13:34:23 +08:00
joylink_zhangsai	f2de22e0d8	延续保护中的设备状态不正确时，取消延续保护锁闭状态	2021-05-27 13:33:43 +08:00
walker-sheng	bc5b9c5009	地图绘制进路数据、延续保护数据、信号机接近区段数据维护接口添加	2021-05-27 10:19:56 +08:00
walker-sheng	d656a5071b	Merge remote-tracking branch 'origin/test' into test	2021-05-26 18:28:53 +08:00
joylink_zhangsai	bdb2777522	修改头码车不调头问题	2021-05-26 17:47:02 +08:00
joylink_zhangsai	9626833d85	去掉方向杆检查	2021-05-26 17:36:17 +08:00
walker-sheng	76b31e9ac3	Merge remote-tracking branch 'origin/test' into test	2021-05-26 14:55:27 +08:00
joylink_zhangsai	3a283d1227	添加指令循环执行任务	2021-05-26 14:35:29 +08:00
joylink_zhangsai	c97b7caccc	修改仿真数据校验bug	2021-05-26 13:29:28 +08:00
joylink_zhangsai	076b1ad6f8	ats进路触发逻辑修改以处理小交路折返堵车问题（西安三香湖湾）；侧防满足条件修改；修改强制取消进路线路配置描述及取消进路操作逻辑；修改信号机接近区段占用、进路接近锁闭的判断逻辑。修改宁波、哈尔滨、西安三若干问题	2021-05-26 13:15:27 +08:00
walker-sheng	85ccec7486	新仿真（大铁线路）列车驾驶功能调试	2021-05-25 18:05:55 +08:00
walker-sheng	d655347512	Merge remote-tracking branch 'origin/test' into test	2021-05-24 10:43:51 +08:00
walker-sheng	79dca6bd8d	站间运行等级和停站时间数据创建、修改流程	2021-05-24 10:43:36 +08:00
thesai	4eac911a36	修改仿真查询bug	2021-05-21 17:53:42 +08:00
joylink_zhangsai	910aeab327	虚拟信号机设置熔断故障无效	2021-05-21 10:47:56 +08:00
joylink_zhangsai	7ce6421b66	权限管理功能增加	2021-05-21 10:47:26 +08:00
joylink_zhangsai	8418ac8d35	Merge remote-tracking branch 'origin/test' into test	2021-05-20 17:58:32 +08:00
joylink_zhangsai	64d26766cf	文件管理添加新类型、新接口	2021-05-20 17:55:23 +08:00
walker-sheng	0ba42e1021	西安3号线新运行图导入调整	2021-05-19 17:56:08 +08:00
walker-sheng	9f2a02fe99	Merge remote-tracking branch 'origin/test' into test	2021-05-19 15:09:04 +08:00
walker-sheng	9cb57676b0	列车停站时间计算修改，不再缩减停站时间仿真数据构建添加运行等级、停站时间、站台区段可到达的临近站台区段等数据构建（未完）配置：ATS是否自动处理人工设置的站前折返自动更新车次构建未添加bug修改	2021-05-19 15:07:41 +08:00
joylink_zhangsai	e1481d66e0	3维数据查询bug修改	2021-05-19 15:05:51 +08:00
joylink_zhangsai	c31d38dc66	大客流代码结构修改	2021-05-19 10:21:38 +08:00
joylink_zhangsai	e0e8147ff9	仿真管理功能兼容	2021-05-18 18:35:26 +08:00
joylink_zhangsai	a23a0594b7	仿真管理功能兼容	2021-05-18 18:32:18 +08:00
joylink_zhangsai	ac91ab7f46	控制权转换的机器人回复逻辑触发条件修改（多个行值）	2021-05-18 17:33:24 +08:00
joylink_zhangsai	11d5f6168b	增加<添加行值角色>功能；添加ATP进路<可以自动追踪>字段的判断、赋值	2021-05-18 14:02:58 +08:00
joylink_zhangsai	358d8ce130	文件管理bug修改	2021-05-17 19:04:33 +08:00
joylink_zhangsai	9b26686941	文件管理bug修改	2021-05-17 19:03:32 +08:00
joylink_zhangsai	570e038bc5	图纸绑定bug修改	2021-05-17 18:59:44 +08:00
joylink_zhangsai	cf34968f4d	语音文件上传方法修改	2021-05-17 18:29:09 +08:00
joylink_zhangsai	a440ba3437	添加图纸管理功能	2021-05-17 18:28:44 +08:00
joylink_zhangsai	62a3d2a517	Merge remote-tracking branch 'origin/test' into test	2021-05-17 18:12:07 +08:00
joylink_zhangsai	bfffdfdb23	哈尔滨紧急停车特殊车站处理（添加连锁配置）	2021-05-17 17:53:32 +08:00
walker-sheng	c3bec9a093	实现移动列车操作逻辑	2021-05-14 17:56:59 +08:00
walker-sheng	6d5d46e849	仿真权限添加郑州共赢都可用	2021-05-14 15:57:12 +08:00
walker-sheng	dba887038d	实现添加车次和删除车次逻辑添加释放指令和设置保护操作	2021-05-14 15:38:22 +08:00
Jade	c2172ba185	Merge remote-tracking branch 'origin/test' into test	2021-05-14 13:21:33 +08:00
Jade	c159029d6f	fix 文档接口	2021-05-14 13:21:20 +08:00
walker-sheng	7ec7de8aa6	rt仿真调整	2021-05-13 15:14:50 +08:00
walker-sheng	190f510ba3	rt仿真调整	2021-05-13 15:14:18 +08:00
joylink_zhangsai	f189b728fd	旧仿真继承新仿真-添加大客流任务-添加真实设备任务；rtSimulationMember实现buildVO方法	2021-05-13 13:19:06 +08:00
joylink_zhangsai	4736b6c326	Merge remote-tracking branch 'origin/test' into test	2021-05-12 18:28:22 +08:00
joylink_zhangsai	ddf981be2e	旧仿真继承新仿真接口	2021-05-12 18:11:03 +08:00
Jade	105e824236	文档接口	2021-05-12 13:44:50 +08:00
walker-sheng	5de44e7263	CBTC仿真修改路径构建bug	2021-05-11 16:50:05 +08:00
walker-sheng	7fc5acb638	CBTC仿真修改路径构建缺虚拟信号机bug	2021-05-11 16:38:14 +08:00
walker-sheng	9cb5e4e34d	Merge remote-tracking branch 'origin/test' into restruct-new	2021-05-11 16:02:03 +08:00
joylink_zhangsai	37aa551580	Merge remote-tracking branch 'origin/test' into test	2021-05-11 16:01:15 +08:00
joylink_zhangsai	1c7099ce42	ATP和联锁进路排列条件修改	2021-05-11 16:00:58 +08:00
walker-sheng	8cdf4f7100	仿真结构——仿真操作分发添加操作及结果记录对象并添加仿真操作事件发布	2021-05-11 15:43:02 +08:00
walker-sheng	315fea4c78	Merge remote-tracking branch 'origin/test' into restruct-new	2021-05-11 15:19:11 +08:00
Jade	980b0531d0	simulationJob	2021-05-11 15:17:48 +08:00
walker-sheng	4cb457ab16	Merge remote-tracking branch 'origin/test' into restruct-new # Conflicts: # src/main/java/club/joylink/rtss/simulation/job/SimulationScheduledJob.java	2021-05-11 15:06:42 +08:00
Jade	e41342f0ce	simulationJob	2021-05-11 15:04:15 +08:00
walker-sheng	489733931d	Merge remote-tracking branch 'origin/test' into restruct-new	2021-05-11 13:45:58 +08:00
Jade	ac98015ed9	simulationJob	2021-05-11 10:49:48 +08:00
walker-sheng	1a79319379	Merge remote-tracking branch 'origin/test' into restruct-new # Conflicts: # src/main/java/club/joylink/rtss/simulation/Simulation.java # src/main/java/club/joylink/rtss/simulation/job/SimulationScheduledJob.java	2021-05-11 09:56:40 +08:00
Jade	19bee0ab24	simulationJob	2021-05-11 09:53:21 +08:00
walker-sheng	b61a416da1	Merge remote-tracking branch 'origin/test' into restruct-new	2021-05-10 17:18:52 +08:00
joylink_zhangsai	730ab7cac9	发布地图数据检查与否由配置决定；获取地图数据接口添加检查配置数据	2021-05-10 17:11:13 +08:00
joylink_zhangsai	fb2f66f275	添加校验所有地图数据接口	2021-05-10 15:44:34 +08:00
walker-sheng	ef7c81fd51	仿真结构——抽象仿真设备对象状态变化监控（响应式/触发式）轨道交通仿真——实现仿真道岔、信号机、计轴和联锁道岔、信号机、区段设备状态变化通知监控逻辑	2021-05-10 15:04:40 +08:00
joylink_zhangsai	a4b42d13d8	列车到站后先记录实际运行图信息；实迹运行图添加是否站前折返字段	2021-05-10 14:34:10 +08:00
joylink_zhangsai	f3115f7faf	大铁道岔单解添加联动	2021-05-08 16:31:53 +08:00
joylink_zhangsai	ed5f05a23a	大铁侧防锁闭添加条件<道岔未占用>	2021-05-08 16:26:51 +08:00
joylink_zhangsai	c7d5c38b73	大铁进路办理代码结构修改；大铁道岔转动、单/解锁联动；cilRepository.config赋值	2021-05-08 14:47:20 +08:00
joylink_zhangsai	f234e39935	添加联锁机重启操作（未测试）；修改大铁侧向列车排列不了bug；添加ATS故障（未测试）	2021-05-08 09:21:13 +08:00
joylink_zhangsai	79a26eb86c	场景录音用户查询bug修改	2021-05-06 17:04:15 +08:00
joylink_zhangsai	5284177cf2	场景语音识别错误信息记录修改	2021-05-06 16:12:54 +08:00
joylink_zhangsai	0763a46ced	大铁道岔联动转动	2021-05-06 15:52:38 +08:00
joylink_zhangsai	1660113cb3	<整个场景的语音校验接口>小改动	2021-05-06 15:02:14 +08:00
joylink_zhangsai	16c88d6357	场景语音录制相关接口实现	2021-05-06 13:50:17 +08:00
thesai	05b88e4a1c	重载语音识别方法	2021-05-05 21:43:42 +08:00
thesai	7b960c809e	大铁进路排列代码结构调整	2021-05-05 18:54:55 +08:00
joylink_zhangsai	0237c53000	场景语音录制	2021-04-30 18:29:07 +08:00
joylink_zhangsai	edf2973634	竞赛错误语音记录	2021-04-30 14:06:50 +08:00
joylink_zhangsai	732a856207	大铁引导办理增加检查	2021-04-30 13:04:01 +08:00
joylink_zhangsai	687ada1133	竞赛场景恢复	2021-04-29 18:59:35 +08:00
joylink_zhangsai	5db771b765	大铁排列进路区段提前锁闭问题修改	2021-04-29 18:47:49 +08:00
joylink_zhangsai	de20ed1f5b	大铁操作bug修改	2021-04-29 18:18:48 +08:00
joylink_zhangsai	7cd4eaac15	大铁进路逻辑修改；剧本车次识别增加内容	2021-04-29 17:31:44 +08:00
joylink_zhangsai	e966d6360c	竞赛场景暂时走小程序逻辑、操作类动作直接完成（为了测试）	2021-04-29 16:46:02 +08:00
joylink_zhangsai	38ce09edf8	竞赛场景暂时走小程序逻辑、非会话动作直接完成（为了测试）	2021-04-29 16:36:47 +08:00
joylink_zhangsai	b34a77df10	数据构建bug修改	2021-04-29 15:57:57 +08:00
joylink_zhangsai	d5b588d21a	Merge remote-tracking branch 'origin/test' into test	2021-04-29 15:47:47 +08:00
joylink_zhangsai	f9aa41c5bd	语音识别结果修正内容增加	2021-04-29 15:47:34 +08:00
walker-sheng	e17503d902	Merge remote-tracking branch 'origin/test' into test	2021-04-29 15:30:11 +08:00
walker-sheng	9089cd122e	轨道交通仿真——commonRepository的轨道路径构建修改	2021-04-29 15:29:57 +08:00
joylink_zhangsai	3f45fc1c8f	语音训练功能添加结果修正；大铁仿真bug修改；添加大铁项目登录	2021-04-29 13:30:45 +08:00
walker-sheng	7abffd511e	Merge remote-tracking branch 'origin/test' into test	2021-04-29 10:47:20 +08:00
walker-sheng	d1ff82aaf0	仿真结构——仿真、仿真成员、仿真用户vo信息通用获取接口及流程抽象实现	2021-04-29 10:47:02 +08:00
joylink_zhangsai	bd80a423c1	语音识别服务修改	2021-04-29 09:21:29 +08:00
joylink_zhangsai	604bfd0d20	大铁引导bug修改	2021-04-28 18:49:57 +08:00
joylink_zhangsai	5604630845	道岔初始化bug修改；接近锁闭判断条件修改；	2021-04-28 18:12:00 +08:00
walker-sheng	ecdd948079	Merge remote-tracking branch 'origin/test' into test	2021-04-28 17:29:02 +08:00
walker-sheng	66dcf3541c	大铁线路信号机接近区段数据构建	2021-04-28 17:28:47 +08:00
joylink_zhangsai	6c80e68b75	取消列车进入进路逻辑判断；引导信号颜色修改；进路初始化逻辑添加	2021-04-28 17:26:08 +08:00
joylink_zhangsai	88ec13709f	Merge remote-tracking branch 'origin/test' into test	2021-04-28 15:40:34 +08:00
joylink_zhangsai	1505ff4604	大铁引导总锁和通过进路操作	2021-04-28 15:40:20 +08:00
walker-sheng	035f9fffdf	大铁线路进路数据构建bug修改，添加删除时更新敌对关系逻辑	2021-04-28 14:51:26 +08:00
walker-sheng	d9226d47b6	轨道交通仿真——srSignal状态初始化修改	2021-04-28 10:44:44 +08:00
walker-sheng	6b69b956b6	Merge remote-tracking branch 'origin/test' into test	2021-04-28 10:34:35 +08:00
walker-sheng	f26d4516e6	轨道交通仿真——仿真设备添加状态初始化	2021-04-28 10:34:15 +08:00
joylink_zhangsai	6d40a8c5d9	Merge remote-tracking branch 'origin/test' into test	2021-04-28 09:29:00 +08:00
joylink_zhangsai	c231bc5ead	大铁仿真操作实现中	2021-04-28 09:28:49 +08:00
walker-sheng	bd3b7b8087	轨道交通仿真——仿真设备添加状态初始化	2021-04-27 18:42:37 +08:00
walker-sheng	63fdbbfcaf	轨道交通仿真——处理报错	2021-04-27 17:11:31 +08:00
walker-sheng	04d42aff4f	Merge remote-tracking branch 'origin/test' into test # Conflicts: # src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilSignal.java	2021-04-27 17:10:29 +08:00
walker-sheng	4e553f67bd	轨道交通仿真——添加信号机故障注入、移除逻辑，信号机基础属性添加是否调车信号机字段	2021-04-27 17:09:40 +08:00
joylink_zhangsai	d2c9e3436a	Merge remote-tracking branch 'origin/test' into test	2021-04-27 09:19:53 +08:00
joylink_zhangsai	9df81aecf4	大铁仿真操作实现中	2021-04-27 09:19:39 +08:00
walker-sheng	b894b414df	轨道交通仿真——添加计轴故障注入、移除逻辑完善	2021-04-26 18:39:24 +08:00
walker-sheng	bad2536d3f	仿真结构——添加仿真时间消息同步，仿真故障注入、移除通用接口和事件机制轨道交通仿真——添加道岔故障注入、移除逻辑	2021-04-26 17:09:35 +08:00
joylink_zhangsai	48bc9bd59d	删除道岔、区段、信号机的Cil类中本应属于Common类的字段	2021-04-26 13:54:39 +08:00
joylink_zhangsai	1590a7cbcc	大铁仿真操作实现中	2021-04-26 13:25:46 +08:00
walker-sheng	71b5dcbf59	Merge remote-tracking branch 'origin/test' into test	2021-04-25 17:53:25 +08:00
walker-sheng	b0946a9baf	轨道交通仿真——通用数据repo构建	2021-04-25 17:53:06 +08:00
joylink_zhangsai	0331485a8b	Merge remote-tracking branch 'origin/test' into test	2021-04-23 18:14:14 +08:00
joylink_zhangsai	71245dd6a2	新版仿真操作实现中	2021-04-23 18:13:47 +08:00
walker-sheng	d6c5cfaecf	消息推送——ATS消息构建调整	2021-04-23 18:12:20 +08:00
walker-sheng	a261c9e3e9	Merge remote-tracking branch 'origin/test' into test	2021-04-23 15:23:34 +08:00
walker-sheng	34f3c7a94b	消息推送——ATS构建下一发送消息问题修改	2021-04-23 15:23:08 +08:00
joylink_zhangsai	0e3ab8cac8	新版仿真进路与取消进路实现；子系统更新接口修改	2021-04-23 15:20:39 +08:00
walker-sheng	0f64c9b2c3	仿真公共接口添加初始化接口	2021-04-23 14:38:36 +08:00
walker-sheng	8912639885	仿真设备状态消息推送流程抽象轨道交通仿真——实现ATS消息推送流程	2021-04-23 14:18:53 +08:00
walker-sheng	55300ffa1e	大铁通过多进路创建bug修改	2021-04-23 10:53:17 +08:00
joylink_zhangsai	a1a65a216a	ats道岔消息构建添加更多字段	2021-04-22 17:50:13 +08:00
joylink_zhangsai	e15ed2db11	新版仿真ws消息推送实现	2021-04-22 16:04:28 +08:00
walker-sheng	303760220a	轨道交通仿真——创建过程添加初始化仿真成员和创建者扮演成员，调通操作调用	2021-04-22 14:40:20 +08:00
joylink_zhangsai	89d8c4b198	仿真创建时构建数据逻辑修改；地图子系统编辑添加对newApi的修改功能；添加生成单个子系统的接口（未测试）	2021-04-22 11:18:14 +08:00
joylink_zhangsai	828c618db7	Merge remote-tracking branch 'origin/test' into test	2021-04-22 11:05:53 +08:00
walker-sheng	a3b9a6c81f	轨道交通仿真——添加道岔转动三个操作	2021-04-22 11:01:09 +08:00
joylink_zhangsai	c23da105a0	新版仿真，添加创建仿真和获取仿真信息接口（构建数据的逻辑先去掉了，因为大铁线路数据不完整）；仿真消息发送功能实现中	2021-04-22 10:51:38 +08:00
walker-sheng	e7db868c99	轨道交通仿真仓库构建修改	2021-04-22 10:27:50 +08:00
walker-sheng	7b6cb60ba3	地图检查配置字段导入导出添加	2021-04-22 09:06:08 +08:00
walker-sheng	79cc4b43b4	地图绘制添加检查配置和发布时是否检查逻辑地图数据添加相关配置字段	2021-04-21 16:02:10 +08:00
walker-sheng	78459f3a1b	大铁进路生成逻辑bug修改地图绘制添加检查配置	2021-04-21 14:56:32 +08:00
walker-sheng	e4cbf34b01	大铁进路生成逻辑bug修改	2021-04-21 09:47:25 +08:00
walker-sheng	d9ed6eea4e	Merge remote-tracking branch 'origin/test' into test	2021-04-19 17:24:56 +08:00
walker-sheng	a81d9f1677	新仿真通用对象构建添加侧防大铁进路生成添加敌对进路关系构建和重复code检查逻辑	2021-04-19 17:24:35 +08:00
joylink_zhangsai	57deb846f1	信号按钮添加字段	2021-04-19 16:35:50 +08:00
walker-sheng	1d2157db49	Merge remote-tracking branch 'origin/test' into test	2021-04-19 16:02:04 +08:00
walker-sheng	13b6581f09	新仿真通用对象构建添加进路、延续保护进路	2021-04-19 16:01:46 +08:00
joylink_zhangsai	d50157321a	信号机类型添加调车信号机	2021-04-19 13:49:35 +08:00
joylink_zhangsai	cd521791fc	Merge remote-tracking branch 'origin/test' into test	2021-04-16 18:31:06 +08:00
joylink_zhangsai	f9d95dba62	新版仿真进路办理及道岔转动逻辑初步实现	2021-04-16 18:30:54 +08:00
walker-sheng	dbd2d0f22e	添加仿真通用对象构建大铁进路创建接口和生成逻辑开发地图数据检查重新实现（未完成）	2021-04-16 18:12:28 +08:00
DU	b0ecb17cf2	导入地图数据修改	2021-04-16 11:05:04 +08:00
joylink_zhangsai	8f0199b6a3	Merge remote-tracking branch 'origin/test' into test	2021-04-13 18:31:09 +08:00
joylink_zhangsai	a0d99564e4	地图数据添加信号按钮	2021-04-13 18:30:59 +08:00
DU	c540da932a	删除测试代码	2021-04-13 17:06:06 +08:00
DU	011ffd5ccf	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test	2021-04-13 16:59:55 +08:00
DU	4220a2881d	测试语音	2021-04-13 16:59:46 +08:00
joylink_zhangsai	f90726cacf	扫码登录也根据登录项目设置组织信息	2021-04-13 16:08:44 +08:00
DU	ce39d404b1	地图分组导入bug修改	2021-04-13 15:37:01 +08:00
DU	485f37d06c	华为语音jar引入	2021-04-13 10:03:24 +08:00
DU	3bd9cb71a7	地图组管理修改	2021-04-13 10:00:29 +08:00
DU	997773136f	先删除华为语音相关	2021-04-12 19:01:57 +08:00
joylink_zhangsai	87aab8ab15	Merge remote-tracking branch 'origin/test' into test	2021-04-12 18:49:42 +08:00
DU	cc8d28295c	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test	2021-04-12 18:48:50 +08:00
joylink_zhangsai	a46c3c9805	目的地码构建代码调整	2021-04-12 18:48:49 +08:00
DU	250de1dc73	地图数据归类，huawei语音调试	2021-04-12 18:48:41 +08:00
joylink_zhangsai	7b426cbf45	目的地码数据构建bug修改	2021-04-12 17:36:38 +08:00
joylink_zhangsai	783db4fa0f	目的地码数据构建速度优化	2021-04-12 16:09:07 +08:00
walker-sheng	b03c41705e	包调整	2021-04-12 11:36:36 +08:00
walker-sheng	986fc71d60	包调整	2021-04-12 11:35:21 +08:00
walker-sheng	7f0a9284fe	Merge remote-tracking branch 'origin/test' into test	2021-04-12 11:31:58 +08:00
walker-sheng	6d7ff4b6fd	修改包名	2021-04-12 11:31:41 +08:00
joylink_zhangsai	c4de48a386	华为语音识别回滚	2021-04-12 11:21:29 +08:00
DU	776955fbdb	华为语音包依赖	2021-04-12 11:17:26 +08:00
DU	d7cadb46b7	语音识别修改	2021-04-12 11:14:38 +08:00
joylink_zhangsai	d681f9c29a	华为语音识别回滚	2021-04-12 11:11:29 +08:00
DU	83d7238b11	Merge remote-tracking branch 'origin/test' into test1	2021-04-12 11:04:31 +08:00
DU	80349d14c0	Revert "Revert "删除表sql"" 语音识别改用百度接口	2021-04-12 11:02:42 +08:00
walker-sheng	1582188a39	Merge remote-tracking branch 'origin/test' into test	2021-04-12 11:01:48 +08:00
walker-sheng	de1858889a	交路生成过滤掉少于两个站台轨的交路的构建	2021-04-12 11:01:30 +08:00
joylink_zhangsai	08f06554bb	仿真权限校验逻辑修改	2021-04-12 10:57:07 +08:00
joylink_zhangsai	cc0a01aebb	Revert "Revert "改用华为语音识别服务"" This reverts commit `bec904c7`	2021-04-12 10:11:10 +08:00
joylink_zhangsai	249c8c1eb7	Merge remote-tracking branch 'origin/test' into test	2021-04-09 18:24:48 +08:00
joylink_zhangsai	5485c27c3b	泰雷兹操作调试	2021-04-09 18:24:39 +08:00
walker-sheng	f8f4352008	新仿真逻辑开发	2021-04-09 18:23:34 +08:00
DU	b5e3e5d2e5	宁波三导入修改	2021-04-09 11:05:09 +08:00
DU	bf109450e5	运行图校验修改宁波三导入备车变更车次回库外加一个服务车次	2021-04-09 10:23:00 +08:00
DU	6aee4ce7e9	运行图中间出库调整	2021-04-08 16:39:44 +08:00
DU	34b5be2c29	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-04-07 18:27:27 +08:00
DU	f242c3ca26	运行图出库首站/入库末站在环路上，校验增加出入库，编辑操作去掉出入库设置	2021-04-07 18:27:19 +08:00
joylink_zhangsai	6e06be24fe	Merge remote-tracking branch 'origin/test' into test	2021-04-07 17:59:31 +08:00
joylink_zhangsai	2a28c4f48e	转换轨列车不发车bug修改	2021-04-07 17:58:54 +08:00
DU	d0e68bf84e	校验修改	2021-04-06 19:40:38 +08:00
DU	c9c491848b	校验修改	2021-04-06 19:18:32 +08:00
DU	d81ec9f650	修改运行图校验	2021-04-06 18:46:56 +08:00
DU	34e1388120	运行图生成	2021-04-06 18:16:32 +08:00
DU	3cc7c1c548	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-04-06 18:14:32 +08:00
DU	1fa4451a2d	运行图校验	2021-04-06 18:14:20 +08:00
joylink_zhangsai	2bad6177d1	Merge remote-tracking branch 'origin/test' into test	2021-04-06 13:38:21 +08:00
joylink_zhangsai	59891464a1	更新地图版本时不再生成默认交路	2021-04-06 13:38:06 +08:00
walker-sheng	9f2d67de6a	Merge remote-tracking branch 'origin/test' into test	2021-04-02 19:41:48 +08:00
walker-sheng	6798b74964	侧防锁闭逻辑bug修改新仿真逻辑——CI功能开发	2021-04-02 19:41:34 +08:00
joylink_zhangsai	8d3cfc90ba	移动授权计算bug修改	2021-04-02 18:54:47 +08:00
joylink_zhangsai	28f992fb7c	Merge remote-tracking branch 'origin/test' into test	2021-04-02 18:07:17 +08:00
joylink_zhangsai	9ef0bb210d	屏蔽门关门后，如果线路选择了自动调整运行，延时6秒发车	2021-04-02 18:07:04 +08:00
walker-sheng	a166f3e4be	侧防锁闭逻辑问题修改	2021-04-02 17:07:03 +08:00
walker-sheng	5965385be5	联锁进路信号机级别、重复封锁、开放进路后联锁条件检查等流程修改	2021-04-02 16:23:12 +08:00
joylink_zhangsai	2f0e64a231	Merge remote-tracking branch 'origin/test' into test	2021-04-02 16:19:41 +08:00
joylink_zhangsai	04a49c1f2d	补充真实设备的故障状态重置	2021-04-02 16:19:32 +08:00
walker-sheng	6c247db987	三维课程数据接口bug修改	2021-04-02 15:34:56 +08:00
walker-sheng	085383bb5f	三维课程数据接口bug修改	2021-04-02 15:32:19 +08:00
joylink_zhangsai	4f6e140a31	Merge remote-tracking branch 'origin/test' into test	2021-04-02 14:22:38 +08:00
joylink_zhangsai	277eb6e244	移动授权计算逻辑修改	2021-04-02 14:22:19 +08:00
walker-sheng	a3465dc020	新仿真逻辑——CI联锁系统逻辑开发	2021-04-02 11:22:40 +08:00
walker-sheng	7027712908	添加信号机新字段存储对象逻辑	2021-04-02 11:21:14 +08:00
walker-sheng	d90288429d	Merge remote-tracking branch 'origin/test' into test	2021-04-02 11:18:03 +08:00
walker-sheng	3fbe678a5d	进路侧防逻辑调整，添加侧防为信号机时，禁止信号机进路办理逻辑	2021-04-02 11:17:41 +08:00
joylink_zhangsai	47d5ad0bb0	修改因组织和项目改为一对多关系导致的bug	2021-04-02 10:51:49 +08:00
joylink_zhangsai	707d23e2cc	修改接口地址	2021-04-02 09:06:18 +08:00
joylink_zhangsai	376c4c6a54	Merge remote-tracking branch 'origin/test' into test	2021-04-02 08:53:35 +08:00
joylink_zhangsai	733c06b191	用户表添加org_id，导入的学生与组织永远关联；组织和项目改为一对多	2021-04-01 16:30:01 +08:00
walker-sheng	1278ab42e1	Merge remote-tracking branch 'origin/test' into test	2021-03-31 18:07:19 +08:00
walker-sheng	d52faf40e7	开发三维课程数据增删改查接口	2021-03-31 18:06:59 +08:00
joylink_zhangsai	14d168b88f	添加管理员查询组织树接口	2021-03-31 15:32:27 +08:00
walker-sheng	0e2d9e339a	Merge remote-tracking branch 'origin/test' into test	2021-03-31 14:23:06 +08:00
walker-sheng	9c62b15593	新仿真逻辑——CI联锁系统逻辑开发	2021-03-31 14:22:43 +08:00
joylink_zhangsai	d1c27dc910	打开的屏蔽门ma计算bug修改	2021-03-31 09:53:38 +08:00
joylink_zhangsai	ad506486c0	教学管理考试查询bug修改	2021-03-30 18:27:44 +08:00
joylink_zhangsai	06f9914f1a	修改课程查询接口	2021-03-30 15:24:35 +08:00
joylink_zhangsai	4793a5a21a	查询排课报错	2021-03-30 15:10:58 +08:00
joylink_zhangsai	740cded8d8	修改教学管理功能及bug	2021-03-30 14:39:03 +08:00
joylink_zhangsai	13afe241fa	课程和考试的重名检测不过滤下架的数据	2021-03-30 13:22:54 +08:00
joylink_zhangsai	fccd063da8	Merge remote-tracking branch 'origin/test' into test	2021-03-30 13:05:39 +08:00
joylink_zhangsai	0333bb4a2d	评价规则bug修改	2021-03-30 13:05:25 +08:00
DU	e757d5c50e	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-30 09:38:39 +08:00
DU	40e5ea3af8	默认运行等级变成70~50km/h	2021-03-30 09:38:31 +08:00
walker-sheng	e7099f59af	Merge remote-tracking branch 'origin/test' into test	2021-03-29 18:30:19 +08:00
walker-sheng	a6485ca3e8	新仿真对象逻辑调整新仿真逻辑——CI联锁系统逻辑开发	2021-03-29 18:30:08 +08:00
joylink_zhangsai	2b0cb91e55	小bug修改	2021-03-29 18:25:57 +08:00
joylink_zhangsai	a658bd7312	课程名修改添加同名校验；评价规则应用到sql修改	2021-03-29 18:19:23 +08:00
joylink_zhangsai	ad71bfb0df	修改教学管理课程删除后创建同名课程依然报错bug；修改创建试卷报错bug	2021-03-29 17:14:17 +08:00
joylink_zhangsai	038f3b3ecd	拷贝地图功能中，拷贝考试逻辑修改	2021-03-29 16:25:56 +08:00
joylink_zhangsai	d3c9626947	修改<将评价规则应用到><查询评价规则能应用到>接口bug	2021-03-29 15:53:55 +08:00
joylink_zhangsai	0ac681ed53	考试不和课程关联	2021-03-29 15:04:13 +08:00
joylink_zhangsai	1fa81de61f	Merge remote-tracking branch 'origin/test' into test	2021-03-26 18:43:04 +08:00
joylink_zhangsai	de57624817	考试改为不和课程关联	2021-03-26 18:42:52 +08:00
DU	1a4351a084	回库修改	2021-03-26 17:20:53 +08:00
joylink_zhangsai	d6fe4e75fb	Merge remote-tracking branch 'origin/temp' into test	2021-03-26 17:13:40 +08:00
walker-sheng	40956d2c52	Merge remote-tracking branch 'origin/test' into test	2021-03-26 17:08:39 +08:00
joylink_zhangsai	5167575dde	暂时提交	2021-03-26 17:08:06 +08:00
DU	9752b2b21f	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-26 16:44:29 +08:00
DU	d1b8fcea3d	删除文件	2021-03-26 16:44:21 +08:00
DU	72a6546297	生成bug修改	2021-03-26 16:43:18 +08:00
joylink_zhangsai	4801d11b3b	教学管理bug修改	2021-03-25 20:42:19 +08:00
joylink_zhangsai	4e478b95a2	教学管理功能修改	2021-03-25 19:46:34 +08:00
joylink_zhangsai	7fba696238	Merge remote-tracking branch 'origin/test' into test	2021-03-25 19:06:29 +08:00
joylink_zhangsai	8383ec0336	教学管理功能修改	2021-03-25 19:06:08 +08:00
walker-sheng	98fed5f681	新仿真运行流程调整新仿真逻辑——计算机联锁模块数据构建.	2021-03-25 18:23:24 +08:00
DU	7a0fe8f683	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-25 18:18:46 +08:00
DU	f53cfefb8c	运行图接口问题修改	2021-03-25 18:18:38 +08:00
joylink_zhangsai	354f676238	sql修改	2021-03-25 15:40:36 +08:00
joylink_zhangsai	7e425787d9	Merge remote-tracking branch 'origin/test' into test	2021-03-25 15:03:53 +08:00
joylink_zhangsai	38da216a31	修改教学管理功能	2021-03-25 15:03:43 +08:00
DU	0c3a311323	运行图生成时间问题修改	2021-03-24 15:07:41 +08:00
DU	7fbc880d5d	运行图编辑问题修改	2021-03-24 13:34:20 +08:00
DU	9e20930f4c	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-24 09:43:58 +08:00
DU	87f3296a90	运行图生成发车时间调整	2021-03-24 09:43:49 +08:00
walker-sheng	ca2ea3a606	Merge remote-tracking branch 'origin/test' into test	2021-03-23 18:27:45 +08:00
walker-sheng	1e82fe9b97	联锁生成——延续保护添加信号机字段保存	2021-03-23 18:27:31 +08:00
joylink_zhangsai	2eb8cae79a	运行线添加必经进路（逻辑未实现，只是添加数据）	2021-03-23 16:53:43 +08:00
joylink_zhangsai	e5282d6c0d	修改教学管理-评价规则功能；组织删除改为逻辑删除（未完善）	2021-03-23 16:47:56 +08:00
joylink_zhangsai	bd5d1e9d4b	目的地码生成逻辑报错消除	2021-03-23 13:24:45 +08:00
joylink_zhangsai	bda5126e4b	Merge remote-tracking branch 'origin/test' into test	2021-03-23 11:19:27 +08:00
joylink_zhangsai	d930f18d52	车站预复位逻辑修改	2021-03-23 11:18:44 +08:00
walker-sheng	064e46b47a	Merge remote-tracking branch 'origin/test' into test	2021-03-23 09:22:41 +08:00
walker-sheng	f0b8f3f754	地图绘制数据处理——逻辑区段是否站台轨处理	2021-03-23 09:22:24 +08:00
joylink_zhangsai	ced64ef381	Merge remote-tracking branch 'origin/test' into test	2021-03-23 09:02:19 +08:00
walker-sheng	7681690896	数据校验添加区段是否站台轨、转换轨校验逻辑	2021-03-22 16:47:42 +08:00
joylink_zhangsai	270ef43603	添加按集中站获取区段的接口	2021-03-22 14:52:11 +08:00
walker-sheng	3ce3360226	联锁生成——重构交路生成逻辑bug修改	2021-03-22 14:20:48 +08:00
walker-sheng	b26ef44213	Merge remote-tracking branch 'origin/test' into test	2021-03-22 11:23:58 +08:00
walker-sheng	ca9bb496c6	联锁生成——重构交路生成逻辑（现只生成一个方向交路，不再生成折返可能反向的交路）,删除生成交路车站列表字段	2021-03-22 11:23:37 +08:00
DU	914141c280	与系统默认交路相同的也可自定义创建	2021-03-22 11:19:51 +08:00
walker-sheng	3d97dfc4af	Merge remote-tracking branch 'origin/test' into test	2021-03-19 18:27:10 +08:00
walker-sheng	0553287cdb	客流策略计算bug修改	2021-03-19 18:26:55 +08:00
joylink_zhangsai	c406d1fb36	考试评分bug修改	2021-03-19 18:21:25 +08:00
joylink_zhangsai	8192e0be98	评价规则权重使用方式修改	2021-03-19 17:46:45 +08:00
joylink_zhangsai	63d7af8064	小bug修改	2021-03-19 16:14:30 +08:00
joylink_zhangsai	279ae5194b	Merge remote-tracking branch 'origin/test' into test	2021-03-19 15:57:06 +08:00
joylink_zhangsai	cce2b9aef6	教学管理功能修改	2021-03-19 15:56:52 +08:00
DU	f56f08f0a3	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-19 11:38:40 +08:00
DU	6ef313cfa9	运行图生成修改	2021-03-19 11:38:31 +08:00
thesai	db9ee015bd	Merge remote-tracking branch 'origin/test' into test	2021-03-18 18:58:49 +08:00
thesai	0f81295f3f	添加检查站台状态以取消列车扣车状态的循环逻辑	2021-03-18 18:58:31 +08:00
DU	1b72bc695e	修改运行图生成问题	2021-03-18 18:49:29 +08:00
DU	5a1f1bdb72	运行图生成自动铺画出入库	2021-03-18 14:31:04 +08:00
DU	8adda9b160	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-17 17:08:13 +08:00
DU	310d5c7f7b	生成系统交路问题修改	2021-03-17 17:07:56 +08:00
walker-sheng	3f86f1fc6c	联锁生成——修改交路生成逻辑问题，兼容站台轨无出站信号机情况	2021-03-17 16:02:05 +08:00
walker-sheng	c521b9dcd6	Merge remote-tracking branch 'origin/test' into test	2021-03-16 13:30:44 +08:00
walker-sheng	413a9c1c37	修改ATS进路触发接近区段检查逻辑问题，改为使用列车所在物理区段检查	2021-03-16 13:30:25 +08:00
DU	6cdc61151e	转换轨相邻车站交路生成修改	2021-03-15 17:03:40 +08:00
walker-sheng	e7ab43038a	项目域名接口开发	2021-03-15 16:53:39 +08:00
walker-sheng	5782b50944	Merge remote-tracking branch 'origin/test' into test	2021-03-15 16:24:56 +08:00
DU	d3f45b1b5e	生成时发车问题修改	2021-03-15 14:06:49 +08:00
DU	94b679893f	运行图问题修改	2021-03-15 13:07:32 +08:00
DU	a2a8f1f296	运行图问题修改	2021-03-15 13:05:04 +08:00
DU	5a8c4950c8	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-15 11:04:06 +08:00
DU	c8f52f5141	运行图交路相关修改	2021-03-15 11:03:57 +08:00
joylink_zhangsai	b3c5c4c4f8	白名单修改	2021-03-15 10:39:10 +08:00
walker-sheng	1f94e0ff6d	Merge remote-tracking branch 'origin/test' into test	2021-03-12 18:54:30 +08:00
walker-sheng	7c72507527	新仿真逻辑——计算机联锁模块开发仿真发布消息逻辑调整	2021-03-12 18:54:14 +08:00
joylink_zhangsai	228ae47d1c	Merge remote-tracking branch 'origin/test' into test	2021-03-12 18:45:14 +08:00
joylink_zhangsai	30a1685935	南铁院岔心设置计轴故障/预复位	2021-03-12 17:44:50 +08:00
DU	4a7817cccb	修改	2021-03-12 16:55:03 +08:00
DU	16509551ee	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-12 16:50:19 +08:00
DU	4c27f18a69	交路名称修改	2021-03-12 16:49:58 +08:00
joylink_zhangsai	f9f7564a0f	Merge remote-tracking branch 'origin/test' into test	2021-03-12 16:43:43 +08:00
DU	c6b8227823	运行图编制交路设置修改	2021-03-12 15:07:50 +08:00
DU	6505702a13	运行图编制修改	2021-03-12 11:38:03 +08:00
joylink_zhangsai	0b2dce823e	cgy添加使用记录	2021-03-12 11:03:10 +08:00
DU	5a6f87f401	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-12 09:10:39 +08:00
DU	775437150b	恢复交路自动生成默认交路，运行图编制可使用生成的交路。	2021-03-12 09:10:33 +08:00
walker-sheng	8da937e941	新仿真逻辑——虚拟真实设备逻辑开发	2021-03-11 13:26:48 +08:00
joylink_zhangsai	7e96b047c2	ISCS查询接口添加校验	2021-03-11 10:44:46 +08:00
joylink_zhangsai	9681255916	将进路路径构建时的迭代次数改为由调用者传入	2021-03-11 10:26:55 +08:00
joylink_zhangsai	37c306ac27	Merge remote-tracking branch 'origin/test' into test	2021-03-10 19:58:29 +08:00
joylink_zhangsai	a5cbd9b07c	运行线添加筛选进路列表逻辑	2021-03-10 19:42:20 +08:00
joylink_zhangsai	2faf256501	泰雷兹排列进路到操作修改	2021-03-10 19:40:35 +08:00
DU	0a126f41a6	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-10 17:58:39 +08:00
DU	1434f23db7	生成运行图问题修改	2021-03-10 17:58:30 +08:00
walker-sheng	c0f1035f0e	Merge remote-tracking branch 'origin/test' into test	2021-03-10 16:58:49 +08:00
walker-sheng	7fdb0dd16b	按计划行车，转换轨列车加载问题修改	2021-03-10 16:58:27 +08:00
joylink_zhangsai	8ef6553a20	Merge remote-tracking branch 'origin/test' into test	2021-03-09 18:05:58 +08:00
joylink_zhangsai	34c1b72d2e	道岔转动恢复失表故障的概率改为1/3	2021-03-09 18:05:39 +08:00
DU	f2baa1b51f	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-09 17:58:07 +08:00
DU	39441c9a37	折返时间根据交路加默认值	2021-03-09 17:57:56 +08:00
joylink_zhangsai	cf6cc759e9	Merge remote-tracking branch 'origin/test' into test	2021-03-09 17:25:16 +08:00
joylink_zhangsai	104f50793d	南铁院问题修改	2021-03-09 17:24:49 +08:00
DU	1a4092577e	运行图修改	2021-03-09 15:01:33 +08:00
DU	c099a49ac3	信号机所属车站数据构建	2021-03-09 10:04:53 +08:00
walker-sheng	415e92b4da	新仿真结构下的虚拟真实设备逻辑完善	2021-03-09 09:30:08 +08:00
joylink_zhangsai	512d49e763	Merge remote-tracking branch 'origin/test' into test	2021-03-08 14:48:15 +08:00
joylink_zhangsai	38e5af449b	添加<生成目的地码>连锁配置及生成逻辑	2021-03-08 14:45:35 +08:00
DU	e6a6184ed0	运行图修改	2021-03-08 11:46:30 +08:00
DU	bfd278017a	运行图交路定义修改，增加车站折返时间配置	2021-03-08 11:39:55 +08:00
joylink_zhangsai	15ec7c7b3b	Merge remote-tracking branch 'origin/test' into test	2021-03-05 17:48:54 +08:00
walker-sheng	8edf518f95	客流车站参数管理接口开发	2021-03-05 17:46:56 +08:00
walker-sheng	6ee4d141c9	Merge remote-tracking branch 'origin/test' into test	2021-03-05 16:35:31 +08:00
walker-sheng	6abd8254b6	仿真结构抽象(仿真主线程逻辑调整) 虚拟真实设备逻辑开发	2021-03-05 16:34:54 +08:00
joylink_zhangsai	5fa74769c8	由于会导致备用车和北京一自动信号机前的列车不能运行，去掉对<未进路锁闭的区段>的检查	2021-03-05 14:58:54 +08:00
joylink_zhangsai	97a3baedb7	运行线逻辑完善	2021-03-05 13:54:55 +08:00
joylink_zhangsai	e091dac76a	修改cgy留言板数据时间修改接口	2021-03-04 21:27:41 +08:00
joylink_zhangsai	8c9093c530	修改cgy留言板数据时间修改接口	2021-03-04 21:22:14 +08:00
joylink_zhangsai	16bd531cd9	添加cgy留言板数据时间修改接口	2021-03-04 21:07:28 +08:00
joylink_zhangsai	6b0db15a6d	针对成工院修改留言板	2021-03-03 21:30:38 +08:00
walker-sheng	fb7f3fa70c	仿真结构抽象(仿真数据仓库抽象，一些逻辑调整)	2021-03-03 19:22:31 +08:00
walker-sheng	e8bb268287	Merge remote-tracking branch 'origin/test' into test	2021-03-03 16:56:50 +08:00
walker-sheng	8876292193	仿真结构抽象(操作分发调整，用户订阅/取消订阅逻辑框架构建，添加固定频率任务接口)	2021-03-03 16:56:32 +08:00
joylink_zhangsai	a397a1c195	修改浙大网新停车/发车操作指令	2021-03-02 17:29:46 +08:00
joylink_zhangsai	b02db4209e	添加浙大网新停车/发车操作指令	2021-03-02 16:02:00 +08:00
joylink_zhangsai	dd1e5b7705	Merge remote-tracking branch 'origin/test' into test	2021-03-02 13:31:27 +08:00
joylink_zhangsai	1a5bb58354	修改目的地码数据以兼容宁波三运行线逻辑；修改头码车目标到站逻辑；修改列车扣车操作逻辑以兼容浙大网新列车扣车逻辑	2021-03-02 13:30:46 +08:00
DU	09298761bf	实训修改，教学成绩导出学号修改	2021-03-01 19:09:24 +08:00
DU	e3a44e76f4	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-03-01 17:36:14 +08:00
DU	4b4b30ad9b	下架默认课程不显示	2021-03-01 17:36:05 +08:00
joylink_zhangsai	ada9bc6fd8	添加日志	2021-03-01 16:41:11 +08:00
walker-sheng	fe2892dad0	Merge remote-tracking branch 'origin/test' into test	2021-02-26 18:45:17 +08:00
walker-sheng	3265507232	仿真结构抽象(操作分发部分实现)	2021-02-26 18:44:55 +08:00
DU	0961ec7453	组织查询bug	2021-02-26 18:37:22 +08:00
DU	411cf5008d	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-02-26 18:07:43 +08:00
DU	3c3a13030f	学院账号绑定顶级组织code，账号登陆验证组织绑定项目	2021-02-26 18:07:33 +08:00
joylink_zhangsai	98a6a509d4	CGY取消权限校验	2021-02-26 14:27:38 +08:00
DU	745a4c2999	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-02-26 10:49:47 +08:00
DU	825a870d8e	课程表加默认字段	2021-02-26 10:49:37 +08:00
joylink_zhangsai	88720cd004	Merge remote-tracking branch 'origin/test' into test	2021-02-26 10:15:24 +08:00
DU	68e9264d60	学院名称不显示bug	2021-02-25 16:33:02 +08:00
DU	05306ac91c	导入学员信息bug	2021-02-25 16:24:02 +08:00
joylink_zhangsai	56f6c82f02	Merge remote-tracking branch 'origin/test' into test	2021-02-25 15:20:56 +08:00
walker-sheng	029764eb07	Merge remote-tracking branch 'origin/test' into test	2021-02-24 18:45:45 +08:00
walker-sheng	afdbde3753	添加validation依赖，修复@Validated实训问题添加注册接口（邮箱）仿真结构抽象	2021-02-24 18:45:33 +08:00
DU	e6390321ae	控制权限转移修改	2021-02-24 18:43:44 +08:00
joylink_zhangsai	f289618709	添加<区段开放/关闭>操作	2021-02-24 15:40:47 +08:00
joylink_zhangsai	aa7e69f7dd	设置自动通过进路根据配置设置背景	2021-02-24 10:03:30 +08:00
joylink_zhangsai	cf2e10b9db	恢复车站的计轴预复位取消操作	2021-02-23 19:43:04 +08:00
joylink_zhangsai	0db6131fc8	添加计轴复位操作并将宁波一的IBP盘复位按钮改为调用此操作	2021-02-23 17:10:55 +08:00
joylink_zhangsai	3d8564ae84	Merge remote-tracking branch 'origin/test' into test	2021-02-23 15:59:37 +08:00
joylink_zhangsai	a733559ea0	强制点灯bug修改	2021-02-23 15:59:20 +08:00
DU	8d424521af	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-02-23 14:11:09 +08:00
joylink_zhangsai	653a37b1a9	IBP盘预复位逻辑完善；添加配置；宁波三部分操作添加	2021-02-23 14:03:36 +08:00
DU	abc0b200e4	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 Conflicts: src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java	2021-02-23 13:30:48 +08:00
DU	1544add3a7	实训修改泰雷兹跳停操作	2021-02-23 13:30:20 +08:00
joylink_zhangsai	70e60808ac	仿真背景保存添加车站的新字段；IBP盘加新按钮类型；IBP盘按按钮接口修改；添加接口查询车站下的区段和地图下的区段	2021-02-23 09:50:42 +08:00
joylink_zhangsai	74c5ba1a2e	车站状态发送修改	2021-02-22 16:48:24 +08:00
joylink_zhangsai	d89363e880	泰雷兹道岔封锁操作逻辑实现	2021-02-22 13:46:49 +08:00
joylink_zhangsai	71ac99cb50	车站预复位字段修改	2021-02-22 10:55:55 +08:00
joylink_zhangsai	b895017e9c	Merge remote-tracking branch 'origin/test' into test # Conflicts: # src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java # src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsStationService.java	2021-02-22 10:02:02 +08:00
DU	c3fd300248	自动折返现地实训背景bug，站台状态重置修改	2021-02-20 16:44:07 +08:00
DU	f3b9ebf4a7	车站控制权	2021-02-20 15:35:58 +08:00
joylink_zhangsai	8d218f15bd	添加车站预复位操作	2021-02-20 14:48:52 +08:00
DU	ede2afc019	Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1	2021-02-20 13:40:52 +08:00
DU	b121560787	系统扣车，车站授权	2021-02-20 13:40:42 +08:00
joylink_zhangsai	572f4f1b6d	添加请求区域控制权(区域选择)相关属性、操作、逻辑；添加泰雷兹<道岔/命令>操作及相关属性、逻辑（未完）	2021-02-20 13:34:25 +08:00
joylink_zhangsai	0a84cbb690	对未锁闭的区段执行区故解去掉报错	2021-02-19 14:01:48 +08:00
joylink_zhangsai	71ddb49505	列车模型数据修改；添加<办理引导前是否需要信号机接近锁闭>配置项；人解引导进路时走取消引导逻辑	2021-02-19 13:16:28 +08:00
joylink_zhangsai	8ce8504521	订单创建类添加以分为单位的价格；列车添加运行类型；修改<全站取消自动通过进路功能无效>bug；倒车限速改为5km/h	2021-02-19 09:44:18 +08:00
walker-sheng	e2bd029771	仿真结构抽象	2021-02-18 18:26:55 +08:00
joylink_zhangsai	bec904c711	Revert "改用华为语音识别服务" This reverts commit `c977e4c9`	2021-02-18 11:33:04 +08:00
joylink_zhangsai	321605663f	Merge branch 'nb1' into test # Conflicts: # src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java	2021-02-18 11:31:04 +08:00
joylink_zhangsai	a3b89f9125	设置/取消强制点灯操作合并	2021-02-18 11:29:57 +08:00
joylink_zhangsai	d96e44f896	仿真子系统添加<运行图编制工作站>；<新建单位rootId字段没有值>bug修改	2021-02-18 11:10:14 +08:00

... 10 11 12 13 14 ...

1611 Commits