Commit 984ac18f authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 795993bc
...@@ -11,6 +11,7 @@ import xstartup.error.XError; ...@@ -11,6 +11,7 @@ import xstartup.error.XError;
public enum BusinessError implements XError { public enum BusinessError implements XError {
DateTypeError(2200, "日期类型错误"), DateTypeError(2200, "日期类型错误"),
TheStartEndDateIsMissing(2201, "缺少开始结束日期"),
; ;
private int code; private int code;
......
...@@ -2,6 +2,7 @@ package pps.core.prediction.service; ...@@ -2,6 +2,7 @@ package pps.core.prediction.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
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;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -68,6 +69,9 @@ public class EnergyConsumptionAnalysisService { ...@@ -68,6 +69,9 @@ public class EnergyConsumptionAnalysisService {
startTime = DateUtil.offsetDay(endTime, -29); startTime = DateUtil.offsetDay(endTime, -29);
break; break;
case 3: case 3:
if (ObjectUtil.isNull(input.getEndTime()) || ObjectUtil.isNull(input.getStartTime())) {
throw new XServiceException(BusinessError.TheStartEndDateIsMissing);
}
endTime = input.getEndTime(); endTime = input.getEndTime();
startTime = input.getStartTime(); startTime = input.getStartTime();
break; 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