feat(吉林演示): 松原

1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取;
2.修改统计分析-间开效果评价新页面累节电能接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
3.修改统计分析-能耗分析新页面峰谷能耗对比分析接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
4.吉林首页井场用能分析模块开放井场用能分析双坐标轴接口,备用;
5.修改首页光伏实时监控接口,解决选择查看部分采油厂接口报错提示异常问题;
6.修改统计分析能耗分析新页面今日昨日同期电量信息统计接口,增加添加默认值逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_energy_storage_device/DynamicQueryBaseEnergyStorageDeviceInput.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 储能电站
@@ -48,4 +49,7 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
 
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
+
+    @XText("组织ID集合")
+    private List<String> ouIds;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEnergyStorageCloudServiceImpl.java

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.IBaseEnergyStorageCloudService;
@@ -35,10 +36,12 @@ public class BaseEnergyStorageCloudServiceImpl implements IBaseEnergyStorageClou
     @Override
     public XListResult<DynamicQueryBaseEnergyStorageDeviceOutput> queryBaseStorageListByParam(XContext context, DynamicQueryBaseEnergyStorageDeviceInput input) {
         String ouId = input.getOuId();
+        List<String> ouIds = input.getOuIds();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         List<BaseEnergyStorageDeviceEnt> list = mapper.selectList(new LambdaQueryWrapper<BaseEnergyStorageDeviceEnt>()
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .eq(CharSequenceUtil.isNotBlank(ouId), BaseEnergyStorageDeviceEnt::getOuId, ouId)
+                .in(CollUtil.isNotEmpty(ouIds), BaseEnergyStorageDeviceEnt::getOuId, ouId)
         );
         return XListResult.success(XCopyUtils.copyNewList(list, DynamicQueryBaseEnergyStorageDeviceOutput.class));
     }

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

@@ -124,6 +124,16 @@ public class HomePageService {
         List<GetBasePhotovoltaicPlantCloudOutput> plantList;
         BigDecimal photovoltaicPower;
         BigDecimal storagePower;
+        String ouId;
+        if (CharSequenceUtil.isBlank(stationId)) {
+            ouId = context.getSession(PpsUserSession.class).getOuId();
+        } else {
+            ouId = stationId;
+        }
+        List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, ouId);
+        plantList = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
+                .ouIds(ouIds)
+                .build());
         switch (ServiceUtil.getOilFieldCode(context)) {
             case BusinessConstant.ENV_CQ:
                 if (CharSequenceUtil.isBlank(stationId)) {
@@ -151,21 +161,11 @@ public class HomePageService {
                             storagePower = new BigDecimal("852.96");
                     }
                 }
-                if (CharSequenceUtil.isBlank(stationId)) {
-                    stationId = context.getSession(PpsUserSession.class).getOuId();
-                }
-                plantList = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
-                        .ouIds(ServiceUtil.getOrgIdsByPath(context, stationId))
-                        .build());
                 break;
             case BusinessConstant.ENV_SY:
-                if (CharSequenceUtil.isBlank(stationId)) {
-                    stationId = context.getSession(PpsUserSession.class).getOuId();
-                }
-                plantList = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
-                        .ouIds(ServiceUtil.getOrgIdsByPath(context, stationId))
+                List<DynamicQueryBaseEnergyStorageDeviceOutput> storageList = this.getStorageList(context, DynamicQueryBaseEnergyStorageDeviceInput.builder()
+                        .ouIds(ouIds)
                         .build());
-                List<DynamicQueryBaseEnergyStorageDeviceOutput> storageList = this.getStorageList(context, stationId);
                 photovoltaicPower = plantList.stream()
                         .map(GetBasePhotovoltaicPlantCloudOutput::getTotalPower)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -178,8 +178,13 @@ public class HomePageService {
                 photovoltaicPower = BigDecimal.ZERO;
                 storagePower = BigDecimal.ZERO;
         }
-        List<DynamicQueryBaseWellheadOutput> wellList = this.getWellList(context, stationId);
-        List<DynamicQueryBasePowerLineOutput> lineList = this.getLineList(context, stationId, "10", null);
+        List<DynamicQueryBaseWellheadOutput> wellList = this.getWellList(context, DynamicQueryBaseWellheadInput.builder()
+                .ouIds(ouIds)
+                .build());
+        List<DynamicQueryBasePowerLineOutput> lineList = ServiceUtil.getPowerLineList(context, DynamicQueryBasePowerLineInput.builder()
+                .lineTypeKey("10")
+                .ouIdList(ouIds)
+                .build());
         return XSingleResult.success(GetOverviewViewOutput.builder()
                 .wellNumber(wellList.size())
                 .stationNumber(plantList.size())
@@ -949,6 +954,7 @@ public class HomePageService {
         return result.getResult();
     }
 
+
     /**
      * 光伏电站列表
      *
@@ -967,6 +973,20 @@ public class HomePageService {
         return result.getResult();
     }
 
+    /**
+     * 获取井口列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List }<{@link DynamicQueryBaseWellheadOutput }>
+     */
+    private List<DynamicQueryBaseWellheadOutput> getWellList(XContext context, DynamicQueryBaseWellheadInput input) {
+        IBaseWellheadCloudService service = context.getBean(IBaseWellheadCloudService.class);
+        XListResult<DynamicQueryBaseWellheadOutput> result = service.queryBaseWellheadListByParam(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /**
      * 光伏电站列表
      *
@@ -981,6 +1001,20 @@ public class HomePageService {
         return result.getResult();
     }
 
+    /**
+     * 获取储能列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List }<{@link DynamicQueryBaseEnergyStorageDeviceOutput }>
+     */
+    private List<DynamicQueryBaseEnergyStorageDeviceOutput> getStorageList(XContext context, DynamicQueryBaseEnergyStorageDeviceInput input) {
+        IBaseEnergyStorageCloudService service = context.getBean(IBaseEnergyStorageCloudService.class);
+        XListResult<DynamicQueryBaseEnergyStorageDeviceOutput> result = service.queryBaseStorageListByParam(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /**
      * 输电线路列表
      *

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

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
-import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
@@ -518,11 +517,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
      * @return {@link List}<{@link DynamicQueryBasePowerLineOutput}>
      */
     private List<DynamicQueryBasePowerLineOutput> getBasePowerLineListByNames(XContext context, List<String> lineNames) {
-        IBasePowerLineCloudService basePowerLineCloudService = context.getBean(IBasePowerLineCloudService.class);
-        XListResult<DynamicQueryBasePowerLineOutput> lineList = basePowerLineCloudService.getBasePowerLineList(context, DynamicQueryBasePowerLineInput.builder()
+        return ServiceUtil.getPowerLineList(context, DynamicQueryBasePowerLineInput.builder()
                 .lineNames(lineNames)
                 .build());
-        lineList.throwIfFail();
-        return lineList.getResult();
     }
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/utils/ServiceUtil.java

@@ -10,7 +10,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.IConfigOilFieldCloudService;
+import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
+import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
@@ -311,6 +314,20 @@ public class ServiceUtil {
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 获取电源线列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List }<{@link DynamicQueryBasePowerLineOutput }>
+     */
+    public static List<DynamicQueryBasePowerLineOutput> getPowerLineList(XContext context, DynamicQueryBasePowerLineInput input) {
+        IBasePowerLineCloudService lineService = context.getBean(IBasePowerLineCloudService.class);
+        XListResult<DynamicQueryBasePowerLineOutput> result = lineService.getBasePowerLineList(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /*----------------------------------- 私有方法 -----------------------------------*/
 
     /**