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/entity/EnergyConsumptionAnalysisEnt.java

@@ -49,4 +49,8 @@ public class EnergyConsumptionAnalysisEnt implements Serializable {
     @XText("日期")
     @TableField
     private Date dataDate;
+
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
 }

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

@@ -386,7 +386,7 @@ public class EnergyConsumptionAnalysisService {
         //井场额定功率
         BigDecimal operatingLoad = BigDecimal.ZERO;
         //开井数量
-        Integer openWellNumber;
+        int openWellNumber;
         //日累计产液量(m³)
         BigDecimal dailyLiquidProduction;
         //日累计用电量(KW·h)
@@ -403,7 +403,7 @@ public class EnergyConsumptionAnalysisService {
                 .build());
         Set<String> plantSet = new HashSet<>(plantList.size());
         for (DynamicQueryBasePowerLinePlantViewOutput plant : plantList) {
-            photovoltaicPower.add(plant.getTotalPower());
+            photovoltaicPower = photovoltaicPower.add(plant.getTotalPower());
             plantSet.add(plant.getStationName());
         }
         DateTime today = DateUtil.beginOfDay(DateUtil.date());
@@ -438,7 +438,7 @@ public class EnergyConsumptionAnalysisService {
                 .build());
         Set<String> wellSet = new HashSet<>(wellheadList.size());
         for (DynamicQueryBasePowerLineWellheadViewOutput well : wellheadList) {
-            operatingLoad.add(well.getRatedPower());
+            operatingLoad = operatingLoad.add(well.getRatedPower());
             wellSet.add(well.getWellNumber());
         }
         //用电功率
@@ -640,7 +640,7 @@ public class EnergyConsumptionAnalysisService {
         for (int i = 0; i < 24; i++) {
             String value = String.valueOf(i);
             predictPower = shortMap.getOrDefault(value, BigDecimal.ZERO);
-            actualPower = powerMap.getOrDefault(value, BigDecimal.ZERO);
+            actualPower = powerMap.getOrDefault(i, BigDecimal.ZERO);
             outputs.add(
                     GetPredictedPowerContrastOutput.builder()
                             .hourNumber(i)

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

@@ -215,6 +215,7 @@ public class HomePageService {
                                 "IFNULL( ROUND( SUM( daily_liquid_production ), 2 ), 0 ) AS daily_liquid_production")
                         .lambda()
                         .eq(ThirdDailyAccumulationUpdateEnt::getSaveDate, beginOfDay)
+                        .eq(ThirdDailyAccumulationUpdateEnt::getSystemSource, oilFieldCode)
                         .in(ThirdDailyAccumulationUpdateEnt::getStationName, set)
                 );
                 if (ObjectUtil.isNotNull(ent)) {
@@ -436,6 +437,8 @@ public class HomePageService {
         List<GetStationPowerConsumption> stationList;
         BigDecimal powerConsumption = BigDecimal.ZERO;
         EnergyConsumptionAnalysisMapper mapper = context.getBean(EnergyConsumptionAnalysisMapper.class);
+        //当前配置
+        String oilFieldCode = ServiceUtil.getOilFieldCode(context);
         if (CharSequenceUtil.isBlank(stationId)) {
             stationId = context.getSession(PpsUserSession.class).getOuId();
             Map<String, String> collect = ServiceUtil.getOrgIdsByPath(context, GetAllOuListByOuIdInput.builder()
@@ -455,6 +458,7 @@ public class HomePageService {
                         .lambda()
                         .in(EnergyConsumptionAnalysisEnt::getStationName, lineNameList)
                         .eq(EnergyConsumptionAnalysisEnt::getDataDate, startTime)
+                        .eq(EnergyConsumptionAnalysisEnt::getSystemSource, oilFieldCode)
                 );
                 stationList.add(GetStationPowerConsumption.builder()
                         .stationName(collect.get(entry.getKey()))
@@ -472,6 +476,7 @@ public class HomePageService {
                         .lambda()
                         .in(EnergyConsumptionAnalysisEnt::getStationName, lineNameList)
                         .eq(EnergyConsumptionAnalysisEnt::getDataDate, startTime)
+                        .eq(EnergyConsumptionAnalysisEnt::getSystemSource, oilFieldCode)
                         .groupBy(EnergyConsumptionAnalysisEnt::getStationName)
                 );
                 stationList = new ArrayList<>(list.size());

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/EnergyConsumptionAnalysisViewMapper.xml

@@ -8,6 +8,7 @@
         <result column="power_generation" property="powerGeneration" jdbcType="DECIMAL"/>
         <result column="power_consumption" property="powerConsumption" jdbcType="DECIMAL"/>
         <result column="data_date" property="dataDate" jdbcType="DATE"/>
+        <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -16,7 +17,8 @@
     line_id,
     power_generation,
     power_consumption,
-    data_date
+    data_date,
+    system_source
     </sql>
     <select id="selectOne" parameterType="pps.core.prediction.entity.EnergyConsumptionAnalysisView"
             resultMap="BaseResultMap">