wxz
|
c8fffee6c3
|
重构认证-初步完成重构内部应用认证，待验证
|
5 years ago |
|
wxz
|
f63d437461
|
内部应用注解认证修改
|
5 years ago |
|
wxz
|
5c6929a51c
|
Merge remote-tracking branch 'origin/dev' into dev_externalappauth
# Conflicts:
# epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
wxz
|
2b988de560
|
增加内部应用认证注解
|
5 years ago |
jianjun
|
f780bff48d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
sunyuchao
|
a9b6110f32
|
暂时屏蔽extjson中添加customerName
|
5 years ago |
|
sunyuchao
|
a1c121afe3
|
孔村大屏接口返参调整 注释调整
|
5 years ago |
|
jianjun
|
12e721b9fe
|
修改错误
|
5 years ago |
|
sunyuchao
|
274221b45d
|
开启PC端登陆验证码校验、third库code_ext表添加主键
|
5 years ago |
|
jianjun
|
846bd0469d
|
添加日志
|
5 years ago |
|
jianjun
|
ceca855441
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_screen_data
|
5 years ago |
|
jianjun
|
2ee27b352a
|
添加查询库户下网格指标排行接口
|
5 years ago |
|
sunyuchao
|
043853cb89
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
sunyuchao
|
928b3290f6
|
Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform
|
5 years ago |
|
wxz
|
9c57792f98
|
将app.jar改成gov-project.jar
|
5 years ago |
zhaoqifeng
|
02adfc0e8b
|
Ext_Json修改
|
5 years ago |
|
jianjun
|
5ea0bb4317
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
4fff0c0180
|
如果最大值最小值一致 则使用反正切函数计算分数;2:修改计算校验
|
5 years ago |
|
wxz
|
88fccb65fd
|
去掉错误提交的Feignclient
|
5 years ago |
|
wxz
|
70cba3bff2
|
修改kcscreen白名单
|
5 years ago |
|
wxz
|
2af96ddbc1
|
修改：增加部分接口的分页
修改：调整部分接口的排序
|
5 years ago |
|
wxz
|
3fb974787f
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
cbae166d00
|
孔村大屏接口开发完成
|
5 years ago |
|
jianjun
|
9063c10aa6
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
86dd1e7afb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
a84eed60c4
|
部署report，stits
|
5 years ago |
zxc
|
8df3145445
|
三大能力求和四舍五入
|
5 years ago |
|
jianjun
|
3db9af315b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
zxc
|
b4f7add54c
|
sql补漏
|
5 years ago |
|
jianjun
|
e487bc7a9c
|
部署report，stits
|
5 years ago |
|
jianjun
|
3afa01dbfa
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
cd217f2030
|
平均值的 不需要 再次归一计算了 只需要乘以权重
|
5 years ago |
|
zxc
|
c42e3b2377
|
小数修改
|
5 years ago |
|
jianjun
|
823c3570f0
|
下级组织/部门指数排行 去掉 部门的数据
|
5 years ago |
|
sunyuchao
|
3cb4d7e6e0
|
孔村大屏接口自测问题修改
|
5 years ago |
|
jianjun
|
d2f935e77d
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
098c4d0e2e
|
没有总分
|
5 years ago |
|
jianjun
|
aa1b78bd9a
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
81ac10db52
|
修改错误
|
5 years ago |
|
jianjun
|
c79b746970
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
wxz
|
c77b0495d9
|
补充合并丢失的@Autowired
|
5 years ago |
|
wxz
|
5ab01b2488
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
Conflicts:
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
|
5 years ago |
|
wxz
|
aee7e9e134
|
孔村大屏-项目-还剩最后一个接口
|
5 years ago |
|
jianjun
|
acd509fe24
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
cce73f07e5
|
修改错误
|
5 years ago |
|
jianjun
|
92f957c01b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
4d77a18708
|
修改错误
|
5 years ago |
|
jianjun
|
0e5981c4f6
|
修改错误
|
5 years ago |
|
jianjun
|
4d87c792b0
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
d1226a2d4b
|
修改错误
|
5 years ago |
