得到的

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -75,6 +75,11 @@ public class BusinessConstant {
      */
     public static final String OPEN_WELL = "开井";
 
+    /**
+     * 停井
+     */
+    public static final String CLOSE_WELL = "停井";
+
     /**
      * 井口
      */

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java

@@ -2646,7 +2646,7 @@ public class SpaceOptimizeBaseService {
         );
         if (CollUtil.isEmpty(durationList)) {
             //没有设置时间段,无法优化
-            return new HashMap<>(0);
+            return Collections.emptyMap();
         }
         return durationList.stream()
                 .collect(
@@ -2690,7 +2690,7 @@ public class SpaceOptimizeBaseService {
         List<DynamicQueryBasePowerLineStorageViewOutput> list = result.getResult();
         Map<String, List<DynamicQueryBasePowerLineStorageViewOutput>> collect;
         if (CollUtil.isEmpty(list)) {
-            collect = new HashMap<>(0);
+            collect = Collections.emptyMap();
         } else {
             collect = list.stream()
                     .collect(Collectors.groupingBy(DynamicQueryBasePowerLineStorageViewOutput::getLineId));
@@ -2715,7 +2715,7 @@ public class SpaceOptimizeBaseService {
         List<DynamicQueryBasePowerLineStorageOutput> list = result.getResult();
         Map<String, List<String>> collect;
         if (CollUtil.isEmpty(list)) {
-            collect = new HashMap<>(0);
+            collect = Collections.emptyMap();
         } else {
             collect = list.stream()
                     .collect(

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

@@ -1625,7 +1625,7 @@ public class EnergyConsumptionAnalysisService {
                     }
                 } else {
                     nextOpen = BigDecimal.ZERO;
-                    currentWellStatus = "停井";
+                    currentWellStatus = BusinessConstant.CLOSE_WELL;
                     if (!CharSequenceUtil.equals(currentWellStatus, input.getWellStatus())) {
                         continue;
                     }

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

@@ -178,7 +178,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
             case BusinessConstant.ENV_CQ:
                 String resultStr = ServiceUtil.doPostFormCq(context,
                         ThirdPartyApiConstant.CQ_WELL_STATION_PV_DATA,
-                        new HashMap<>(0));
+                        Collections.emptyMap());
                 context.getLogger().info("*** CQ_WELL_STATION_PV_DATA : {}", resultStr);
                 outputs = JSON.parseArray(resultStr, GetThirdActivePowerViewOutput.class);
                 break;
@@ -287,7 +287,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
             case BusinessConstant.ENV_CQ:
                 String resultStr = ServiceUtil.doPostFormCq(context,
                         ThirdPartyApiConstant.CQ_WELL_REAL_PV_DATA,
-                        new HashMap<>(0));
+                        Collections.emptyMap());
                 context.getLogger().info("*** CQ_WELL_REAL_PV_DATA : {}", resultStr);
                 outputs = JSON.parseArray(resultStr, GetThirdCurrentWellConditionViewOutput.class);
                 break;
@@ -302,7 +302,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         BigDecimal cumulativeProduction;
         List<ThirdCurrentWellConditionView> dtoList = new ArrayList<>(outputs.size());
         for (GetThirdCurrentWellConditionViewOutput o : outputs) {
-            cumulativeProduction = Optional.ofNullable(o.getCumulativeProduction()).orElse(BigDecimal.ZERO);
+            cumulativeProduction = ObjectUtil.defaultIfNull(o.getCumulativeProduction(), BigDecimal.ZERO);
             cumulativeProduction = cumulativeProduction.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : cumulativeProduction;
             dtoList.add(
                     ThirdCurrentWellConditionView.builder()
@@ -310,7 +310,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .systemSource(oilFieldCode)
                             .wellNumber(o.getWellNumber())
                             .nextTime(o.getNextTime())
-                            .wellStatus(Optional.ofNullable(o.getWellStatus()).orElse("停井"))
+                            .wellStatus(ObjectUtil.defaultIfNull(o.getWellStatus(), BusinessConstant.CLOSE_WELL))
                             .cumulativeProduction(cumulativeProduction)
                             .runningTime(o.getRunningTime())
                             .updateTime(date)
@@ -516,7 +516,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
             case BusinessConstant.ENV_CQ:
                 String resultStr = ServiceUtil.doPostFormCq(context,
                         ThirdPartyApiConstant.CQ_GROUP_REAL_PV_DATA,
-                        new HashMap<>(0));
+                        Collections.emptyMap());
                 context.getLogger().info("*** CQ_GROUP_REAL_PV_DATA : {}", resultStr);
                 outputs = JSON.parseArray(resultStr, GetCumulativePowerGenerationOutput.class);
                 break;
@@ -657,7 +657,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
             case BusinessConstant.ENV_CQ:
                 String resultStr = ServiceUtil.doPostFormCq(context,
                         ThirdPartyApiConstant.CQ_AVG_ACTIVE_POWER,
-                        new HashMap<>(0));
+                        Collections.emptyMap());
                 context.getLogger().info("*** CQ_AVG_ACTIVE_POWER : {}", resultStr);
                 outputs = JSON.parseArray(resultStr, GetThirdWellAvgActivePowerOutput.class);
                 break;