sunyuchao
							
						 | 
						
							
							
							
								
							
								be0de5d61c
								
							
								
							
						 | 
						
							
							
								
								加字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6a2c891acf
								
							
								
							
						 | 
						
							
							
								
								错提url修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								2ebfc657f1
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f8eb5a6a3e
								
							
								
							
						 | 
						
							
							
								
								...
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bae3ba9b2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
#	epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								2e8f1b997f
								
							
								
							
						 | 
						
							
							
								
								组织网格数据同步
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								32bd1cbde9
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								7497421203
								
							
								
							
						 | 
						
							
							
								
								事件上报添加部门网格ID
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								4766365f75
								
							
								
							
						 | 
						
							
							
								
								事件上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								21733738da
								
							
								
							
						 | 
						
							
							
								
								办结组织和办结层级设定
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								eb0a132da2
								
							
								
							
						 | 
						
							
							
								
								事件上报发送MQ消息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7ef6da082b
								
							
								
							
						 | 
						
							
							
								
								优化结构
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5112c82c8b
								
							
								
							
						 | 
						
							
							
								
								sql错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								298969b1cf
								
							
								
							
						 | 
						
							
							
								
								去掉逻辑删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b046aa7a69
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								d8a75638d7
								
							
								
							
						 | 
						
							
							
								
								组织、网格、人员新增、修改出发点添加推送MQ事件逻辑
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a16da262e5
								
							
								
							
						 | 
						
							
							
								
								sql错误
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e964b04213
								
							
								
							
						 | 
						
							
							
								
								巡查方法调整并添加初始化数据入口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d874a4626d
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							job扫描滞留/阻塞消息的逻辑 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								19f0ad54bf
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							job扫描滞留/阻塞消息的逻辑 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								a3e1d3d287
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							无法编译的代码问题 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								4b66a433d7
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							system_message_pendding的sql脚本 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								8e24b4205f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d3f10217fe
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.epmet-message中,扫描"未成功发送到mq的滞留消息"的接口
2.调整mq阻塞消息的key
3.其他逻辑微调 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5e9a88d9f6
								
							
								
							
						 | 
						
							
							
								
								添加分页方法
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bc24fd261e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a1e3fbbbf1
								
							
								
							
						 | 
						
							
							
								
								模板
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3b01526aea
								
							
								
							
						 | 
						
							
							
								
								事件上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								fde18d2eba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								92c29b03af
								
							
								
							
						 | 
						
							
							
								
								closeCaseTime改为Date
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								dc8721b1e1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_platform
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								bc5e893857
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d1812d28ba
								
							
								
							
						 | 
						
							
							
								
								mq监听者 根据tag 调用不同的方法
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								71d8b978f2
								
							
								
							
						 | 
						
							
							
								
								事件上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								6ce87953ef
								
							
								
							
						 | 
						
							
							
								
								事件上报
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								5ebd00dee5
								
							
								
							
						 | 
						
							
							
								
								更新发送消息工具类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c0d2d268f9
								
							
								
							
						 | 
						
							
							
								
								发成功了
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c084905cfd
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								dd3676855b
								
							
								
							
						 | 
						
							
							
								
								代码合并引起的
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ea7730220b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c061ca24f3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
#	epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
#	epmet-module/open-data-worker/open-data-worker-server/pom.xml
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
#	epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								89a8c0cb47
								
							
								
							
						 | 
						
							
							
								
								修复:
							
							
							
							
							
							
								
							
							
							1.OpenDataOrgChangeEventListener打印日志内容错误 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								eb445cbd0b
								
							
								
							
						 | 
						
							
							
								
								中间库数据同步代码提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7c44e890f7
								
							
								
							
						 | 
						
							
							
								
								调整feign stats
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								cd34967940
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								96fb383c88
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							1.健康检查
2.aop日志切面
3.ModuleCOnfingIMpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								59b6af72d3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e3d53046f7
								
							
								
							
						 | 
						
							
							
								
								删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								757b04676b
								
							
								
							
						 | 
						
							
							
								
								新增:
							
							
							
							
							
							
								
							
							
							open-data-worker的部署相关文件 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2353b5ff27
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform
							
							
							
							
								
							
							
						 | 
						4 years ago |