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 | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								9a60882ba1
								
							
								
							
						 | 
						
							
							
								
								预警事件 枚举
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								0de2ad7384
								
							
								
							
						 | 
						
							
							
								
								优化事件类型相关代码
							
							
							
							
							
							
								
							
							
							装好范围查询设备新增按照方向查询 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								e5da7d9267
								
							
								
							
						 | 
						
							
							
								
								转换
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 wangsixiang
							
						 | 
						
							
							
							
								
							
								6255a4a5b9
								
							
								
							
						 | 
						
							
							
								
								感知与交通事件主子类转换
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								d3d3a0db7b
								
							
								
							
						 | 
						
							
							
								
								修改获取事件子类字段
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 王兴琳
							
						 | 
						
							
							
							
								
							
								54aa2aadf3
								
							
								
							
						 | 
						
							
							
								
								增加  "subclass": "10-1"
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								c3ff29bb12
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								c55fd5aed1
								
							
								
							
						 | 
						
							
							
								
								更改事件弹框查询
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								5d650c12cb
								
							
								
							
						 | 
						
							
							
								
								1.批量操作感知事件
							
							
							
							
							
							
								
							
							
							2.气象检测器数据修改 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								998aa371bd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								199b85bb39
								
							
								
							
						 | 
						
							
							
								
								新增护栏碰撞设备事件上报处理逻辑
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								bef639f881
								
							
								
							
						 | 
						
							
							
								
								感知事件批量操作
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								151058f7d8
								
							
								
							
						 | 
						
							
							
								
								更改事件确认返回值类型
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								5d38d6ec5b
								
							
								
							
						 | 
						
							
							
								
								工具修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								8edea34384
								
							
								
							
						 | 
						
							
							
								
								工具修改
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								d795547621
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								60a825e703
								
							
								
							
						 | 
						
							
							
								
								暂时注释掉DailyTrafficStatisticsCache.addCacheData(dcTrafficSectionData);
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								d37c4d0b8b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								e4f82cebee
								
							
								
							
						 | 
						
							
							
								
								优化解决SQL数据备份功能
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 lau572
							
						 | 
						
							
							
							
								
							
								bf5b330a41
								
							
								
							
						 | 
						
							
							
								
								注释定时任务
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								67c5c38289
								
							
								
							
						 | 
						
							
							
								
								优化解决SQL数据备份功能
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								35b8c92e38
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								zhaoxianglong
							
						 | 
						
							
							
							
								
							
								d3852ff163
								
							
								
							
						 | 
						
							
							
								
								优化设备批量操作接口
							
							
							
							
							
							
								
							
							
							优化解决SQL数据备份功能 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								9b132375e7
								
							
								
							
						 | 
						
							
							
								
								修改事件确认中设备操作执行代码
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								 
								Mr.Wang
							
						 | 
						
							
							
							
								
							
								e5a0a8531a
								
							
								
							
						 | 
						
							
							
								
								修改事件确认中的激光疲劳唤醒操作代码
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								0afef0c2de
								
							
								
							
						 | 
						
							
							
								
								代码优化
							
							
							
							
								
							
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								3d431aaac3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java 
							
						 | 
						2 years ago | 
					
				
					
						
							
							
								
								 xiepufeng
							
						 | 
						
							
							
							
								
							
								971ca5045b
								
							
								
							
						 | 
						
							
							
								
								添加交通断面数据缓存恢复功能
							
							
							
							
								
							
							
						 | 
						2 years ago |