feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/utils/BaseUtils.java

@@ -26,7 +26,7 @@ import java.util.stream.Stream;
 public class BaseUtils {
 
     /**
-     * 按每800个一组分割
+     * 按每500个一组分割
      */
     public static final Integer BATCH_SIZE = 500;
 

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

@@ -155,11 +155,9 @@ public class BaseLineService {
         //todo 老表逻辑(后期删除):删除/新增预测数据
         this.deletePlantPredictedPowerList(context, oldDeleteList);
         this.insertBatchPlantPredictedPowerList(context, oldBatchList);
-        int size;
         if (CollUtil.isNotEmpty(deleteList)) {
             ThirdWeatherDataMapper dataMapper = context.getBean(ThirdWeatherDataMapper.class);
-            size = deleteList.size();
-            if (size > BaseUtils.BATCH_SIZE) {
+            if (deleteList.size() > BaseUtils.BATCH_SIZE) {
                 List<List<WeatherDeleteCondition>> subList = BaseUtils.getSubList(deleteList);
                 for (List<WeatherDeleteCondition> list : subList) {
                     LambdaQueryWrapper<ThirdWeatherDataEnt> wrapper = new LambdaQueryWrapper<>();
@@ -184,8 +182,7 @@ public class BaseLineService {
         }
         if (CollUtil.isNotEmpty(weatherDataViewList)) {
             ThirdWeatherDataViewMapper dataViewMapper = context.getBean(ThirdWeatherDataViewMapper.class);
-            size = weatherDataViewList.size();
-            if (size > BaseUtils.BATCH_SIZE) {
+            if (weatherDataViewList.size() > BaseUtils.BATCH_SIZE) {
                 List<List<ThirdWeatherDataView>> subList = BaseUtils.getSubList(weatherDataViewList);
                 subList.forEach(dataViewMapper::insertBatch);
             } else {