feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -349,10 +349,19 @@ public class SpaceOptimizeBaseService {
                     .sorted(Comparator.comparing(SpaceInstitutionWellheadView::getStartSeq))
                     .collect(
                             Collectors.partitioningBy(w ->
-                                    //待优化井口:小间开,间抽井,(最小开井时间!=每日运行时间)
+                                    /*
+                                    待优化井口:
+                                        小间开,间抽井,
+                                        最小开井时间<=每日运行时间,
+                                        运行时长>=单次最高开井时长>=单次最低开井时长,
+                                        单次最低开井时长+单次最低关井时长<=24
+                                    */
                                     CharSequenceUtil.equals(BusinessConstant.INTERVAL_PUMPING_WELL, w.getRunTypeKey()) &&
                                             CharSequenceUtil.equals("0", w.getIntervalTypeKey()) &&
-                                            w.getRunDuration().compareTo(w.getMinOpen()) >= 0
+                                            w.getRunDuration().compareTo(w.getMinOpen()) >= 0 &&
+                                            w.getRunDuration().compareTo(w.getMaxOpen()) >= 0 &&
+                                            w.getMaxOpen().compareTo(w.getMinOpen()) >= 0 &&
+                                            BusinessConstant.BIG_DECIMAL_24.compareTo(w.getMinOpen().add(w.getMinClose())) >= 0
                             )
                     );
             //取待优化井口并遍历