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/service/SysOrganizationCloudServiceImpl.java

 package pps.core.system.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.util.CollectionUtils;
@@ -17,6 +18,7 @@ import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -46,7 +48,7 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
                 .ge(SysUserOrganizationRelEnt::getEndTime, new Date());
         List<SysUserOrganizationRelEnt> relEnts = mapper.selectList(wrapper);
         GetSysOrganizationViewOutput output = new GetSysOrganizationViewOutput();
-        if (!CollectionUtils.isEmpty(relEnts)) {
+        if (CollUtil.isNotEmpty(relEnts)) {
             if (XStringUtils.isNotEmpty(relEnts.get(0).getOuId())) {
                 QueryWrapper<SysOrganizationEnt> queryWrapper = new QueryWrapper<>();
                 queryWrapper.lambda().eq(SysOrganizationEnt::getId, relEnts.get(0).getOuId())
@@ -83,7 +85,7 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         view.setIsDeleted(1);
         view.setId(input.getOuId());
         List<SysOrganizationView> list = mapper.selectAllListByOuId(view);
-        if (!list.isEmpty()) {
+        if (CollUtil.isNotEmpty(list)) {
             for (SysOrganizationView item : list) {
                 GetOuListTreeOutput out = new GetOuListTreeOutput();
                 out.setOuId(item.getId());
@@ -98,11 +100,11 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
 
     @XText("根据组织机构id获取所有的子级组织机构")
     public XListResult<GetOuListTreeOutput> getOuListByOuIds(XContext context, GetOuListByOuIdsInput input) {
-        if (CollectionUtils.isEmpty(input.getOuIdList())) return XListResult.success(new ArrayList<>());
+        if (CollUtil.isEmpty(input.getOuIdList())) return XListResult.success(Collections.emptyList());
         List<GetOuListTreeOutput> outputs = new ArrayList<>();
         SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
         List<SysOrganizationView> list = mapper.selectListByOuIds(input.getOuIdList());
-        if (!list.isEmpty()) {
+        if (CollUtil.isNotEmpty(list)) {
             for (SysOrganizationView item : list) {
                 GetOuListTreeOutput out = new GetOuListTreeOutput();
                 out.setOuId(item.getId());

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationService.java

@@ -153,7 +153,7 @@ public class SysOrganizationService {
                 XListResult<QueryBaseStationOutput> viewsResult = stationService.selectStationListByOuId(context, ouIdInput);
                 List<QueryBaseStationOutput> stationViews = viewsResult.getResult();
                 if (CollectionUtils.isEmpty(stationViews)) {
-                    return XListResult.success(new ArrayList<>());
+                    return XListResult.success(Collections.emptyList());
                 }
                 for (QueryBaseStationOutput stationView : stationViews) {
                     SysOrganizationView organizationView = new SysOrganizationView();
@@ -195,7 +195,7 @@ public class SysOrganizationService {
         wrapper.lambda().eq(SysOrganizationEnt::getId, ouId).eq(SysOrganizationEnt::getIsDeleted, BusinessConstant.ONE);
         SysOrganizationEnt ou = bean.selectOne(wrapper);
         if (ou == null) {
-            return XListResult.success(new ArrayList<>());
+            return XListResult.success(Collections.emptyList());
         }
         List<GetSysOrganizationViewOutput> outputs = new ArrayList<>();
         //查询当前用户所属组织机构的上级是有油气调控中心