Skip to content

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

feat(能源管理系统): 基础信息配置 

1.开发基础信息配置-市电峰谷配置模块删除功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-市电峰谷配置模块详情功能,完成接口冒烟测试并生成接口文档;
3.开发基础信息配置-市电峰谷配置模块分页列表功能,完成接口冒烟测试并生成接口文档;
4.开发基础信息配置-输电线路配置模块新增功能,完成接口冒烟测试并生成接口文档;
5.代码优化,增加实体类基类抽取默认字段,添加公共数据封装方法;
6.修改输电线路配置关联表表结构,增加组织ID字段,同时修改entity,service,mapper包相关类;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e70ca21a
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 173 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ 64ee41f7
......@@ -108,9 +108,21 @@ public class BasePowerLineService {
});
}
/**
* 输电线路配置--修改
*
* @param context 上下文
* @param input 输入
* @return {@link XServiceResult}
*/
@XApiAnonymous
@XApiPost
public XServiceResult updateBasePowerLine(XContext context, UpdateBasePowerLineInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
QueryWrapper<BasePowerLineEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BasePowerLineEnt::getId, input.getId());
......@@ -121,6 +133,7 @@ public class BasePowerLineService {
XCopyUtils.copyObject(input, entity);
mapper.updateById(entity);
return XServiceResult.OK;
});
}
@XApiAnonymous
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/CreateBasePowerLineInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import pps.core.base.service.data.base_power_line_diesel.CreateBasePowerLineDieselInput;
import pps.core.base.service.data.base_power_line_plant.CreateBasePowerLinePlantInput;
......@@ -19,6 +21,7 @@ import java.util.List;
public class CreateBasePowerLineInput {
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("上级线路ID")
......@@ -46,23 +49,27 @@ public class CreateBasePowerLineInput {
* 输电线路柴发设备配置
*/
@XText("输电线路柴发设备配置")
@Valid
private List<CreateBasePowerLineDieselInput> dieselInputs;
/**
* 输电线路光伏配置
*/
@XText("输电线路光伏配置")
@Valid
private List<CreateBasePowerLinePlantInput> plantInputs;
/**
* 输电线路储能配置
*/
@XText("输电线路储能配置")
@Valid
private List<CreateBasePowerLineStorageInput> storageInputs;
/**
* 输电线路井口配置
*/
@XText("输电线路井口配置")
@Valid
private List<CreateBasePowerLineWellheadInput> wellheadInputs;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/UpdateBasePowerLineInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import pps.core.base.service.data.base_power_line_diesel.UpdateBasePowerLineDieselInput;
import pps.core.base.service.data.base_power_line_plant.UpdateBasePowerLinePlantInput;
import pps.core.base.service.data.base_power_line_storage.UpdateBasePowerLineStorageInput;
import pps.core.base.service.data.base_power_line_wellhead.UpdateBasePowerLineWellheadInput;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
/**
* 更新基础电力线路输入
* 输电线路配置
*
* @author ZWT
* @date 2023/08/25
*/
@Data
public class UpdateBasePowerLineInput {
@XText("ID")
@NotBlank(message = "缺少线路ID")
private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("上级线路ID")
......@@ -53,132 +50,31 @@ public class UpdateBasePowerLineInput {
@XText("是否激活返输调度(0_激活;1_关闭)")
private Integer isReverseDispatch;
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 getUpperLineId() {
return this.upperLineId;
}
public void setUpperLineId(String value) {
this.upperLineId = value;
}
public String getLineName() {
return this.lineName;
}
public void setLineName(String value) {
this.lineName = value;
}
public String getGridTypeKey() {
return this.gridTypeKey;
}
public void setGridTypeKey(String value) {
this.gridTypeKey = value;
}
public String getLineTypeKey() {
return this.lineTypeKey;
}
public void setLineTypeKey(String value) {
this.lineTypeKey = value;
}
public String getStrategyId() {
return this.strategyId;
}
public void setStrategyId(String value) {
this.strategyId = value;
}
public Integer getIsShareDispatch() {
return this.isShareDispatch;
}
public void setIsShareDispatch(Integer value) {
this.isShareDispatch = value;
}
public Integer getIsReverseDispatch() {
return this.isReverseDispatch;
}
public void setIsReverseDispatch(Integer value) {
this.isReverseDispatch = value;
}
/**
* 输电线路柴发设备配置
*/
@XText("输电线路柴发设备配置")
@Valid
private List<UpdateBasePowerLineDieselInput> dieselInputs;
/**
* 输电线路光伏配置
*/
@XText("输电线路光伏配置")
@Valid
private List<UpdateBasePowerLinePlantInput> plantInputs;
/**
* 输电线路储能配置
*/
@XText("输电线路储能配置")
@Valid
private List<UpdateBasePowerLineStorageInput> storageInputs;
/**
* 输电线路井口配置
*/
@XText("输电线路井口配置")
@Valid
private List<UpdateBasePowerLineWellheadInput> wellheadInputs;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_diesel/CreateBasePowerLineDieselInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_diesel;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,5 +14,6 @@ import xstartup.annotation.XText;
public class CreateBasePowerLineDieselInput {
@XText("柴发设备ID")
@NotBlank(message = "缺少柴发设备ID")
private String dieselId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_diesel/UpdateBasePowerLineDieselInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_diesel;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,8 +14,6 @@ import xstartup.annotation.XText;
public class UpdateBasePowerLineDieselInput {
@XText("柴发设备ID")
@NotBlank(message = "缺少柴发设备ID")
private String dieselId;
@XText("组织机构ID")
private String ouId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_plant/CreateBasePowerLinePlantInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_plant;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,5 +14,6 @@ import xstartup.annotation.XText;
public class CreateBasePowerLinePlantInput {
@XText("光伏电站ID")
@NotBlank(message = "缺少光伏电站ID")
private String plantId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_plant/UpdateBasePowerLinePlantInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_plant;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,8 +14,6 @@ import xstartup.annotation.XText;
public class UpdateBasePowerLinePlantInput {
@XText("光伏电站ID")
@NotBlank(message = "缺少光伏电站ID")
private String plantId;
@XText("组织机构ID")
private String ouId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_storage/CreateBasePowerLineStorageInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_storage;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,5 +14,6 @@ import xstartup.annotation.XText;
public class CreateBasePowerLineStorageInput {
@XText("储能设备ID")
@NotBlank(message = "缺少储能设备ID")
private String storageId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_storage/UpdateBasePowerLineStorageInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_storage;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,8 +14,6 @@ import xstartup.annotation.XText;
public class UpdateBasePowerLineStorageInput {
@XText("储能设备ID")
@NotBlank(message = "缺少储能设备ID")
private String storageId;
@XText("组织机构ID")
private String ouId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/CreateBasePowerLineWellheadInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_wellhead;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,5 +14,6 @@ import xstartup.annotation.XText;
public class CreateBasePowerLineWellheadInput {
@XText("井口ID")
@NotBlank(message = "缺少井口ID")
private String wellheadId;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line_wellhead/UpdateBasePowerLineWellheadInput.java
View file @ 64ee41f7
package pps.core.base.service.data.base_power_line_wellhead;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
......@@ -13,8 +14,6 @@ import xstartup.annotation.XText;
public class UpdateBasePowerLineWellheadInput {
@XText("井口ID")
@NotBlank(message = "缺少井口ID")
private String wellheadId;
@XText("组织机构ID")
private String ouId;
}
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