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
|
cead5506b7
|
Merge branches 'dev_dim_addcode' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
|
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 |
|
jianjun
|
d41212b455
|
因为分类还没更新，暂时先按照4位截取
|
4 years ago |
|
jianjun
|
e67e0047b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
baaebce096
|
日志级别调整
|
4 years ago |
|
jianjun
|
5190d67338
|
日志级别调整
|
4 years ago |
|
wxz
|
5918078cd4
|
Merge branches 'dev' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
wxz
|
84b6b9b81d
|
Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wxz
|
214b025bda
|
修改：
/resi/point/gridpointrank 接口，网格名称只显示网格名，不显示社区名
|
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
|
9ca5a6880c
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
db0813cee4
|
Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop
# 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
|
9dfe3ea951
|
Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop
|
4 years ago |
|
jianjun
|
5ebd00dee5
|
更新发送消息工具类
|
4 years ago |
|
jianjun
|
aa547ba8cc
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
c0d2d268f9
|
发成功了
|
4 years ago |
|
jianjun
|
1ee7e59c46
|
Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
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
|
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 |
