Skip to content

G
gf_back
Commit 85ac7238 authored by ZWT's avatar ZWT
Browse files
Options

feat(零碳): 长庆 

1.修改极短期间开预测定时任务逻辑,解决优化后部分优化结果时间段过短问题;
2.修改心知天气气象数据获取及接收定时任务,解决天气数据通过邮件下载后,部分数据精度丢失问题;
3.修改首页各个接口逻辑,对小数类型字段进行处理,修改首页接口,增加小时保留两位四舍五入逻辑,同时解决线路详情接口部分查询逻辑报错问题;
4.能耗分析模块,能耗概览接口修改,修改查询逻辑,修改数据获取逻辑及绿电占比计算逻辑;
5.能耗分析模块,消纳曲线用电趋势接口修改,修改查询逻辑,修改数据获取逻辑及绿电占比计算逻辑;
6.能耗分析模块,用电详情接口修改,修改查询逻辑,修改数据获取逻辑及绿电占比计算逻辑;
7.修改首页先导实验井间开制度模块接口查询逻辑,解决极短期间开优化修改后没有第一次开井时间标识导致数据查询不出来问题;
8.基础间开制度新增修改接口逻辑修改,删除防冻堵对井口处理逻辑;
9.极短期间开优化算法修改,增加防冻堵井开井时间优化逻辑;
10.提供长庆通过日期获取当日间开优化结果接口开发,完成接口冒烟测试并添加线上接口文档;
11.提供长庆1天光伏出力预测结果接口开发,完成接口冒烟测试并添加线上接口文档;
12.提供长庆15天光伏出力预测结果接口开发,完成接口冒烟测试并添加线上接口文档;
13.修改极短期间开优化算法,优化防冻堵策略;
14.开发第三方历史天气导入功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a35cd9c4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 26 deletions
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserService.java
View file @ 85ac7238
......@@ -131,7 +131,6 @@ public class SysUserService {
//新增用户和组织机构关系表
public XServiceResult insertSysUserOrganizationRel(XContext context, String uuid, String ouId, PpsUserSession session) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysUserOrganizationRelMapper sorMapper = context.getBean(SysUserOrganizationRelMapper.class);
SysUserOrganizationRelEnt relEnt = new SysUserOrganizationRelEnt();
......@@ -153,18 +152,14 @@ public class SysUserService {
}
relEnt.setCreateTime(date);
sorMapper.insert(relEnt);
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
}
@XText("修改用户信息")
@XApiPost
public XServiceResult updateSysUser(XContext context, UpdateSysUserInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysUserMapper mapper = context.getBean(SysUserMapper.class);
QueryWrapper<SysUserEnt> queryWrapper = new QueryWrapper<>();
......@@ -181,7 +176,6 @@ public class SysUserService {
|| (isExit.size() == 1 && !isExit.get(0).getId().equals(input.getId())))) {
return XServiceResult.error(993, "登录账户已存在！");
}
//查询是否存在有相同的Iam登录名，如果存在，提示错误信息
if (XStringUtils.isNotEmpty(input.getIamLoginName())) {
queryWrapper.clear();
......@@ -220,11 +214,8 @@ public class SysUserService {
entity.setEmail(null);
}
mapper.updateById(entity);
//修改用户和组织机构关系为失效
updateSysUserOrganizationRel(context, input.getId(), input.getOuId(), session, "update");
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -260,7 +251,6 @@ public class SysUserService {
}
public XServiceResult updateSysUserOrganizationRel(XContext context, String userId, String ouId, PpsUserSession session, String flag) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
//修改用户和组织机构关系为失效
SysUserOrganizationRelMapper relMapper = context.getBean(SysUserOrganizationRelMapper.class);
......@@ -296,8 +286,6 @@ public class SysUserService {
relEntity.setModifyTime(date);
relMapper.updateById(relEntity);
}
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -306,9 +294,7 @@ public class SysUserService {
@XText("删除用户")
@XApiPost
public XServiceResult deleteSysUser(XContext context, DeleteSysUserInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysUserMapper mapper = context.getBean(SysUserMapper.class);
QueryWrapper<SysUserEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysUserEnt::getId, input.getId());
......@@ -319,8 +305,6 @@ public class SysUserService {
mapper.deleteById(entity);
//修改用户和组织机构表为失效
updateSysUserOrganizationRel(context, input.getId(), null, context.getSession(PpsUserSession.class), "delete");
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -456,7 +440,7 @@ public class SysUserService {
if (StringUtils.isBlank(userParam)) {
return XListResult.error(context, LoginError.Trade_ParamIsNull);
}
String userInfo = null;
String userInfo;
try {
String privateKey = LoginConfig.rsaPrivateKey.findValue(context);
privateKey = XEncryptUtils.decrypt(privateKey);
......@@ -475,7 +459,6 @@ public class SysUserService {
context.getLogger().error("参数格式有误", e);
return XListResult.error(context, LoginError.Trade_ParamFormatError);
}
SysUserViewMapper mapper = context.getBean(SysUserViewMapper.class);
SysUserView userView = new SysUserView();
userView.setUserName(tradeUserInfo.getUserName());
......@@ -491,7 +474,7 @@ public class SysUserService {
if (StringUtils.isBlank(userParam)) {
return XSingleResult.error(context, LoginError.Trade_ParamIsNull);
}
String userInfo = null;
String userInfo;
try {
String privateKey = LoginConfig.rsaPrivateKey.findValue(context);
privateKey = XEncryptUtils.decrypt(privateKey);
......@@ -510,7 +493,6 @@ public class SysUserService {
context.getLogger().error("参数格式有误", e);
return XSingleResult.error(context, LoginError.Trade_ParamFormatError);
}
SysUserMapper mapper = context.getBean(SysUserMapper.class);
QueryWrapper<SysUserEnt> wrapper = new QueryWrapper();
wrapper.lambda().eq(SysUserEnt::getLoginName, tradeUserInfo.getUserName())
......@@ -560,8 +542,7 @@ public class SysUserService {
GetSysUserListByOuInput record = new GetSysUserListByOuInput();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<SysUserView> list = new ArrayList<>();
List<SysUserView> list;
list = mapper.getSysUserListByOuIdOrUserName(record);
list.forEach(user -> {
String phone = user.getPhone();
......@@ -571,8 +552,6 @@ public class SysUserService {
PageInfo<SysUserView> pageInfo = new PageInfo<>(list);
List<QuerySysUserListByOuIdorNameOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserListByOuIdorNameOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
/**
......@@ -587,14 +566,12 @@ public class SysUserService {
XUser user = context.getUser();
String code = user.getCode();
SysUserViewMapper mapper = context.getBean(SysUserViewMapper.class);
CurrentSysUserView sysUserView = mapper.getSysUserAndOuByUserId(code);
CurrentSysUserOutput output = new CurrentSysUserOutput();
XCopyUtils.copyObject(sysUserView, output);
// output.setPhone(UserInfoUtil.desensitization(entity.getPhone()));
// output.setIdentifyNo(UserInfoUtil.desensitization(entity.getIdentifyNo()));
output.setEmail(UserInfoUtil.desensitization(output.getEmail()));
return XSingleResult.success(output);
}
}
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