wxz
|
6f07042657
|
Merge branch 'dev_jar_name' into dev
|
5 years ago |
|
wxz
|
f816e0c3ca
|
Merge branch 'dev_jar_name' into dev_screen_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wxz
|
117c54a512
|
修改docker配置文件，将app.jar->xxx.jar
|
5 years ago |
jianjun
|
0b4a7ae413
|
加强判断
|
5 years ago |
|
jianjun
|
a3657d869a
|
修改环境变量
|
5 years ago |
|
wxz
|
62d097893f
|
修改epmet-admin服务的jar名称，由app.jar->epmet-admin.jar
|
5 years ago |
|
jianjun
|
b7d937f966
|
添加指标计算脚本
|
5 years ago |
zhangyongzhangyong
|
eaa4ec544c
|
年表平均值计算逻辑修改
|
5 years ago |
zxc
|
6e1fa0f0a6
|
小数点位数修改 大屏指数查询公用API
|
5 years ago |
|
zhangyongzhangyong
|
fb52eb0ec5
|
安宁指数 返回1位小数
|
5 years ago |
|
zhangyongzhangyong
|
5813c25ea4
|
安宁指数排行，返回2位小数
|
5 years ago |
|
zhangyongzhangyong
|
d8be8c10a4
|
screen_kc_volunteer_heat_rank_grid_daily 表增加字段【积分、志愿者id】
|
5 years ago |
|
wxz
|
88bc86f5fb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
wxz
|
d13bf9c484
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
zxc
|
8cedf69308
|
三大能力分数和修改
|
5 years ago |
|
wxz
|
dae03d771f
|
修改：中止计算，停止计算，示例销毁都会清空redis的计算标记
停止计算和中止计算还要清空futureMap
|
5 years ago |
yinzuomei
|
b87b944fc6
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
7a405702bf
|
注释：客户一级指标分值记录不存在
|
5 years ago |
|
wxz
|
62c17e7c7c
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
6acf962060
|
增加终止计算方法
|
5 years ago |
|
jianjun
|
9040792b81
|
修改rediskey
|
5 years ago |
|
jianjun
|
b3c67750aa
|
党员分批计算总分
|
5 years ago |
wangchao
|
f270088f18
|
data-report log配置添加local环境
|
5 years ago |
|
zhangyongzhangyong
|
abdf683674
|
5、下级部门指数排行（目前安宁数据端用）, 返回值增加 orgId
|
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
|
a600e8919e
|
修改大小
|
5 years ago |
|
wangchao
|
03581bc245
|
subAgencyIndexRank接口添加数据源注解
|
5 years ago |
|
yinzuomei
|
bbbce2d6ce
|
联系群众+参与议事 查询平均值，去掉group by
|
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
|
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 |
|
wxz
|
bff8003588
|
gateway的pom增加了profile的属性
|
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 |
