Commit 0fad3fbd authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 4861f4ee
......@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -51,6 +52,7 @@ import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiGet;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
......@@ -364,7 +366,8 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
if (duration >= maxOpenMinute) {
//满足,判断能满足几次(最大开井时间)
//todo : 能力有限,只能用(最大开井时间+最小停井时间)固定范围,求不了最优排布
for (int i2 = 1; i2 <= duration / maxOpenMinute; i2++) {
int div = (int) NumberUtil.div(duration, maxOpenMinute, 0, RoundingMode.UP);
for (int i2 = 1; i2 <= div; i2++) {
DateTime closeTime;
if (duration >= maxOpenMinute) {
sumOpenTime += maxOpenMinute;
......@@ -402,8 +405,8 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
long outdo = sumOpenTime - dayOpenMinute;
if (outdo > 0) {
//如果超过最大时间,缩短结束时间(只能缩短,无法重新优化)
SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
durationDTO.setCloseTime(DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo));
// SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
// durationDTO.setCloseTime(DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo));
}
//结束循环
break;
......
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