feat(吉林演示): 松原

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;
4.排查并修复天气数据获取服务,数据处理后入库缺少数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -1491,21 +1491,32 @@ public class EnergyConsumptionAnalysisService {
      * @return {@link XListResult }<{@link GetRealTimeInfoOutput }>
      */
     @XText("井组监控--井口实时信息")
-    @XApiGet
+    @XApiPost
     public XListResult<GetRealTimeInfoOutput> wellRealTimeInfo(XContext context, GetEnergyConsumptionAnalysisInput input) {
         List<GetRealTimeInfoOutput> currentList = Collections.emptyList();
-        List<DynamicQueryBaseWellheadOutput> wellList = ServiceUtil.getBaseWellheadList(context, DynamicQueryBaseWellheadInput.builder()
-                .ouIds(ServiceUtil.getOrgIdsByPath(context, input.getOuId()))
-                .runTypeKey(input.getRunTypeKey())
-                .build());
-        if (CollUtil.isNotEmpty(wellList)) {
+        //查电站关联井口
+        DynamicQueryBasePowerLineWellheadInput param = new DynamicQueryBasePowerLineWellheadInput();
+        param.setRunTypeKey(input.getRunTypeKey());
+        DynamicQueryBasePowerLineInput lineParam = new DynamicQueryBasePowerLineInput();
+        if (CharSequenceUtil.isNotBlank(input.getStationName())) {
+            //用stationName匹配电站
+            param.setLineName(input.getStationName());
+            lineParam.setLineNames(CollUtil.list(false, input.getStationName()));
+        } else {
+            List<String> orgIdsByPath = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
+            param.setOuIds(orgIdsByPath);
+            lineParam.setOuIdList(orgIdsByPath);
+        }
+        List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList = ServiceUtil.getPowerLineWellheadList(context, param);
+        if (CollUtil.isNotEmpty(wellheadList)) {
             String wellStatus = input.getWellStatus();
-            Map<String, DynamicQueryBaseWellheadOutput> collect = new HashMap<>(wellList.size());
-            List<String> wellIds = new ArrayList<>(wellList.size());
-            for (DynamicQueryBaseWellheadOutput well : wellList) {
+            Map<String, DynamicQueryBasePowerLineWellheadViewOutput> collect = new HashMap<>(wellheadList.size());
+            List<String> wellIds = new ArrayList<>(wellheadList.size());
+            for (DynamicQueryBasePowerLineWellheadViewOutput well : wellheadList) {
                 collect.put(well.getWellNumber(), well);
-                wellIds.add(well.getId());
+                wellIds.add(well.getWellheadId());
             }
+            //查井口运行状态
             ThirdCurrentWellConditionMapper mapper = context.getBean(ThirdCurrentWellConditionMapper.class);
             List<ThirdCurrentWellConditionEnt> list = mapper.selectList(new LambdaQueryWrapper<ThirdCurrentWellConditionEnt>()
                     .in(ThirdCurrentWellConditionEnt::getWellNumber, collect.keySet())
@@ -1539,7 +1550,6 @@ public class EnergyConsumptionAnalysisService {
                     } else {
                         nextOpen = BaseUtils.divide(BigDecimal.valueOf(DateUtil.between(ent.getNextTime(), now, DateUnit.MINUTE)), BusinessConstant.BIG_DECIMAL_60);
                     }
-
                     currentList.add(
                             GetRealTimeInfoOutput.builder()
                                     .wellNumber(ent.getWellNumber())

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetEnergyConsumptionAnalysisInput.java

 package pps.core.prediction.service.data.energy_consumption_analysis;
 
-import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -22,7 +21,6 @@ public class GetEnergyConsumptionAnalysisInput {
     /**
      * 组织机构ID
      */
-    @NotBlank(message = "缺少组织机构ID")
     @XText("组织机构ID")
     private String ouId;