feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -11,6 +11,7 @@ import pps.core.prediction.entity.ThirdCurrentWellConditionEnt;
 import pps.core.prediction.mapper.ThirdCurrentWellConditionMapper;
 import pps.core.prediction.service.data.third_current_well_condition.QueryThirdCurrentWellConditionInput;
 import pps.core.prediction.service.data.third_current_well_condition.QueryThirdCurrentWellConditionOutput;
+import pps.core.prediction.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -55,11 +56,13 @@ public class ThirdCurrentWellConditionService {
         if (CollUtil.isEmpty(list)) {
             return XListResult.success(Collections.emptyList());
         }
+        String oilFieldCode = ServiceUtil.getOilFieldCode(context);
         ThirdCurrentWellConditionMapper mapper = context.getBean(ThirdCurrentWellConditionMapper.class);
         List<ThirdCurrentWellConditionEnt> selectList = mapper.selectList(new LambdaQueryWrapper<ThirdCurrentWellConditionEnt>()
                 .in(ThirdCurrentWellConditionEnt::getWellNumber, list.stream()
                         .map(DynamicQueryBasePowerLineWellheadViewOutput::getWellNumber)
                         .collect(Collectors.toList()))
+                .eq(ThirdCurrentWellConditionEnt::getSystemSource, oilFieldCode)
         );
         List<QueryThirdCurrentWellConditionOutput> outputList = new ArrayList<>(selectList.size());
         for (ThirdCurrentWellConditionEnt ent : selectList) {