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

@@ -297,47 +297,47 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 weightList.sort(Comparator.comparing(SpaceOptimizeWeight::getSort));
                 SpaceOptimizeWeight weight;
                 //测试用 ====== start -----------------------------------------------
-                int dayOpen = 15;
-                int dayOpenMinute = dayOpen * 60;
-                int maxOpen = 10;
-                int minOpen = 3;
+                int dayOpen = 10;
+                int maxOpen = 8;
+                int minOpen = 2;
                 int maxClose = 2;
                 int minClose = 1;
+                int dayOpenMinute = dayOpen * 60;
                 int minOpenMinute = minOpen * 60;
                 int maxOpenMinute = maxOpen * 60;
                 int minCloseMinute = minClose * 60;
                 int maxCloseMinute = maxClose * 60;
                 //测试用 ====== end -----------------------------------------------
 
-                //取权重最高的开始位置
-                int maxIndex = 0;
-                int weightNum = 0;
-                for (int i1 = 0; i1 < weightList.size(); i1++) {
-                    if (weightList.get(i1).getWeight() > weightNum) {
-                        weightNum = weightList.get(i1).getWeight();
-                        maxIndex = i1;
-                    }
-                }
-                //时间处理,重构时间段
-                if (maxIndex > 0) {
-                    //取最后一段时间
-                    SpaceOptimizeWeight endWeight = weightList.get(weightList.size() - 1);
-                    Iterator<SpaceOptimizeWeight> iterator = weightList.iterator();
-                    int index = 0;
-                    while (iterator.hasNext() && index < maxIndex) {
-                        index++;
-                        SpaceOptimizeWeight next = iterator.next();
-                        DateTime offsetDay = DateUtil.offsetDay(next.getTimestamp(), 1);
-                        if (endWeight.getTimestamp().equals(offsetDay)) {
-                            iterator.remove();
-                            continue;
-                        }
-                        next.setTimestamp(offsetDay);
-                        next.setSort(next.getSort() + endWeight.getSort());
-                    }
-                }
-                //按索引排序
-                weightList.sort(Comparator.comparing(SpaceOptimizeWeight::getSort));
+//                //取权重最高的开始位置
+//                int maxIndex = 0;
+//                int weightNum = 0;
+//                for (int i1 = 0; i1 < weightList.size(); i1++) {
+//                    if (weightList.get(i1).getWeight() > weightNum) {
+//                        weightNum = weightList.get(i1).getWeight();
+//                        maxIndex = i1;
+//                    }
+//                }
+//                //时间处理,重构时间段
+//                if (maxIndex > 0) {
+//                    //取最后一段时间
+//                    SpaceOptimizeWeight endWeight = weightList.get(weightList.size() - 1);
+//                    Iterator<SpaceOptimizeWeight> iterator = weightList.iterator();
+//                    int index = 0;
+//                    while (iterator.hasNext() && index < maxIndex) {
+//                        index++;
+//                        SpaceOptimizeWeight next = iterator.next();
+//                        DateTime offsetDay = DateUtil.offsetDay(next.getTimestamp(), 1);
+//                        if (endWeight.getTimestamp().equals(offsetDay)) {
+//                            iterator.remove();
+//                            continue;
+//                        }
+//                        next.setTimestamp(offsetDay);
+//                        next.setSort(next.getSort() + endWeight.getSort());
+//                    }
+//                }
+//                //按索引排序
+//                weightList.sort(Comparator.comparing(SpaceOptimizeWeight::getSort));
                 //分级取时间段
                 List<SpaceOptimizeWeightDuration> weightDurationList = new ArrayList<>(32);
                 long between;