feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -93,6 +93,11 @@ public class BusinessConstant {
      */
     public static final String NO_OPTIMIZATION_C = "未优化";
 
+    /**
+     * 电站标识
+     */
+    public static final String PLANT_FLAG = "PLANT";
+
     /*------------------------------环境------------------------------*/
 
     /**

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

@@ -318,7 +318,7 @@ public class SysDictionaryService {
                     }).distinct().collect(Collectors.toList());
                     queryWrapper.lambda().in(SysDictionaryEnt::getId, collect);
                 } else {
-                    return XPageResult.success(new ArrayList<>(), 1, 1, 0);
+                    return XPageResult.success(Collections.emptyList(), 1, 1, 0);
                 }
             } else {
                 input.setPage(1);
@@ -455,7 +455,7 @@ public class SysDictionaryService {
                         }).distinct().collect(Collectors.toList());
                         queryWrapper.lambda().in(SysDictionaryEnt::getId, collect);
                     } else {
-                        return XPageResult.success(new ArrayList<>(), 1, 1, 0);
+                        return XPageResult.success(Collections.emptyList(), 1, 1, 0);
                     }
                 } else {
                     input.setPage(1);

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

@@ -132,7 +132,7 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
         List<SysOrganizationEnt> plant = mapper.selectList(new LambdaQueryWrapper<SysOrganizationEnt>()
                 .eq(SysOrganizationEnt::getIsDeleted, BusinessConstant.ONE)
-                .eq(SysOrganizationEnt::getOuLevel, "PLANT")
+                .eq(SysOrganizationEnt::getOuLevel, BusinessConstant.PLANT_FLAG)
                 .orderByAsc(SysOrganizationEnt::getCreateTime)
         );
         return XListResult.success(XCopyUtils.copyNewList(plant, GetSysOrganizationViewOutput.class));

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

@@ -26,7 +26,7 @@ import xstartup.helper.XTransactionHelper;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -314,7 +314,7 @@ public class SysUserService {
             if (input.getShowAll() == null || !input.getShowAll()) {
                 sysOrganizationView.setId(session.getOuId());
                 viewList = organizationViewMapper.selectOuByOuId(sysOrganizationView);
-                if (viewList.isEmpty()) return XPageResult.success(new ArrayList<>(), input, 0);
+                if (viewList.isEmpty()) return XPageResult.success(Collections.emptyList(), input, 0);
                 List<String> ouIds = viewList.stream().map(SysOrganizationView::getId).collect(Collectors.toList());
                 record.setOuIds(ouIds);
             }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortDurationView.java

@@ -11,6 +11,7 @@ import xstartup.annotation.XText;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 极短期间开优化井口制度记录
@@ -97,4 +98,8 @@ public class SpaceOptimizeShortDurationView extends BaseModel implements Seriali
     @XText("开井时长(h)")
     @TableField(exist = false)
     private BigDecimal runDuration;
+
+    @XText("组织ID集合")
+    @TableField(exist = false)
+    private List<String> ouIds;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortPeriodService.java

@@ -8,8 +8,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
+import pps.cloud.system.service.SysOrganizationCloudService;
+import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
+import pps.core.common.session.PpsUserSession;
 import pps.core.space.entity.*;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
@@ -154,11 +158,28 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
     @XApiGet
     @XText("极短期间开优化--先导实验井间开制度")
     public XPageResult<QuerySpaceOptimizeShortWellheadViewOutput> getDailySystemDisplay(XContext context, QuerySpaceOptimizeShortWellheadViewInput input) {
+        String stationId = input.getStationId();
+        if (CharSequenceUtil.isBlank(stationId)) {
+            stationId = context.getSession(PpsUserSession.class).getOuId();
+        }
+        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
+        XListResult<GetSysOrganizationViewOutput> result = organizationCloudService.getAllListByOuId(context, GetAllOuListByOuIdInput.builder()
+                .ouId(stationId)
+                .ouLevel(BusinessConstant.PLANT_FLAG)
+                .build());
+        result.throwIfFail();
+        List<GetSysOrganizationViewOutput> plantList = result.getResult();
+        if (CollUtil.isEmpty(plantList)) {
+            return XPageResult.success(Collections.emptyList(), 1, 1, 0);
+        }
+        List<String> ouIds = plantList.stream()
+                .map(GetSysOrganizationViewOutput::getId)
+                .collect(Collectors.toList());
         SpaceOptimizeShortDurationViewMapper mapper = context.getBean(SpaceOptimizeShortDurationViewMapper.class);
         PageMethod.startPage(input.getPage(), input.getLimit());
         List<SpaceOptimizeShortDurationView> list = mapper.selectDailySystemDisplay(SpaceOptimizeShortDurationView.builder()
                 .queryDate(DateUtil.beginOfDay(DateUtil.date()))
-                .ouId(input.getStationId())
+                .ouIds(ouIds)
                 .build());
         PageInfo<SpaceOptimizeShortDurationView> pageInfo = new PageInfo<>(list);
         return XPageResult.success(XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceOptimizeShortWellheadViewOutput.class),

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceOptimizeShortDurationViewMapper.xml

@@ -107,9 +107,15 @@
         AND d.create_time = #{queryDate}
         AND d.is_deleted = 1
         AND d.is_optimize = 0
-        <if test="ouId != null">
+        <if test="ouId != null and ouId != ''">
             AND w.ou_id = #{ouId}
         </if>
+        <if test="ouIds != null and ouIds.size() > 0 ">
+            AND w.ou_id in
+            <foreach collection="ouIds" separator="," item="item" open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         ) SELECT
         *
         FROM

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java

@@ -28,7 +28,6 @@ import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
 import pps.cloud.space.service.IDailyElectricityTrendCloudService;
 import pps.cloud.space.service.data.line_daily_electricity_trend.GetLineDailyElectricityTrendInput;
 import pps.cloud.space.service.data.line_daily_electricity_trend.GetLineDailyElectricityTrendOutput;
-import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
 import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
@@ -81,7 +80,7 @@ public class HomePageService {
             stationId = context.getSession(PpsUserSession.class).getOuId();
             List<GetSysOrganizationViewOutput> ouList = ServiceUtil.getOrgIdsByPath(context, GetAllOuListByOuIdInput.builder()
                     .ouId(stationId)
-                    .ouLevel("PLANT")
+                    .ouLevel(BusinessConstant.PLANT_FLAG)
                     .build());
             outputs = new ArrayList<>(ouList.size());
             ouList.forEach(item -> {
@@ -441,7 +440,7 @@ public class HomePageService {
             stationId = context.getSession(PpsUserSession.class).getOuId();
             Map<String, String> collect = ServiceUtil.getOrgIdsByPath(context, GetAllOuListByOuIdInput.builder()
                             .ouId(stationId)
-                            .ouLevel("PLANT")
+                            .ouLevel(BusinessConstant.PLANT_FLAG)
                             .build()).stream()
                     .collect(Collectors.toMap(GetSysOrganizationViewOutput::getId, GetSysOrganizationViewOutput::getOuName));
             Map<String, List<DynamicQueryBasePowerLineOutput>> listMap = this.getBasePowerLineListByOuIdList(context, collect.keySet()).stream()
@@ -934,22 +933,6 @@ public class HomePageService {
         return lineList.getResult();
     }
 
-    /**
-     * 获取所有path包含组织ID的组织
-     *
-     * @param context 上下文
-     * @param ouId    ou id
-     * @return {@link List}<{@link GetSysOrganizationViewOutput}>
-     */
-    private List<GetSysOrganizationViewOutput> getOrgIdsByPath(XContext context, String ouId) {
-        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
-        GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput();
-        ouIdInput.setOuId(ouId);
-        XListResult<GetSysOrganizationViewOutput> allListByOuId = organizationCloudService.getAllListByOuId(context, ouIdInput);
-        allListByOuId.throwIfFail();
-        return allListByOuId.getResult();
-    }
-
     /**
      * 获取井口列表
      *