Skip to content

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

feat(能源管理系统): 间开制度管理 

1.创建space_interval_system 间开制度详情,space_interval_wellhead_config
间开制度井口配置,space_interval_duration
间开制度小间开时段配置表,生成相关代码并添加到项目space模块,解决编译报错问题;
2.添加间开制度管理模块接口文档配置;
3.添加工具类,及基础实体类,处理基础字段;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ee8d4fed
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 155 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ 9efbda96
......@@ -57,10 +57,7 @@ public class BasePowerLineService {
@XApiPost
@XText("输电线路配置--新增")
public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
PpsUserSession session = context.getSession(PpsUserSession.class);
return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class);
......@@ -86,10 +83,7 @@ public class BasePowerLineService {
@XApiPost
@XText("输电线路配置--修改")
public XServiceResult updateBasePowerLine(XContext context, UpdateBasePowerLineInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
PpsUserSession session = context.getSession(PpsUserSession.class);
String lineId = input.getId();
String ouId = input.getOuId();
return XTransactionHelper.begin(context, () -> {
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 9efbda96
......@@ -62,10 +62,7 @@ public class BasePriceStrategyService {
@XApiPost
@XText("市电峰谷策略--新增")
public XServiceResult createBasePriceStrategy(XContext context, CreateBasePriceStrategyInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
PpsUserSession session = context.getSession(PpsUserSession.class);
return XTransactionHelper.begin(context, () -> {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
BasePriceStrategyEnt entity = XCopyUtils.copyNewObject(input, BasePriceStrategyEnt.class);
......@@ -93,10 +90,7 @@ public class BasePriceStrategyService {
@XApiPost
@XText("市电峰谷策略--修改")
public XServiceResult updateBasePriceStrategy(XContext context, UpdateBasePriceStrategyInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
PpsUserSession session = context.getSession(PpsUserSession.class);
String strategyId = input.getId();
return XTransactionHelper.begin(context, () -> {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
......@@ -147,10 +141,7 @@ public class BasePriceStrategyService {
@XApiPost
@XText("市电峰谷策略--删除")
public XServiceResult deleteBasePriceStrategy(XContext context, DeleteBasePriceStrategyInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
PpsUserSession session = context.getSession(PpsUserSession.class);
String strategyId = input.getId();
if (DictUtils.checkStrategyIsReference(context, strategyId)) {
return XServiceResult.error(992, "当前策略已被引用");
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceIntervalSystemService.java
View file @ 9efbda96
......@@ -3,12 +3,14 @@ package pps.core.space.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.common.session.PpsUserSession;
import pps.core.space.entity.SpaceIntervalSystemEnt;
import pps.core.space.entity.SpaceIntervalSystemView;
import pps.core.space.mapper.SpaceIntervalSystemMapper;
import pps.core.space.mapper.SpaceIntervalSystemViewMapper;
import pps.core.space.service.data.space_interval_system.*;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
......@@ -20,19 +22,42 @@ import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.util.List;
/**
* 基础间开制度
*
* @author ZWT
* @date 2023/08/29
*/
@XService
@XText(value = "基础间开制度")
public class SpaceIntervalSystemService {
/**
* 基础间开制度--新增
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XApiAnonymous
@XApiPost
@XText(value = "基础间开制度--新增")
public XServiceResult createSpaceIntervalSystem(XContext context, CreateSpaceIntervalSystemInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> {
SpaceIntervalSystemMapper mapper = context.getBean(SpaceIntervalSystemMapper.class);
SpaceIntervalSystemEnt entity = new SpaceIntervalSystemEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
});
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_interval_system/CreateSpaceIntervalSystemInput.java
View file @ 9efbda96
package pps.core.space.service.data.space_interval_system;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 间开制度详情
*
* @author ZWT
* @date 2023/08/29
*/
@Data
public class CreateSpaceIntervalSystemInput {
@XText("ID")
private String id;
......@@ -52,133 +60,4 @@ public class CreateSpaceIntervalSystemInput {
@XText("当前运行制度(0_是;1_否)")
private Integer isCurrentRun;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public Integer getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(Integer value) {
this.isDeleted = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
public String getOuId() {
return this.ouId;
}
public void setOuId(String value) {
this.ouId = value;
}
public String getLineId() {
return this.lineId;
}
public void setLineId(String value) {
this.lineId = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getSystemName() {
return this.systemName;
}
public void setSystemName(String value) {
this.systemName = value;
}
public Date getSystemStartDate() {
return this.systemStartDate;
}
public void setSystemStartDate(Date value) {
this.systemStartDate = value;
}
public Date getSystemEndDate() {
return this.systemEndDate;
}
public void setSystemEndDate(Date value) {
this.systemEndDate = value;
}
public String getOptimizedTo() {
return this.optimizedTo;
}
public void setOptimizedTo(String value) {
this.optimizedTo = value;
}
public Integer getIsCurrentRun() {
return this.isCurrentRun;
}
public void setIsCurrentRun(Integer value) {
this.isCurrentRun = value;
}
}
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