feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/module/PpsCoreSystemModule.java

@@ -61,7 +61,8 @@ public class PpsCoreSystemModule extends XModule {
         while (size > 0) {
             //根据pid查询所有子字典项
             List<SysDictionaryEnt> sysDictionaryChilds = dictionaryMapper.selectList(new LambdaQueryWrapper<SysDictionaryEnt>()
-                    .in(SysDictionaryEnt::getPid, dictIds).gt(SysDictionaryEnt::getEndTime, DateUtil.date())
+                    .in(SysDictionaryEnt::getPid, dictIds)
+                    .gt(SysDictionaryEnt::getEndTime, DateUtil.date())
             );
             //放入到缓存map中
             for (String aliasObj : dictCashMap.keySet()) {

C02-system/pps-core-system/src/main/java/pps/core/system/mybatis/PpsCoreSystemMybatis.java

@@ -20,4 +20,4 @@ public class PpsCoreSystemMybatis extends XMybatis {
     public GlobalConfig getGlobalConfig() {
         return MybaitisGlobalConfigSuppiler.INSTANCE.get();
     }
-}
+}
\ No newline at end of file

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

@@ -57,4 +57,4 @@ public class PpsPermissionProviderImpl implements XPermissionProvider {
             return XServiceResult.OK;
         }
     }
-}
+}
\ No newline at end of file

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

@@ -42,4 +42,4 @@ public class PpsSsoProviderImpl implements XSsoProvider {
     public XSingleResult<GetTokenResult> getClientCredentialsToken(XContext xContext, GetClientCredentialsTokenParam getClientCredentialsTokenParam) {
         return null;
     }
-}
+}
\ No newline at end of file

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

@@ -3,7 +3,7 @@ package pps.core.system.provider.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.SystemUserRoleRelService;
@@ -46,8 +46,7 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
     public XSingleResult<Object> injectSession(XContext context, XUser user) {
         context.log().info("inject session, userCode:{}", user.getCode());
         SysUserMapper mapper = context.getBean(SysUserMapper.class);
-        SysUserEnt sysUserEnt = mapper.selectOne(new QueryWrapper<SysUserEnt>()
-                .lambda()
+        SysUserEnt sysUserEnt = mapper.selectOne(new LambdaQueryWrapper<SysUserEnt>()
                 .eq(SysUserEnt::getId, user.getCode()));
         PpsUserSession session = new PpsUserSession();
         XCopyUtils.copyObject(sysUserEnt, session);
@@ -85,8 +84,7 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
             if (CharSequenceUtil.isBlank(ownerOrg.getOuPath())) {
                 //路径为空 查询
                 SysOrganizationRelMapper bean = context.getBean(SysOrganizationRelMapper.class);
-                List<SysOrganizationRelEnt> sysOrganizationRelEnts = bean.selectList(new QueryWrapper<SysOrganizationRelEnt>()
-                        .lambda()
+                List<SysOrganizationRelEnt> sysOrganizationRelEnts = bean.selectList(new LambdaQueryWrapper<SysOrganizationRelEnt>()
                         .eq(SysOrganizationRelEnt::getOuId, session.getOwnerOrgId())
                         .le(SysOrganizationRelEnt::getEffectTime, new Date())
                         .ge(SysOrganizationRelEnt::getEndTime, new Date()));
@@ -205,7 +203,7 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
                 CharSequenceUtil.equals(OuLevelConstant.JI_GUAN_KE_SHI.getCode(), org.getOuLevel())) {
             //查找上级机构
             List<String> idPathList = CharSequenceUtil.split(org.getOuPath(), '/');
-            if (idPathList.size() <= 1) {
+            if (CollUtil.isEmpty(idPathList)) {
                 return null;
             } else {
                 //查找上级机构
@@ -224,4 +222,4 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
             return org;
         }
     }
-}
+}
\ No newline at end of file