feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -47,7 +47,7 @@ public class BaseUtils {
         return Stream.iterate(0, n -> n + 1)
                 .limit(countStep(list.size()))
                 .parallel()
-                .map(a -> list.stream().skip(a * BaseUtils.BATCH_SIZE)
+                .map(a -> list.stream().skip((long) a * BaseUtils.BATCH_SIZE)
                         .limit(BATCH_SIZE).parallel()
                         .collect(Collectors.toList()))
                 .collect(Collectors.toList());
@@ -126,12 +126,7 @@ public class BaseUtils {
      * @return {@link String}
      */
     public static String getExecutionCycleForWeek(DateTime date) {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(date.year())
-                .append("年第")
-                .append(date.weekOfYear())
-                .append('周');
-        return stringBuilder.toString();
+        return date.year() + "年第" + date.weekOfYear() + '周';
     }
 
     /**
@@ -142,10 +137,7 @@ public class BaseUtils {
      * @return {@link String}
      */
     public static String getExecutionCycleForCalibration(Date date, int offset) {
-        String stringBuilder = DateUtil.format(date, BusinessConstant.DATE_FORMAT_DAY_C) +
-                '-' +
-                DateUtil.format(DateUtil.offsetDay(date, offset - 1), BusinessConstant.DATE_FORMAT_DAY_C);
-        return stringBuilder;
+        return DateUtil.format(date, BusinessConstant.DATE_FORMAT_DAY_C) + '-' + DateUtil.format(DateUtil.offsetDay(date, offset - 1), BusinessConstant.DATE_FORMAT_DAY_C);
     }
 
     /**
@@ -156,10 +148,7 @@ public class BaseUtils {
      * @return {@link String}
      */
     public static String getExecutionCycleForCalibration(Date startDate, Date endDate) {
-        String stringBuilder = DateUtil.format(startDate, BusinessConstant.DATE_FORMAT_DAY_C) +
-                '-' +
-                DateUtil.format(endDate, BusinessConstant.DATE_FORMAT_DAY_C);
-        return stringBuilder;
+        return DateUtil.format(startDate, BusinessConstant.DATE_FORMAT_DAY_C) + '-' + DateUtil.format(endDate, BusinessConstant.DATE_FORMAT_DAY_C);
     }
 
     /**