Commit bdc5e049 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修改极短期间开预测定时任务逻辑,解决优化后部分优化结果时间段过短问题;
2.修改心知天气气象数据获取及接收定时任务,解决天气数据通过邮件下载后,部分数据精度丢失问题;
3.修改首页各个接口逻辑,对小数类型字段进行处理,修改首页接口,增加小时保留两位四舍五入逻辑,同时解决线路详情接口部分查询逻辑报错问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 16382ef5
......@@ -406,14 +406,32 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
continue;
}
if (DateUtil.isIn(openTime, openTimeWeight, closeTimeWeight)) {
if (i > 0) {
//判断开井时间是否小于上一段关井时间
if (DateUtil.compare(openTimeWeight, closeList.get(i - 1).getCloseTime()) < 0) {
//如果小于上一段关井时间,修改当前开井时间
openTimeWeight = DateUtil.date(closeList.get(i - 1).getCloseTime());
}
}
//这里需要把时长补回去再计算
long originalDuration = supplementaryTime + close.getDuration();
//重新计算结束时间及总开井时长
long between = DateUtil.between(openTime, closeTimeWeight, DateUnit.MINUTE);
long between = DateUtil.between(openTimeWeight, closeTime, DateUnit.MINUTE);
if (between > supplementaryTime) {
//从后往前计算时间
} else if (between < supplementaryTime) {
} else {
}
}
if (DateUtil.isIn(closeTime, openTimeWeight, closeTimeWeight)) {
//重新计算开始时间及总开井时长
long between = DateUtil.between(openTimeWeight, closeTime, DateUnit.MINUTE);
}
}
//
}
System.out.println();
} else {
......
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