feat(能源管理系统): 测试问题修复

1.修改间开制度管理--长期间开优化模块详情接口,优化已优化时间列表查询逻辑;
2.修改间开制度管理--中短期间开优化模块详情接口,优化已优化时间列表查询逻辑;
3.修改间开制度管理--定期校准模块重新校准接口,增加时间限制,超过优化时间不能优化;
4.修改间开制度管理--长期/中短期间开优化离网型算法,优化数据结构;
5.修改间开制度管理--设为基础制度及重新优化接口,解决部分数据没有默认值导致接口保存失败问题;
6.修改间开制度管理--间开制度详情接口,解决查询出其它井口问题;
7.修改基础信息配置--输电线路配置模块通过线路ID查询线路下井口列表接口,修改排序方式;
8.修改间开制度管理--优化间开优化功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -283,11 +283,20 @@ public class SpaceOptimizeBaseService {
                             }
                         }
                         DynamicQueryPlantPredictedPowerOutput start = avgPowerList.get(firstIndex);
-                        DateTime startTimeOptimize = DateUtil.date(start.getCreateTime());
-                        firstStartTime = startTimeOptimize;
-                        //计算第一次关井时间,按照间开时间段顺延
-                        int startDuration = (int) startTime.between(endTime, DateUnit.MINUTE);
-                        DateTime endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, startDuration);
+                        DateTime startTimeOptimize;
+                        DateTime endTimeOptimize;
+                        //判断发电量是否为正数
+                        if (start.getPower().compareTo(BigDecimal.ZERO) > 0) {
+                            startTimeOptimize = DateUtil.date(start.getCreateTime());
+                            firstStartTime = startTimeOptimize;
+                            //计算第一次关井时间,按照间开时间段顺延
+                            int startDuration = (int) startTime.between(endTime, DateUnit.MINUTE);
+                            endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, startDuration);
+                        } else {
+                            startTimeOptimize = startTime;
+                            firstStartTime = startTime;
+                            endTimeOptimize = endTime;
+                        }
                         this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize);
                         //计算时间偏移,取时间间隔(分钟)
                         between = BaseUtils.getTimeDifferenceMinute(startTimeOptimize, startTime);
@@ -307,18 +316,22 @@ public class SpaceOptimizeBaseService {
                                 }
                             }
                         }
+                        DateTime startTimeOptimize;
+                        DateTime endTimeOptimize;
+                        //计算未优化启动间隔
+                        int openDuration = (int) startTime.between(endTime, DateUnit.MINUTE);
                         if (startIndex > -1) {
                             DynamicQueryPlantPredictedPowerOutput start = avgPowerList.get(startIndex);
-                            DateTime startTimeOptimize = DateUtil.date(start.getCreateTime());
-                            //计算未优化启动间隔
-                            int openDuration = (int) startTime.between(endTime, DateUnit.MINUTE);
-                            DateTime endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, openDuration);
-                            this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize);
-                            //取时间间隔(分钟)
-                            between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
+                            startTimeOptimize = DateUtil.date(start.getCreateTime());
+                            endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, openDuration);
                         } else {
                             //无法优化
+                            endTimeOptimize = startTimeOffset.offsetNew(DateField.MINUTE, openDuration);
+                            startTimeOptimize = startTimeOffset;
                         }
+                        this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize);
+                        //取时间间隔(分钟)
+                        between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
                     }
                 } else {
                     DateTime offset = startTime.offsetNew(DateField.MINUTE, between);
@@ -402,7 +415,7 @@ public class SpaceOptimizeBaseService {
                     DynamicQueryPlantPredictedPowerOutput avg = subAvgPowerList.get(i);
                     DateTime createTime = DateUtil.date(avg.getCreateTime());
                     //计算时间范围:大于等于开始时间,小于等于结束时间
-                    if (createTime.compareTo(openTime) >= 0 && createTime.compareTo(closeTime) <= 0) {
+                    if (createTime.compareTo(openTime) >= 0 && createTime.compareTo(closeTime) < 0) {
                         String endString = createTime.offsetNew(DateField.MINUTE, 15).toString(BusinessConstant.MINUTES_FORMAT);
                         String startString = createTime.toString(BusinessConstant.MINUTES_FORMAT);
                         if (StringUtils.equals(startString, startTimeFlag)) {
@@ -485,7 +498,7 @@ public class SpaceOptimizeBaseService {
                             temporarilyList.add(durationDTO);
                             if (i == size - 1) {
                                 SpaceOptimizeDurationDTO begin = temporarilyList.get(0);
-                                begin.setCloseWellTime(end.getCloseWellTime());
+                                begin.setCloseWellTime(durationDTO.getCloseWellTime());
                                 finallyList.add(begin);
                             }
                         }