Commit b009e6b0 authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7b18d7a9
...@@ -82,9 +82,6 @@ public class LoginService { ...@@ -82,9 +82,6 @@ public class LoginService {
sysUserOrganizationRelEnt = new SysUserOrganizationRelEnt(); sysUserOrganizationRelEnt = new SysUserOrganizationRelEnt();
sysUserOrganizationRelEnt.setOuId("1"); sysUserOrganizationRelEnt.setOuId("1");
} }
long getOrgTime = System.currentTimeMillis();
long getOrgTimec = getTime - getOrgTime;
System.out.println("获取登录人组织机构信息:--------------------------上一步时间差--" + getOrgTimec + "------当前时间-" + getOrgTime);
XApiCookieConf apiCookieConf = XConfManager.getConf(XApiCookieConf.class); XApiCookieConf apiCookieConf = XConfManager.getConf(XApiCookieConf.class);
Integer expiresIn = apiCookieConf.getExpires(); Integer expiresIn = apiCookieConf.getExpires();
String userName = sysUserEnt.getUserName(); //姓名 String userName = sysUserEnt.getUserName(); //姓名
...@@ -233,7 +230,6 @@ public class LoginService { ...@@ -233,7 +230,6 @@ public class LoginService {
throw new XServiceException(1000, "用户名或密码错误,还剩" + (5 - count) + "次机会"); throw new XServiceException(1000, "用户名或密码错误,还剩" + (5 - count) + "次机会");
} }
if (StringUtils.isNotBlank(password)) { if (StringUtils.isNotBlank(password)) {
//password = MD5Util.encryptPassword(AESUtil.decrypt(password));
String decrypt = sysUserEnt.getPassword(); String decrypt = sysUserEnt.getPassword();
if (!password.equals(decrypt)) { if (!password.equals(decrypt)) {
insertError(context, loginName); insertError(context, loginName);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment