feat[零碳项目]: 松原演示

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
5.修改第三方当日油井状态定时任务,修改代码逻辑,增加区分来源系统逻辑;
6.修改第三方井场日累计数据定时任务,修改代码逻辑,增加区分来源系统逻辑;
7.修改第三方光伏日发电量定时任务,修改代码逻辑,增加区分来源系统逻辑;
8.修改第三井平均有功功率作业定时任务,修改代码逻辑,增加区分来源系统逻辑;
9.修改日耗电日产液信息定时任务,修改代码逻辑,增加区分来源系统逻辑;
10.修改查15分钟电站实际功率接口,修改代码逻辑,增加区分来源系统逻辑;
]

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

@@ -4,12 +4,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
-import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
-import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
-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.utils.BaseUtils;
 import pps.core.prediction.entity.PlantPredictedPowerDataEnt;
@@ -17,13 +11,11 @@ import pps.core.prediction.entity.PlantPredictedPowerLongTermDataEnt;
 import pps.core.prediction.mapper.PlantPredictedPowerDataMapper;
 import pps.core.prediction.mapper.PlantPredictedPowerLongTermDataMapper;
 import xstartup.base.XContext;
-import xstartup.data.XListResult;
 
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 统计分析基类
@@ -97,38 +89,6 @@ public class StatisticAnalysisBaseService {
         return powerGenerationList;
     }
 
-    /**
-     * 获取所有path包含组织ID的组织
-     *
-     * @param context 上下文
-     * @param ouId    ou id
-     * @return {@link List}<{@link String}>
-     */
-    public List<String> 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().stream()
-                .map(GetSysOrganizationViewOutput::getId)
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * 获取光伏发电厂
-     *
-     * @param context 上下文
-     * @param input   输入
-     * @return {@link List}<{@link GetBasePhotovoltaicPlantCloudOutput}>
-     */
-    public List<GetBasePhotovoltaicPlantCloudOutput> getPhotovoltaicPlantByParam(XContext context, GetBasePhotovoltaicPlantCloudInput input) {
-        BasePhotovoltaicPlantCloudService cloudService = context.getBean(BasePhotovoltaicPlantCloudService.class);
-        XListResult<GetBasePhotovoltaicPlantCloudOutput> result = cloudService.getBasePhotovoltaicPlantList(context, input);
-        result.throwIfFail();
-        return result.getResult();
-    }
-
     /*-----------------------------------private-----------------------------------*/
 
     /**