feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;
3.长庆极短期间开优化随动算法功能开发,设置自定义参数,初步完成极短时间,间开时间段优化测试功能;
4.间开制度管理模块,间开制度关联井口信息表表结构修改,增加"单次最高开井时长(h)","单次最低开井时长(h)","单次最高关井时长(h)","单次最低关井时长(h)"字段,同时修改数据表对应代码实体及表单参数,修改部分相关模块功能查询修改逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -299,7 +299,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 //测试用 ====== start -----------------------------------------------
                 int dayOpen = 10;
                 int maxOpen = 8;
-                int minOpen = 2;
+                int minOpen = 1;
                 int maxClose = 2;
                 int minClose = 1;
                 int dayOpenMinute = dayOpen * 60;
@@ -548,14 +548,26 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                         if (outdo > 0) {
                             //todo : 如果超过最大时间,缩短结束时间(只能缩短,无法重新优化)
                             SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
-                            DateTime closeTimeNew = DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo);
-                            int compare = closeTimeNew.compareTo(durationDTO.getOpenTime());
-                            if (0 >= compare) {
-                                optimizeDurationDTOList.remove(optimizeDurationDTOList.size() - 1);
-                                sumOpenTime -= outdo;
+                            if (forwardFlag) {
+                                DateTime closeTimeNew = DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo);
+                                int compare = closeTimeNew.compareTo(durationDTO.getOpenTime());
+                                if (0 >= compare) {
+                                    optimizeDurationDTOList.remove(optimizeDurationDTOList.size() - 1);
+                                    sumOpenTime -= outdo;
+                                } else {
+                                    //需要补时间,下面统一补
+                                    durationDTO.setCloseTime(closeTimeNew);
+                                }
                             } else {
-                                //需要补时间,下面统一补
-                                durationDTO.setCloseTime(closeTimeNew);
+                                DateTime openTimeNew = DateUtil.offsetMinute(durationDTO.getOpenTime(), (int) outdo);
+                                int compare = openTimeNew.compareTo(durationDTO.getCloseTime());
+                                if (compare >= 0) {
+                                    optimizeDurationDTOList.remove(optimizeDurationDTOList.size() - 1);
+                                    sumOpenTime -= outdo;
+                                } else {
+                                    //需要补时间,下面统一补
+                                    durationDTO.setOpenTime(openTimeNew);
+                                }
                             }
                         }
                         //结束循环