Skip to content

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

feat(零碳): 长庆 

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;
3.长庆极短期间开优化随动算法功能开发,设置自定义参数,初步完成极短时间,间开时间段优化测试功能;
4.间开制度管理模块,间开制度关联井口信息表表结构修改,增加"单次最高开井时长(h)","单次最低开井时长(h)","单次最高关井时长(h)","单次最低关井时长(h)"字段,同时修改数据表对应代码实体及表单参数,修改部分相关模块功能查询修改逻辑;
5.接收天气服务定时任务优化,优化代码结构,修改保存删除逻辑,减少数据库链接次数,优化各类变量大小,修改日期拆分逻辑,解决插入重复数据bug,修改查询电站信息逻辑,增加过滤条件排除第二采油厂数据;
6.修改发送邮件服务,增加获取心知天气未来15天天气预测数据接口,同时创建定时任务,添加获取天气数据后发送到邮箱逻辑;
7.创建定时任务,用于接收心知天气预测数据;
8.设计并创建心知天气数据接收表,生成相关代码并上传到远程git仓库,修改心知天气数据接收定时任务逻辑,增加天气数据新增及删除逻辑;
9.修改心知天气预测数据接收定时任务,增加向旧功率预测表插入删除电站15天天气数据逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e5b9fe6f
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 58 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortCloudServiceImpl.java
View file @ 57202d9a
package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import pps.cloud.space.service.ISpaceOptimizeShortCloudService;
import pps.core.common.constant.BusinessConstant;
import pps.core.common.utils.BaseUtils;
import pps.core.space.entity.SpaceOptimizeDurationDTO;
import pps.core.space.entity.SpaceOptimizePeriodDTO;
import pps.core.space.entity.SpaceOptimizeWellheadDTO;
import pps.core.space.mapper.SpaceOptimizeViewMapper;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.data.XServiceResult;
import xstartup.helper.XTransactionHelper;
import java.util.ArrayList;
import java.util.List;
/**
* 极短期间开优化Cloud模块
......@@ -33,52 +22,55 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
*/
@Override
public XServiceResult optimizeShortJob(XContext context) {
List<SpaceOptimizePeriodDTO> periodDTOList = new ArrayList<>(32);
List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
super.doOptimize(context, periodDTOList, wellheadDTOList, durationDTOList, unOptimizeDurationList, BusinessConstant.ONE, BusinessConstant.THREE, 1);
//开启事务
return XTransactionHelper.begin(context, () -> {
int size;
SpaceOptimizeViewMapper optimizeViewMapper = context.getBean(SpaceOptimizeViewMapper.class);
if (CollUtil.isNotEmpty(periodDTOList)) {
size = periodDTOList.size();
if (size > BaseUtils.BATCH_SIZE) {
List<List<SpaceOptimizePeriodDTO>> subList = BaseUtils.getSubList(periodDTOList);
subList.forEach(optimizeViewMapper::shortPeriodBatchInsertList);
} else {
optimizeViewMapper.shortPeriodBatchInsertList(periodDTOList);
}
}
if (CollUtil.isNotEmpty(wellheadDTOList)) {
size = wellheadDTOList.size();
if (size > BaseUtils.BATCH_SIZE) {
List<List<SpaceOptimizeWellheadDTO>> subList = BaseUtils.getSubList(wellheadDTOList);
subList.forEach(optimizeViewMapper::shortWellheadBatchInsertList);
} else {
optimizeViewMapper.shortWellheadBatchInsertList(wellheadDTOList);
}
}
if (CollUtil.isNotEmpty(unOptimizeDurationList)) {
size = unOptimizeDurationList.size();
if (size > BaseUtils.BATCH_SIZE) {
List<List<SpaceOptimizeDurationDTO>> subList = BaseUtils.getSubList(unOptimizeDurationList);
subList.forEach(optimizeViewMapper::shortDurationBatchInsertList);
} else {
optimizeViewMapper.shortDurationBatchInsertList(unOptimizeDurationList);
}
}
if (CollUtil.isNotEmpty(durationDTOList)) {
size = durationDTOList.size();
if (size > BaseUtils.BATCH_SIZE) {
List<List<SpaceOptimizeDurationDTO>> subList = BaseUtils.getSubList(durationDTOList);
subList.forEach(optimizeViewMapper::shortDurationBatchInsertList);
} else {
optimizeViewMapper.shortDurationBatchInsertList(durationDTOList);
}
}
return XServiceResult.OK;
});
SpaceOptimizeShortPeriodService bean = context.getBean(SpaceOptimizeShortPeriodService.class);
bean.dynamicOptimize(context);
// List<SpaceOptimizePeriodDTO> periodDTOList = new ArrayList<>(32);
// List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
// List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
// List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
// super.doOptimize(context, periodDTOList, wellheadDTOList, durationDTOList, unOptimizeDurationList, BusinessConstant.ONE, BusinessConstant.THREE, 1);
// //开启事务
// return XTransactionHelper.begin(context, () -> {
// int size;
// SpaceOptimizeViewMapper optimizeViewMapper = context.getBean(SpaceOptimizeViewMapper.class);
// if (CollUtil.isNotEmpty(periodDTOList)) {
// size = periodDTOList.size();
// if (size > BaseUtils.BATCH_SIZE) {
// List<List<SpaceOptimizePeriodDTO>> subList = BaseUtils.getSubList(periodDTOList);
// subList.forEach(optimizeViewMapper::shortPeriodBatchInsertList);
// } else {
// optimizeViewMapper.shortPeriodBatchInsertList(periodDTOList);
// }
// }
// if (CollUtil.isNotEmpty(wellheadDTOList)) {
// size = wellheadDTOList.size();
// if (size > BaseUtils.BATCH_SIZE) {
// List<List<SpaceOptimizeWellheadDTO>> subList = BaseUtils.getSubList(wellheadDTOList);
// subList.forEach(optimizeViewMapper::shortWellheadBatchInsertList);
// } else {
// optimizeViewMapper.shortWellheadBatchInsertList(wellheadDTOList);
// }
// }
// if (CollUtil.isNotEmpty(unOptimizeDurationList)) {
// size = unOptimizeDurationList.size();
// if (size > BaseUtils.BATCH_SIZE) {
// List<List<SpaceOptimizeDurationDTO>> subList = BaseUtils.getSubList(unOptimizeDurationList);
// subList.forEach(optimizeViewMapper::shortDurationBatchInsertList);
// } else {
// optimizeViewMapper.shortDurationBatchInsertList(unOptimizeDurationList);
// }
// }
// if (CollUtil.isNotEmpty(durationDTOList)) {
// size = durationDTOList.size();
// if (size > BaseUtils.BATCH_SIZE) {
// List<List<SpaceOptimizeDurationDTO>> subList = BaseUtils.getSubList(durationDTOList);
// subList.forEach(optimizeViewMapper::shortDurationBatchInsertList);
// } else {
// optimizeViewMapper.shortDurationBatchInsertList(durationDTOList);
// }
// }
// return XServiceResult.OK;
// });
return XServiceResult.OK;
}
}
\ No newline at end of file
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