Commit 694d7d09 authored by ZWT's avatar ZWT

feat(能源管理系统): 间开优化定时任务

1.开发间开优化长期间开优化定时任务,了解长期并网型流程算法;
2.定时任务模块新增CRON常量类,定义常用表达式;
3.基础信息管理--井口配置Cloud模块,添加通过井口ID集合获取井口列表接口,完成接口冒烟测试;
4.基础信息管理--输电线路配置Cloud模块,添加通过线路ID集合获取线路配置光伏电站列表接口,完成接口冒烟测试;
5.光伏预测--光伏预测Cloud模块,添加条件查询获取光伏预测时间段平均值列表接口,完成接口冒烟测试;
6.修改prediction模块pom引用,添加接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent dc9c5ecf
package pps.core.common.utils; package pps.core.common.utils;
import cn.hutool.core.lang.UUID;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
...@@ -34,4 +35,13 @@ public class BaseUtils { ...@@ -34,4 +35,13 @@ public class BaseUtils {
model.setModifyByName(userName); model.setModifyByName(userName);
model.setModifyTime(now); model.setModifyTime(now);
} }
/**
* 获取uuid
*
* @return {@link String}
*/
public static String getUUID() {
return StringUtils.replace(UUID.randomUUID().toString(), "-", "");
}
} }
\ No newline at end of file
...@@ -66,9 +66,7 @@ public class BasePowerLineService { ...@@ -66,9 +66,7 @@ public class BasePowerLineService {
@XApiPost @XApiPost
@XText("输电线路配置--新增") @XText("输电线路配置--新增")
public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) { public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
PpsUserSession session = new PpsUserSession(); PpsUserSession session = context.getSession(PpsUserSession.class);
session.setId("123");
session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class); BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class); BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class);
...@@ -455,7 +453,7 @@ public class BasePowerLineService { ...@@ -455,7 +453,7 @@ public class BasePowerLineService {
wellhead.setLineId(lineId); wellhead.setLineId(lineId);
wellhead.setOuId(ouId); wellhead.setOuId(ouId);
BaseUtils.setBaseModelDefault(wellhead, session); BaseUtils.setBaseModelDefault(wellhead, session);
wellhead.setId(UUID.randomUUID().toString()); wellhead.setId(BaseUtils.getUUID());
wellheads.add(wellhead); wellheads.add(wellhead);
} }
wellheadMapper.batchInsertList(wellheads); wellheadMapper.batchInsertList(wellheads);
......
...@@ -352,7 +352,7 @@ public class BasePriceStrategyService { ...@@ -352,7 +352,7 @@ public class BasePriceStrategyService {
for (BasePriceStrategyMonthView monthView : monthList) { for (BasePriceStrategyMonthView monthView : monthList) {
monthView.setStrategyId(strategyId); monthView.setStrategyId(strategyId);
BaseUtils.setBaseModelDefault(monthView, session); BaseUtils.setBaseModelDefault(monthView, session);
monthView.setId(UUID.randomUUID().toString()); monthView.setId(BaseUtils.getUUID());
monthViewList.add(monthView); monthViewList.add(monthView);
details = monthView.getDetails(); details = monthView.getDetails();
if (CollUtil.isNotEmpty(details)) { if (CollUtil.isNotEmpty(details)) {
...@@ -360,7 +360,7 @@ public class BasePriceStrategyService { ...@@ -360,7 +360,7 @@ public class BasePriceStrategyService {
d.setStrategyId(strategyId); d.setStrategyId(strategyId);
d.setStrategyMonth(monthView.getStrategyMonth()); d.setStrategyMonth(monthView.getStrategyMonth());
BaseUtils.setBaseModelDefault(d, session); BaseUtils.setBaseModelDefault(d, session);
d.setId(UUID.randomUUID().toString()); d.setId(BaseUtils.getUUID());
detailViewList.add(d); detailViewList.add(d);
}); });
} }
......
...@@ -402,7 +402,7 @@ public class SpaceInstitutionDetailService { ...@@ -402,7 +402,7 @@ public class SpaceInstitutionDetailService {
for (SpaceInstitutionWellheadView wellhead : (List<SpaceInstitutionWellheadView>) XCopyUtils.copyNewList(wellheadList, SpaceInstitutionWellheadView.class)) { for (SpaceInstitutionWellheadView wellhead : (List<SpaceInstitutionWellheadView>) XCopyUtils.copyNewList(wellheadList, SpaceInstitutionWellheadView.class)) {
wellhead.setInstitutionId(institutionId); wellhead.setInstitutionId(institutionId);
BaseUtils.setBaseModelDefault(wellhead, session); BaseUtils.setBaseModelDefault(wellhead, session);
wellhead.setId(UUID.randomUUID().toString()); wellhead.setId(BaseUtils.getUUID());
wellheadViewList.add(wellhead); wellheadViewList.add(wellhead);
durationList = wellhead.getDurationList(); durationList = wellhead.getDurationList();
if (CollUtil.isNotEmpty(durationList)) { if (CollUtil.isNotEmpty(durationList)) {
...@@ -411,7 +411,7 @@ public class SpaceInstitutionDetailService { ...@@ -411,7 +411,7 @@ public class SpaceInstitutionDetailService {
d.setConfigId(wellhead.getId()); d.setConfigId(wellhead.getId());
d.setInstitutionId(institutionId); d.setInstitutionId(institutionId);
BaseUtils.setBaseModelDefault(d, session); BaseUtils.setBaseModelDefault(d, session);
d.setId(UUID.randomUUID().toString()); d.setId(BaseUtils.getUUID());
durationViewList.add(d); durationViewList.add(d);
}); });
} }
......
...@@ -19,10 +19,8 @@ import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQuery ...@@ -19,10 +19,8 @@ import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQuery
import pps.cloud.space.service.ISpaceOptimizeLongCloudService; import pps.cloud.space.service.ISpaceOptimizeLongCloudService;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import pps.core.space.entity.SpaceInstitutionDetailEnt; import pps.core.common.utils.BaseUtils;
import pps.core.space.entity.SpaceInstitutionDurationEnt; import pps.core.space.entity.*;
import pps.core.space.entity.SpaceInstitutionWellheadView;
import pps.core.space.entity.SpaceOptimizeLongDurationEnt;
import pps.core.space.enums.BusinessError; import pps.core.space.enums.BusinessError;
import pps.core.space.mapper.SpaceInstitutionDetailMapper; import pps.core.space.mapper.SpaceInstitutionDetailMapper;
import pps.core.space.mapper.SpaceInstitutionDurationMapper; import pps.core.space.mapper.SpaceInstitutionDurationMapper;
...@@ -97,9 +95,13 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou ...@@ -97,9 +95,13 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
} }
SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class); SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
DateTime dateFlag = DateUtil.parse("1970-01-02 00:00:00", "yyyy-mm-dd HH:mm:ss"); DateTime dateFlag = DateUtil.parse("1970-01-02 00:00:00", "yyyy-mm-dd HH:mm:ss");
//开启事务
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
//优化 //优化
for (SpaceInstitutionDetailEnt detail : detailEntList) { for (SpaceInstitutionDetailEnt detail : detailEntList) {
SpaceOptimizeLongPeriodEnt longPeriod = new SpaceOptimizeLongPeriodEnt();
longPeriod.setId(BaseUtils.getUUID());
String detailId = detail.getId(); String detailId = detail.getId();
switch (detail.getGridTypeKey()) { switch (detail.getGridTypeKey()) {
//并网型优化 //并网型优化
......
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