jianjun
|
59e02523de
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
|
5 years ago |
|
jianjun
|
e92c0fe1f3
|
增大堆内存
|
5 years ago |
wxz
|
1508518489
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
yinzuomei
|
30f9665afb
|
安宁e家客户新增数据采集应用+大屏应用
|
5 years ago |
|
yinzuomei
|
453208d87a
|
安宁e家客户新增数据采集应用+大屏应用
|
5 years ago |
|
wxz
|
0d984cbdd4
|
Merge branch 'dev' into dev_screen_data
|
5 years ago |
|
wxz
|
02fc5d30bc
|
去掉动态数据源的数据源名称打印
|
5 years ago |
|
jianjun
|
7aa843d5eb
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
jianjun
|
995d0834c2
|
部署
|
5 years ago |
|
jianjun
|
1619e04a52
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
wangchao
|
d5ce6c40bd
|
data-report 升级
|
5 years ago |
|
jianjun
|
a600e8919e
|
修改大小
|
5 years ago |
|
wangchao
|
0e4b6cbf11
|
Merge branch 'dev_screen_data' into dev_temp
|
5 years ago |
|
wangchao
|
03581bc245
|
subAgencyIndexRank接口添加数据源注解
|
5 years ago |
|
yinzuomei
|
bbbce2d6ce
|
联系群众+参与议事 查询平均值，去掉group by
|
5 years ago |
|
yinzuomei
|
63ff75ac8d
|
report+stas +1
|
5 years ago |
|
yinzuomei
|
c21761908e
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
62aed2ab2a
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
jianjun
|
3acab2e0f3
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
jianjun
|
37d782aa8d
|
添加计算时间
|
5 years ago |
|
jianjun
|
f151b5a43c
|
添加计算时间
|
5 years ago |
|
yinzuomei
|
d9f4e94281
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
ecd133006e
|
代码优化
|
5 years ago |
|
wxz
|
7146a43dad
|
版本升级
|
5 years ago |
|
wxz
|
944c3926aa
|
Merge branch 'dev_externalappauth' into dev_temp
|
5 years ago |
|
wxz
|
9c733775b2
|
Merge branch 'dev_externalappauth' into dev_screen_data
|
5 years ago |
|
wxz
|
44d81a9845
|
外部应用，打开token时间戳校验
|
5 years ago |
zhangyongzhangyong
|
2444e10d07
|
签到打卡按钮，控制
|
5 years ago |
|
jianjun
|
1bdcad0d53
|
Merge branches 'dev' and 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
yinzuomei
|
777d2daa96
|
report+stas +1
|
5 years ago |
|
wxz
|
bff8003588
|
gateway的pom增加了profile的属性
|
5 years ago |
|
yinzuomei
|
59316e41d0
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
e02f25cf4a
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
3fc8b1d00d
|
市北大屏查询接口全部放开鉴权注解，修改网格相关指标计算注释能力值缺失
|
5 years ago |
|
wangchao
|
91650898d4
|
市北大屏，党员年龄分布接口，将使用ParentId匹配改成使用OrgId匹配，只查指定机关/网格的党员年龄分布。
|
5 years ago |
|
yinzuomei
|
0331afc203
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
43de268037
|
去除引用
|
5 years ago |
|
jianjun
|
de4c426f12
|
错误错误
|
5 years ago |
|
yinzuomei
|
ee4a6ecb0c
|
区直部门总分计算
|
5 years ago |
|
wxz
|
c426ba5b08
|
异步计算，根据客户加锁，同一个客户同时只能有一个线程执行计算。
|
5 years ago |
|
jianjun
|
051266d9eb
|
部署statis
|
5 years ago |
|
jianjun
|
81f3c0a289
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
bef5639124
|
开发环境 改回原来的内存设置参数 便于测试
|
5 years ago |
|
zhangyongzhangyong
|
c17af78d83
|
孔村大屏api，代码生成
|
5 years ago |
|
yinzuomei
|
8aa9bb21d7
|
孔村大屏采集修改
|
5 years ago |
|
jianjun
|
e9eb500323
|
阈值保存 %号前面的数字；党员总分的pid为0
|
5 years ago |
|
zhangyongzhangyong
|
32bad925e2
|
孔村-数据采集 接口，测试完毕
|
5 years ago |
|
yinzuomei
|
386dfc6b6c
|
网格相关allParentIndexCode=0
|
5 years ago |
|
yinzuomei
|
5f7f8baee1
|
去掉isTotal
|
5 years ago |
|
yinzuomei
|
62499b4cfd
|
deleteByDeptIdAndMonthId修改
|
5 years ago |
