feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -40,6 +40,7 @@ public class BasePhotovoltaicPlantCloudServiceImpl implements BasePhotovoltaicPl
         String ouId = input.getOuId();
         List<String> plantIds = input.getPlantIds();
         String stationName = input.getStationName();
+        List<String> ouIds = input.getOuIds();
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         List<BasePhotovoltaicPlantEnt> list = mapper.selectList(new LambdaQueryWrapper<BasePhotovoltaicPlantEnt>()
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
@@ -47,6 +48,7 @@ public class BasePhotovoltaicPlantCloudServiceImpl implements BasePhotovoltaicPl
                 .eq(CharSequenceUtil.isNotBlank(ouId), BasePhotovoltaicPlantEnt::getOuId, ouId)
                 .eq(CharSequenceUtil.isNotBlank(stationName), BasePhotovoltaicPlantEnt::getStationName, stationName)
                 .in(CollUtil.isNotEmpty(plantIds), BaseModel::getId, plantIds)
+                .in(CollUtil.isNotEmpty(ouIds), BasePhotovoltaicPlantEnt::getOuId, ouIds)
                 .orderByDesc(BaseModel::getModifyTime)
         );
         List<GetBasePhotovoltaicPlantCloudOutput> outPuts = XCopyUtils.copyNewList(list, GetBasePhotovoltaicPlantCloudOutput.class);

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

@@ -151,13 +151,20 @@ public class HomePageService {
                             storagePower = new BigDecimal("852.96");
                     }
                 }
-                plantList = this.getPlantList(context, stationId, null);
+                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, stationId, null);
+                plantList = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
+                        .ouIds(ServiceUtil.getOrgIdsByPath(context, stationId))
+                        .build());
                 List<DynamicQueryBaseEnergyStorageDeviceOutput> storageList = this.getStorageList(context, stationId);
                 photovoltaicPower = plantList.stream()
                         .map(GetBasePhotovoltaicPlantCloudOutput::getTotalPower)
@@ -960,6 +967,20 @@ public class HomePageService {
         return result.getResult();
     }
 
+    /**
+     * 光伏电站列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List }<{@link GetBasePhotovoltaicPlantCloudOutput }>
+     */
+    private List<GetBasePhotovoltaicPlantCloudOutput> getPlantList(XContext context, GetBasePhotovoltaicPlantCloudInput input) {
+        BasePhotovoltaicPlantCloudService service = context.getBean(BasePhotovoltaicPlantCloudService.class);
+        XListResult<GetBasePhotovoltaicPlantCloudOutput> result = service.getBasePhotovoltaicPlantList(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /**
      * 输电线路列表
      *