Commit 840477b5 authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 8cb593a5
package pps.core.prediction.service;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import pps.core.common.constant.BusinessConstant;
import pps.core.prediction.entity.PlantPredictedPowerMidTermEnt;
import pps.core.prediction.mapper.PlantPredictedPowerMidTermMapper;
import pps.core.prediction.service.data.plant_predicted_power_mid_term.GetPlantPredictedPowerMidTermInput;
......@@ -9,12 +12,10 @@ import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XDateUtils;
import xstartup.base.util.XStringUtils;
import xstartup.data.XListResult;
import xstartup.feature.api.annotation.XApiGet;
import java.util.Date;
import java.util.List;
......@@ -45,16 +46,15 @@ public class PlantPredictedPowerMidTermService {
}
private QueryWrapper<PlantPredictedPowerMidTermEnt> setQueryWrapper(String plantId, String startTime, Integer days) {
Date date = new Date();
QueryWrapper<PlantPredictedPowerMidTermEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PlantPredictedPowerMidTermEnt::getPlantId, plantId);
DateTime date;
if (XStringUtils.isEmpty(startTime)) {
queryWrapper.lambda().ge(PlantPredictedPowerMidTermEnt::getDataDate, date);
queryWrapper.lambda().le(PlantPredictedPowerMidTermEnt::getDataDate, XDateUtils.addDays(date, days));
date = DateUtil.beginOfDay(DateUtil.date());
} else {
queryWrapper.lambda().ge(PlantPredictedPowerMidTermEnt::getDataDate, startTime);
queryWrapper.lambda().le(PlantPredictedPowerMidTermEnt::getDataDate, XDateUtils.addDays(XDateUtils.parse(startTime), days));
date = DateUtil.parse(startTime, BusinessConstant.DATE_FORMAT_DAY);
}
queryWrapper.lambda().between(PlantPredictedPowerMidTermEnt::getDataDate, date, DateUtil.offsetDay(date, days));
queryWrapper.lambda().orderByAsc(PlantPredictedPowerMidTermEnt::getDataDate);
return queryWrapper;
}
......
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