Tree: 72cb6a69ee

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '72cb6a69ee'

${ noResults }

Commit Graph

13355 Commits (72cb6a69ee9290b528e95ff8fedee96ade2bdab9)

 

All Branches   

Search

Author	SHA1	Message	Date
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	0c0193f353	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wxz	89a8c0cb47	修复： 1.OpenDataOrgChangeEventListener打印日志内容错误	4 years ago
jianjun	bc666415ee	Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop	4 years ago
sunyuchao	eb445cbd0b	中间库数据同步代码提交	4 years ago
jianjun	7c44e890f7	调整feign stats	4 years ago
wxz	f423f2391a	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	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	7f8460ba39	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	fbcbd89c88	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	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	504994bdbd	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	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
wxz	a2039c8b1b	修改： spring.app.name	4 years ago
jianjun	580e1a0647	Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java	4 years ago
jianjun	2e3ba74b27	Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform	4 years ago
jianjun	5d25979c58	巡查记录消费消息插入或更新	4 years ago
zxc	aa6d06b417	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	254aa70959	网格分类统计修改	4 years ago
wxz	fea20f3bc1	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_platform Conflicts: epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java	4 years ago
zxc	956d31e5f8	直接立项的查询修改	4 years ago
wxz	57b3679f36	修改： 1.所有mq listener增加redis 滞留消息列表的删除动作	4 years ago
yinzuomei	c299162892	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
yinzuomei	ef5beec63d	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_platform	4 years ago
yinzuomei	3dacef8c26	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	e3fb8b5ae7	ScreenProjectSettleService.extractScreenData新增origin,categoryCode.顺便改了下orgName。来源于议题的存储网格名，来源于事件和立项的都存储的是project.agencyId对应的组织名称	4 years ago
yinzuomei	01d1bdf007	/project/uploadprojectinfo,3个街道上传入参新增categoryCode，值为项目在其客户中的编码。	4 years ago
jianjun	330920931d	巡查记录消费消息框架	4 years ago
jianjun	e977206c5e	巡查记录发送消息 到mq	4 years ago
wxz	7ff3a07027	修复：错误的配置	4 years ago
wxz	97c69f71fa	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_platform	4 years ago
wxz	c10791e8f3	修改： 1.message/system/send-by-mq接口，增加参数分组 新增： 1.mq消息ack应答接口	4 years ago
yinzuomei	b65aa5d871	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
yinzuomei	36e9f612c6	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	d28dc9fdd4	测试	4 years ago
yinzuomei	fa9ee7e21e	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	1f7f58198e	巡查记录发送消息 到mq	4 years ago
jianjun	176cd44ef7	巡查记录生产	4 years ago
jianjun	f9860426b9	巡查记录生产	4 years ago
yinzuomei	c61569f6aa	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
yinzuomei	4f47c6607d	难点堵点分类编码和名称bugfix，extractProjectCategory修改	4 years ago
sunyuchao	6303fc2162	测试调整	4 years ago
sunyuchao	b039cfae11	微调	4 years ago
yinzuomei	ffa11df01e	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java	4 years ago