Commit 6f4c12a2 authored by ZWT's avatar ZWT

feat(能源管理系统): 邮件接收

1.统计分析-能耗分析模块重构,删除原有接口及代码,新建能耗分析测试用数据表,生成相关代码并集成到项目中并上传git;
2.统计分析-能耗分析模块能耗概览接口开发,输电线路Cloud模块新增通过组织结构ID列表查询线路列表接口,完成能耗分析模块能耗概览接口业务逻辑开发,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ad41c4c6
package pps.core.prediction.service; package pps.core.prediction.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
...@@ -62,12 +61,12 @@ public class EnergyConsumptionAnalysisService { ...@@ -62,12 +61,12 @@ public class EnergyConsumptionAnalysisService {
//近7天:昨天开始前七天;近30天:昨天开始前30天;上期:所选周期往前推一个周期 //近7天:昨天开始前七天;近30天:昨天开始前30天;上期:所选周期往前推一个周期
switch (input.getDateType()) { switch (input.getDateType()) {
case 1: case 1:
endTime = DateUtil.beginOfDay(DateTime.now()); endTime = DateUtil.beginOfDay(DateUtil.yesterday());
startTime = DateUtil.offsetDay(endTime, -7); startTime = DateUtil.offsetDay(endTime, -6);
break; break;
case 2: case 2:
endTime = DateUtil.beginOfDay(DateTime.now()); endTime = DateUtil.beginOfDay(DateUtil.yesterday());
startTime = DateUtil.offsetDay(endTime, -30); startTime = DateUtil.offsetDay(endTime, -29);
break; break;
case 3: case 3:
endTime = input.getEndTime(); endTime = input.getEndTime();
......
...@@ -20,6 +20,6 @@ public class GetEnergyConsumptionAnalysisViewOutput { ...@@ -20,6 +20,6 @@ public class GetEnergyConsumptionAnalysisViewOutput {
@XText("用电量(kWh)") @XText("用电量(kWh)")
private BigDecimal powerConsumption; private BigDecimal powerConsumption;
@XText("消纳率") @XText("消纳率(%)")
private BigDecimal absorptionRate; private BigDecimal absorptionRate;
} }
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