feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/provider/impl/PpsUserSessionInjectProviderImpl.java

@@ -46,7 +46,6 @@ import static pps.core.common.constant.BusinessConstant.LOGIN_FLAG_SIMULATE;
 public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider {
     @Override
     public XSingleResult<Object> injectSession(XContext context, XUser user) {
-        //todo:注入session数据
         context.log().info("inject session, userCode:{}", user.getCode());
         SysUserMapper mapper = context.getBean(SysUserMapper.class);
         QueryWrapper<SysUserEnt> queryWrapper = new QueryWrapper<>();
@@ -91,7 +90,7 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
             if (CharSequenceUtil.isBlank(ownerOrg.getOuPath())) {
                 //路径为空 查询
                 SysOrganizationRelMapper bean = context.getBean(SysOrganizationRelMapper.class);
-                QueryWrapper<SysOrganizationRelEnt> qw = new QueryWrapper<SysOrganizationRelEnt>();
+                QueryWrapper<SysOrganizationRelEnt> qw = new QueryWrapper<>();
                 qw.lambda().eq(SysOrganizationRelEnt::getOuId, session.getOwnerOrgId());
                 qw.lambda().le(SysOrganizationRelEnt::getEffectTime, new Date());
                 qw.lambda().ge(SysOrganizationRelEnt::getEndTime, new Date());
@@ -194,10 +193,7 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
             String value = LoginConfig.adminRoles.findValue(context);
             session.setDevops(0);
             if (StringUtils.isNotBlank(value)) {
-                String role = roleList.stream().filter(x -> value.contains(x)).findFirst().orElse(null);
-                if (role != null) {
-                    session.setDevops(1);
-                }
+                roleList.stream().filter(value::contains).findFirst().ifPresent(role -> session.setDevops(1));
             }
         }
 
@@ -213,10 +209,7 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
         String value = LoginConfig.adminRoles.findValue(context);
 
         if (StringUtils.isNotBlank(value)) {
-            String role = roleList.stream().filter(x -> value.contains(x)).findFirst().orElse(null);
-            if (role != null) {
-                session.setIsSuperAdmin(BusinessConstant.ONE);
-            }
+            roleList.stream().filter(value::contains).findFirst().ifPresent(role -> session.setIsSuperAdmin(BusinessConstant.ONE));
         }
 
         return XSingleResult.success(session);