Commit 6d79981e authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 25db96a4
...@@ -54,7 +54,9 @@ public class ThirdActivePowerService { ...@@ -54,7 +54,9 @@ public class ThirdActivePowerService {
ThirdActivePowerDailyUpdateMapper mapper = context.getBean(ThirdActivePowerDailyUpdateMapper.class); ThirdActivePowerDailyUpdateMapper mapper = context.getBean(ThirdActivePowerDailyUpdateMapper.class);
List<ThirdActivePowerDailyUpdateEnt> list = mapper.selectList(new LambdaQueryWrapper<ThirdActivePowerDailyUpdateEnt>() List<ThirdActivePowerDailyUpdateEnt> list = mapper.selectList(new LambdaQueryWrapper<ThirdActivePowerDailyUpdateEnt>()
.eq(ThirdActivePowerDailyUpdateEnt::getSaveDate, input.getQueryDate()) .eq(ThirdActivePowerDailyUpdateEnt::getSaveDate, input.getQueryDate())
.eq(ThirdActivePowerDailyUpdateEnt::getStationName, input.getStationName()) .and(wrapper -> wrapper.eq(ThirdActivePowerDailyUpdateEnt::getStationName, input.getStationName())
.or()
.eq(ThirdActivePowerDailyUpdateEnt::getStationId, input.getStationId()))
.orderByAsc(ThirdActivePowerDailyUpdateEnt::getSaveHour) .orderByAsc(ThirdActivePowerDailyUpdateEnt::getSaveHour)
); );
return XListResult.success(XCopyUtils.copyNewList(list, GetThirdActivePowerDailyUpdateOutput.class)); return XListResult.success(XCopyUtils.copyNewList(list, GetThirdActivePowerDailyUpdateOutput.class));
......
package pps.core.prediction.service.data.third_active_power_daily_update; package pps.core.prediction.service.data.third_active_power_daily_update;
import com.baomidou.mybatisplus.annotation.TableField;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
...@@ -20,6 +21,10 @@ public class GetThirdActivePowerDailyUpdateInput { ...@@ -20,6 +21,10 @@ public class GetThirdActivePowerDailyUpdateInput {
@NotBlank(message = "缺少井组名称") @NotBlank(message = "缺少井组名称")
private String stationName; private String stationName;
@XText("井组ID(线路/光伏电站)")
@TableField
private String stationId;
@XText("查询日期") @XText("查询日期")
@NotNull(message = "缺少查询日期") @NotNull(message = "缺少查询日期")
private Date queryDate; private Date queryDate;
......
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