Commit 593af747 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ce1a5c9c
......@@ -3,6 +3,8 @@ package pps.core.common.constant;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import java.math.BigDecimal;
/**
* 业务操作常量
*
......@@ -103,6 +105,11 @@ public class BusinessConstant {
*/
public static final Integer TEN = 10;
/**
* 六十
*/
public static final BigDecimal SIXTY = new BigDecimal(60);
/*------------------------------日期------------------------------*/
/**
......
......@@ -297,20 +297,27 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
}
//排序
weightList.sort(Comparator.comparing(SpaceOptimizeWeight::getSort));
//每日开井时长
int dayOpenMinute = wellhead.getRunDuration()
.multiply(BusinessConstant.SIXTY)
.intValue();
//每日最小开井时长(分钟)
int minOpenMinute = wellhead.getMinOpen()
.multiply(BusinessConstant.SIXTY)
.intValue();
//每日最大开井时长(分钟)
int maxOpenMinute = wellhead.getMaxOpen()
.multiply(BusinessConstant.SIXTY)
.intValue();
//每日最小关井时长(分钟)
int minCloseMinute = wellhead.getMinClose()
.multiply(BusinessConstant.SIXTY)
.intValue();
//每日最大关井时长(分钟)
int maxCloseMinute = wellhead.getMaxClose()
.multiply(BusinessConstant.SIXTY)
.intValue();
SpaceOptimizeWeight weight;
//测试用 ====== start -----------------------------------------------
int dayOpen = 10;
int maxOpen = 8;
int minOpen = 1;
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment