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
|
344f55740b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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
|
9805daae5f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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
|
eeb775d89c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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 |
|
yinzuomei
|
f6aff9a2ac
|
screen_project_data分类名称、项目分类id接口调整。
|
4 years ago |
|
sunyuchao
|
782fff7245
|
组织、网格、人员基础信息方法模板
|
4 years ago |
|
sunyuchao
|
6abd984d8f
|
方法模板
|
4 years ago |
|
sunyuchao
|
e7c347d1f3
|
方法模板
|
4 years ago |
|
wxz
|
932932ea48
|
新增：
1.epmet-data-open模块
修改：
1.epmet-message服务，增加针对工作人员/机构的创建/更新事件适配
|
4 years ago |
|
yinzuomei
|
a9b81d7f66
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
zxc
|
31489e3425
|
customerId限制
|
4 years ago |
|
yinzuomei
|
7446dfb399
|
screen_project_xx表手动调用方法试试
|
4 years ago |
|
yinzuomei
|
30e8711868
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
64b634d770
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
9a021713b7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
32420502c5
|
fact_origin_project_category_daily抽取逻辑修改下
|
4 years ago |
|
yinzuomei
|
bcc878b358
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
wxz
|
4bf11bee15
|
Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
yinzuomei
|
078448b60b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
b4bc82d9b8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
d70f783f35
|
议题转项目发送消息bug修改
|
4 years ago |
|
wxz
|
850ecd2132
|
Merge branch 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wxz
|
eb3b543ea0
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wxz
|
4b39fbdf1d
|
Merge branch 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wxz
|
8e7eff235e
|
Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
