zhaoxianglong
							
						 | 
						
							
							
							
								
							
								8a855c4a68
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								af29763b32
								
							
								
							
						 | 
						
							
							
								
								修改在线率所需字段
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								6188c148e0
								
							
								
							
						 | 
						
							
							
								
								感知事件策略
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								fc1461e10d
								
							
								
							
						 | 
						
							
							
								
								感知事件导出
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								3f2cf48239
								
							
								
							
						 | 
						
							
							
								
								感知事件导出
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								0041b01487
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								854b85a737
								
							
								
							
						 | 
						
							
							
								
								感知事件导出
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								3efb8067c9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								59bda7d6e9
								
							
								
							
						 | 
						
							
							
								
								断面交通统计添加大型车车流量字段统计
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								3fa8b81559
								
							
								
							
						 | 
						
							
							
								
								修改在线率所需字段
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								70ffef3a40
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								71e1e8edeb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								6f4768821b
								
							
								
							
						 | 
						
							
							
								
								修复断面统计数据id生成错误的问题
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								47d7a12280
								
							
								
							
						 | 
						
							
							
								
								修改在线率所需字段
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								5dde7fce01
								
							
								
							
						 | 
						
							
							
								
								修改在线率设备筛选条件
							
							
							
							
							
							
								
							
							
							修改在线率查询条件 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								2c65803a1d
								
							
								
							
						 | 
						
							
							
								
								修改在线率设备筛选条件
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								cc1968351b
								
							
								
							
						 | 
						
							
							
								
								优化查询单个设备在线率请求
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								f5bdeab398
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								dacd76f371
								
							
								
							
						 | 
						
							
							
								
								缓存策略调试
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								2fa877d045
								
							
								
							
						 | 
						
							
							
								
								修改查询当天设备指定属性列表排序
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								7d8bdfbf5e
								
							
								
							
						 | 
						
							
							
								
								设备查询新增厂商字段
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								511780d3fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								1cb75b4e73
								
							
								
							
						 | 
						
							
							
								
								优化天气气象预警信息回传
							
							
							
							
							
							
								
							
							
							修改在线率检测使用字段 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								f74ccc399e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								e36dcb86e1
								
							
								
							
						 | 
						
							
							
								
								交通断面统计
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								1d37915d7d
								
							
								
							
						 | 
						
							
							
								
								json依赖
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								0770786e2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								11d717a74e
								
							
								
							
						 | 
						
							
							
								
								过滤策略
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								2bc0da0c44
								
							
								
							
						 | 
						
							
							
								
								dcDevice接口增加查询当天设备指定属性列表
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								659b92f649
								
							
								
							
						 | 
						
							
							
								
								值班新增机构与人员验证
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								42faef98e0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								1a5f7cd49b
								
							
								
							
						 | 
						
							
							
								
								同步摄像头物联设备id
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								8accdde31c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								78ce466c41
								
							
								
							
						 | 
						
							
							
								
								优化非机预警设备备注字段内容
							
							
							
							
							
							
								
							
							
							优化查询单个设备在线率返回值小数长度 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								ad9f344bc6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	zc-business/src/main/java/com/zc/business/controller/VideoController.java 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								c1649e479b
								
							
								
							
						 | 
						
							
							
								
								同步相机物联网ID
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								410ca9d444
								
							
								
							
						 | 
						
							
							
								
								交通断面统计
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								068e71a670
								
							
								
							
						 | 
						
							
							
								
								去除非机预警
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								7271f0f08b
								
							
								
							
						 | 
						
							
							
								
								异常设备统计添加筛选逻辑
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								18a3ffde12
								
							
								
							
						 | 
						
							
							
								
								优化设备统计页面
							
							
							
							
							
							
								
							
							
							优化天气请求报错、设备功能请求报错返回 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								e84e330db0
								
							
								
							
						 | 
						
							
							
								
								上下行摄像头修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								735b32b9df
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								5b5074ba38
								
							
								
							
						 | 
						
							
							
								
								路段搜索数据
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								8f40640b20
								
							
								
							
						 | 
						
							
							
								
								修改新增事件预案接口
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								59a09b3b76
								
							
								
							
						 | 
						
							
							
								
								气象监测页面报错处理
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								f8e04c8925
								
							
								
							
						 | 
						
							
							
								
								1.获取附近上下行摄像头
							
							
							
							
							
							
								
							
							
							2.感知事件批量操作 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								9155b08bd0
								
							
								
							
						 | 
						
							
							
								
								修改事件预案查询中设备列表
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								mengff
							
						 | 
						
							
							
							
								
							
								73d40d9e83
								
							
								
							
						 | 
						
							
							
								
								--更改厂商编码
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								9b66eecda5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								ee7eb850b8
								
							
								
							
						 | 
						
							
							
								
								优化扫码报警上传数据格式
							
							
							
							
								
							
							
						 | 
						2 years ago |