Skip to content

G
gf_back
Commit d3cee2ee authored by ZWT's avatar ZWT
Browse files
Options

feat(零碳): 长庆 

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ddb4108b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 24 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeLongPeriodService.java
View file @ d3cee2ee
package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
......@@ -111,11 +110,7 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
} else {
output.setStrategyDetailList(new ArrayList<>(0));
}
DateTime begin = DateUtil.date(period.getOptimizeDeadline());
if (begin.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
begin = DateUtil.date(detailEnt.getInstitutionStartDate());
}
output.setDateList(ServiceUtil.getOptimizeDateList(begin, period.getOptimizeDeadline()));
output.setDateList(ServiceUtil.getOptimizeDateList(period.getCreateTime(), 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
View file @ d3cee2ee
package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
......@@ -100,11 +99,7 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
//查间开制度详情
SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
DateTime begin = DateUtil.date(period.getOptimizeDeadline());
if (begin.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
begin = DateUtil.date(detailEnt.getInstitutionStartDate());
}
List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(begin, period.getOptimizeDeadline());
List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(period.getCreateTime(), 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/SpaceOptimizeShortPeriodService.java
View file @ d3cee2ee
package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
......@@ -100,11 +99,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//查间开制度详情
SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
DateTime begin = DateUtil.date(period.getOptimizeDate());
if (begin.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
begin = DateUtil.date(detailEnt.getInstitutionStartDate());
}
List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(begin, period.getOptimizeDate());
List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(period.getCreateTime(), period.getOptimizeDate());
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/SpaceOptimizeUltraPeriodService.java
View file @ d3cee2ee
package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
......@@ -111,11 +110,7 @@ public class SpaceOptimizeUltraPeriodService 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());
}
output.setDateList(ServiceUtil.getOptimizeDateList(beginOfMonth, period.getOptimizeDeadline()));
output.setDateList(ServiceUtil.getOptimizeDateList(period.getCreateTime(), period.getOptimizeDeadline()));
output.setGridTypeKey(detailEnt.getGridTypeKey());
//查井口列表
SpaceOptimizeUltraWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeUltraWellheadMapper.class);
......
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