xiepufeng
							
						 | 
						
							
							
							
								
							
								8352405b7e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								9e90d400f0
								
							
								
							
						 | 
						
							
							
								
								添加产品类型枚举
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								160241b5b1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								edc2c81808
								
							
								
							
						 | 
						
							
							
								
								对值班模板导出与导入
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								ebbefba720
								
							
								
							
						 | 
						
							
							
								
								事件管控分析接口修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								07b4d3d1f4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								c78a3f0e6f
								
							
								
							
						 | 
						
							
							
								
								代码优化
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								fb77f8fa2d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								58c6638289
								
							
								
							
						 | 
						
							
							
								
								非机预警
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								bde48d2a6d
								
							
								
							
						 | 
						
							
							
								
								遗漏提交
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								mengff
							
						 | 
						
							
							
							
								
							
								65572c6833
								
							
								
							
						 | 
						
							
							
								
								--修复没有数据报错问题
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								dd9118eb2b
								
							
								
							
						 | 
						
							
							
								
								遗漏依赖提交
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								5074e86c3b
								
							
								
							
						 | 
						
							
							
								
								新增非机预警事件上报订阅接口及事件上报处理
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								7f9c32597e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								01313c43c4
								
							
								
							
						 | 
						
							
							
								
								感知id
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								349fed7f2d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								8b06529895
								
							
								
							
						 | 
						
							
							
								
								更新设备状态(数据来源于物联网平台)
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								261bac39f7
								
							
								
							
						 | 
						
							
							
								
								新增事件默认状态 0
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								7da432c533
								
							
								
							
						 | 
						
							
							
								
								感知id
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								908cf6a79c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								09978e3da4
								
							
								
							
						 | 
						
							
							
								
								修改了感知事件id,机构列表等
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								1f5be463f1
								
							
								
							
						 | 
						
							
							
								
								新增事件统计接口,事件导出
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								c616ce44c9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								dcdf368046
								
							
								
							
						 | 
						
							
							
								
								与前端对接机构与值班
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								2b8fa44e77
								
							
								
							
						 | 
						
							
							
								
								根据事件{id}查询处理流程
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								5434041b0b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								a96ab7926c
								
							
								
							
						 | 
						
							
							
								
								优化路段广播相关接口
							
							
							
							
							
							
								
							
							
							新增查询设备异常接口 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								a49f3c3fb7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								2ac3838c7a
								
							
								
							
						 | 
						
							
							
								
								感知事件增删改查
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								563a58be5f
								
							
								
							
						 | 
						
							
							
								
								参数 必填取消
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								2d1298672d
								
							
								
							
						 | 
						
							
							
								
								参数 必填取消
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								f04ef293e5
								
							
								
							
						 | 
						
							
							
								
								事件多发路段分析接口修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								3402e1fc0f
								
							
								
							
						 | 
						
							
							
								
								事件多发路段分析接口修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								8c68225397
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								106aa7f35e
								
							
								
							
						 | 
						
							
							
								
								桩号id修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								1d3a81bc7a
								
							
								
							
						 | 
						
							
							
								
								新增路测广播设备定时任务上线功能
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								f0fbead573
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								7b53f23f0b
								
							
								
							
						 | 
						
							
							
								
								感知统计相关接口
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								0b3856fac6
								
							
								
							
						 | 
						
							
							
								
								连接条件修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								e8d9c9daf7
								
							
								
							
						 | 
						
							
							
								
								修改事件部门连接条件
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								452eaa05a7
								
							
								
							
						 | 
						
							
							
								
								修改连接条件
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								7f2c180933
								
							
								
							
						 | 
						
							
							
								
								感知统计相关接口
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								ac2348c92a
								
							
								
							
						 | 
						
							
							
								
								感知统计相关接口
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								865f44e91c
								
							
								
							
						 | 
						
							
							
								
								感知统计相关接口
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								b2945d20c7
								
							
								
							
						 | 
						
							
							
								
								感知统计相关接口
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								661aae109f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 zhao-meiyu
							
						 | 
						
							
							
							
								
							
								2e26f84548
								
							
								
							
						 | 
						
							
							
								
								修改感知相关表桩号id
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								53a3e5fc2c
								
							
								
							
						 | 
						
							
							
								
								参数
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								164ed71af8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
							
							
								
							
							
							 Conflicts:
	zc-business/src/main/resources/mapper/business/DcEventMapper.xml 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								bc1b8479f1
								
							
								
							
						 | 
						
							
							
								
								数据库字段修改
							
							
							
							
								
							
							
						 | 
						2 years ago |