feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeLongPeriodService.java

@@ -111,11 +111,11 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
         } else {
             output.setStrategyDetailList(new ArrayList<>(0));
         }
-        DateTime beginOfMonth = DateUtil.beginOfMonth(period.getOptimizeDeadline());
-        if (beginOfMonth.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
-            beginOfMonth = DateUtil.date(detailEnt.getInstitutionStartDate());
+        DateTime begin = DateUtil.date(period.getOptimizeDeadline());
+        if (begin.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
+            begin = DateUtil.date(detailEnt.getInstitutionStartDate());
         }
-        output.setDateList(ServiceUtil.getOptimizeDateList(beginOfMonth, period.getOptimizeDeadline()));
+        output.setDateList(ServiceUtil.getOptimizeDateList(begin, period.getOptimizeDeadline()));
         output.setGridTypeKey(detailEnt.getGridTypeKey());
         //查井口列表
         SpaceOptimizeLongWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidPeriodService.java

@@ -100,11 +100,11 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
         //查间开制度详情
         SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
         SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
-        DateTime beginOfWeek = DateUtil.beginOfWeek(period.getOptimizeDeadline());
-        if (beginOfWeek.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
-            beginOfWeek = DateUtil.date(detailEnt.getInstitutionStartDate());
+        DateTime begin = DateUtil.date(period.getOptimizeDeadline());
+        if (begin.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
+            begin = DateUtil.date(detailEnt.getInstitutionStartDate());
         }
-        List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(beginOfWeek, period.getOptimizeDeadline());
+        List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(begin, period.getOptimizeDeadline());
         output.setDateList(optimizeDateList);
         if (StringUtils.equals(String.valueOf(BusinessConstant.ONE), Optional.ofNullable(detailEnt.getGridTypeKey())
                 .orElse(String.valueOf(BusinessConstant.ZERO)))) {

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/GetSpaceOptimizeShortPeriodViewInput.java

@@ -13,7 +13,7 @@ import xstartup.annotation.XText;
 @Data
 public class GetSpaceOptimizeShortPeriodViewInput {
 
-    @XText("线路ID")
-    @NotBlank(message = "缺少线路ID")
-    private String lineId;
+    @XText("ID")
+    @NotBlank(message = "缺少极短期ID")
+    private String id;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/GetSpaceOptimizeShortPeriodViewOutput.java

 package pps.core.space.service.data.space_optimize_short_period;
 
 import lombok.Data;
-import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadViewOutput;
+import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
+import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
+import pps.core.space.service.data.SpaceOptimizeDateOutput;
+import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadOutput;
 import xstartup.annotation.XText;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,6 +19,24 @@ import java.util.List;
 @Data
 public class GetSpaceOptimizeShortPeriodViewOutput {
 
+    @XText("ID")
+    private String id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("间开制度ID")
+    private String institutionId;
+
+    @XText("执行周期")
+    private String executionCycle;
+
+    @XText("优化状态(0_已优化;1_未优化)")
+    private Integer optimizeState;
+
+    @XText("优化截止日期")
+    private Date optimizeDate;
+
     /**
      * 电网类型key
      */
@@ -22,8 +44,26 @@ public class GetSpaceOptimizeShortPeriodViewOutput {
     private String gridTypeKey;
 
     /**
-     * 井口列表
+     * 已优化日期列表
+     */
+    @XText("已优化日期列表")
+    List<SpaceOptimizeDateOutput> dateList;
+
+    /**
+     * 策略配置列表
+     */
+    @XText("策略配置列表")
+    List<GetBasePriceStrategyDetailOutput> strategyDetailList;
+
+    /**
+     * 井口信息
+     */
+    @XText("井口信息")
+    List<GetSpaceOptimizeShortWellheadOutput> wellheadList;
+
+    /**
+     * 功率预测列表
      */
-    @XText("井口列表")
-    private List<GetSpaceOptimizeShortWellheadViewOutput> wellheadList;
+    @XText("功率预测列表")
+    List<DynamicQueryPlantPredictedPowerOutput> powerGenerationList;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/QuerySpaceOptimizeShortPeriodViewInput.java

+package pps.core.space.service.data.space_optimize_short_period;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+/**
+ * 短期间开开优化周期记录
+ *
+ * @author ZWT
+ * @date 2023/09/07
+ */
+@Data
+public class QuerySpaceOptimizeShortPeriodViewInput extends XPageInput {
+
+    @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
+    private String lineId;
+}

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/QuerySpaceOptimizeShortPeriodViewOutput.java

+package pps.core.space.service.data.space_optimize_short_period;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+/**
+ * 短期间开开优化周期记录
+ *
+ * @author ZWT
+ * @date 2023/09/07
+ */
+@Data
+public class QuerySpaceOptimizeShortPeriodViewOutput {
+
+    @XText("ID")
+    private String id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("间开制度ID")
+    private String institutionId;
+
+    @XText("执行周期")
+    private String executionCycle;
+
+    @XText("优化状态(0_已优化;1_未优化)")
+    private Integer optimizeState;
+
+    @XText("优化截止日期")
+    private Date optimizeDeadline;
+
+    /**
+     * 组织机构ID
+     */
+    @XText("组织机构ID")
+    private String ouId;
+
+    /**
+     * 电网类型key(字典获取)
+     */
+    @XText("电网类型key(字典获取)")
+    private String gridTypeKey;
+
+    /**
+     * 制度名称
+     */
+    @XText("制度名称")
+    private String institutionName;
+
+    /**
+     * 线路名称
+     */
+    @XText("线路名称")
+    private String lineName;
+
+    /**
+     * 组织机构名称
+     */
+    @XText("组织机构名称")
+    private String ouName;
+
+    /**
+     * 电网类型名称
+     */
+    @XText("电网类型名称")
+    private String gridTypeName;
+
+    /**
+     * 优化状态值
+     */
+    @XText("优化状态(0_已优化;1_未优化)")
+    private String optimizeStateValue;
+}

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_wellhead/GetSpaceOptimizeShortWellheadOutput.java

+package pps.core.space.service.data.space_optimize_short_wellhead;
+
+import lombok.Data;
+import pps.core.space.service.data.SpaceOptimizeDateDuration;
+import xstartup.annotation.XText;
+
+import java.util.List;
+
+/**
+ * 极短期间开优化井口记录
+ *
+ * @author ZWT
+ * @date 2024/03/22
+ */
+@Data
+public class GetSpaceOptimizeShortWellheadOutput {
+
+    @XText("ID")
+    private String id;
+
+    @XText("井口ID")
+    private String wellheadId;
+
+    @XText("井号")
+    private String wellNumber;
+
+    /**
+     * 井口配置(未优化)
+     */
+    @XText("井口配置(未优化)")
+    private List<SpaceOptimizeDateDuration> initializeList;
+
+    /**
+     * 井口配置(已优化)
+     */
+    @XText("井口配置(已优化)")
+    private List<SpaceOptimizeDateDuration> optimizeList;
+}