Tree: 7a055f3d22

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '7a055f3d22'

${ noResults }

Commit Graph

12979 Commits (7a055f3d22b16db13dab1ccf728dcc491ba1df7e)

 

All Branches   

Search

Author	SHA1	Message	Date
zhaoqifeng	7a055f3d22	Merge branch 'dev_grid_platform' into develop	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	7b69ae0bdf	Merge branch 'dev_grid_platform' into develop	4 years ago
zhaoqifeng	32bd1cbde9	事件上报添加部门网格ID	4 years ago
zhaoqifeng	5320b28c63	Merge branch 'dev_grid_platform' into develop	4 years ago
zhaoqifeng	7497421203	事件上报添加部门网格ID	4 years ago
zhaoqifeng	0584eee78c	Merge branch 'dev_grid_platform' into develop	4 years ago
zhaoqifeng	4766365f75	事件上报	4 years ago
wangxianzhang	a213e319ff	Merge branches 'develop' and 'wxz_job_tran_serial' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	6a4f8f5529	修改： 1.epmet-common-tools模块中，将FeignConfig.java做了调整，RequestInterceptor的实例化逻辑做了调整。允许依赖epmet-common-tools的客户端自定义RequestInterceptor 2.job服务增加了自己的RequestInterceptor，用于生成tran-serial	4 years ago
zhaoqifeng	f3305088c2	Merge branch 'dev_grid_platform' into develop	4 years ago
zhaoqifeng	21733738da	办结组织和办结层级设定	4 years ago
wxz	66cc07e3c4	Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wxz	073f1aa456	Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
wxz	a84edc743b	Merge branches 'dev' and 'dev_dim_addcode' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
zhaoqifeng	eb0a132da2	事件上报发送MQ消息	4 years ago
jianjun	8d22c9f6c8	Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop	4 years ago
jianjun	fcdef1d2e7	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	7ef6da082b	优化结构	4 years ago
jianjun	5112c82c8b	sql错误	4 years ago
jianjun	ef1bfe050c	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	298969b1cf	去掉逻辑删除	4 years ago
wxz	5480c8037f	修改： 1.调整 NacosServiceListListenerRegisterer 中部分日志的级别为debug	4 years ago
jianjun	beced4fd7d	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	b046aa7a69	代码调整	4 years ago
sunyuchao	d8a75638d7	组织、网格、人员新增、修改出发点添加推送MQ事件逻辑	4 years ago
jianjun	22d45b99db	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	a16da262e5	sql错误	4 years ago
zxc	1e36a99f81	分类截取位数	4 years ago
jianjun	d82fea23fe	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	ef73d95e99	Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java	4 years ago
jianjun	e964b04213	巡查方法调整并添加初始化数据入口	4 years ago
wxz	00d734790b	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wxz	d874a4626d	新增： job扫描滞留/阻塞消息的逻辑	4 years ago
wxz	5b01beb6cc	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wxz	19f0ad54bf	新增： job扫描滞留/阻塞消息的逻辑	4 years ago
wxz	92472ed994	修复： 无法编译的代码问题	4 years ago
wxz	91296b83f7	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wxz	a3e1d3d287	修复： 无法编译的代码问题	4 years ago
wxz	0cad64f0c5	Merge branches 'develop', 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wxz	4b66a433d7	新增： system_message_pendding的sql脚本	4 years ago
wxz	5d57db69eb	Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java	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
wxz	6c361931dd	Merge branches 'dev_dim_addcode' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java	4 years ago
wxz	8852ce3ebd	修改： dim同步，增加code字段 的同步	4 years ago
jianjun	5f4fd78171	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago