feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -3,15 +3,16 @@ package pps.core.space.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput;
 import pps.cloud.prediction.service.data.storage_predicted_power_data.DynamicQueryStoragePredictedPowerInput;
 import pps.cloud.space.service.ISpaceOptimizeMidCloudService;
 import pps.core.common.constant.BusinessConstant;
+import pps.core.common.entity.BaseModel;
 import pps.core.common.utils.BaseUtils;
-import pps.core.space.entity.SpaceInstitutionDetailEnt;
-import pps.core.space.entity.SpaceOptimizeDurationDTO;
-import pps.core.space.entity.SpaceOptimizePeriodDTO;
-import pps.core.space.entity.SpaceOptimizeWellheadDTO;
+import pps.core.space.entity.*;
+import pps.core.space.mapper.SpaceOptimizeMidPeriodMapper;
 import pps.core.space.mapper.SpaceOptimizeViewMapper;
 import pps.core.space.service.data.SpaceOptimizeLineRelation;
 import xstartup.annotation.XService;
@@ -56,6 +57,21 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
         String nextWeek = DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY);
         //优化
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
+            //查最新间开历史
+            SpaceOptimizeMidPeriodMapper periodMapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
+            SpaceOptimizeMidPeriodEnt midPeriodEnt = periodMapper.selectOne(new QueryWrapper<SpaceOptimizeMidPeriodEnt>()
+                    .select("institution_id",
+                            "MAX( optimize_deadline ) AS optimize_deadline")
+                    .lambda()
+                    .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                    .eq(SpaceOptimizeMidPeriodEnt::getInstitutionId, detail.getId())
+            );
+            if (ObjectUtil.isNotNull(midPeriodEnt)) {
+                Date optimizeDead = midPeriodEnt.getOptimizeDeadline();
+                if (DateUtil.compare(date, optimizeDead) == -1) {
+                    continue;
+                }
+            }
             Date institutionEndDate = detail.getInstitutionEndDate();
             DateTime optimizeDeadline = DateUtil.offsetDay(date, 3);
             if (optimizeDeadline.compareTo(institutionEndDate) > 0) {