Skip to content

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

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

1.开发基础信息配置-输电线路配置模块修改功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-输电线路配置模块删除功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 64ee41f7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 226 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLinePlantMapper.java
View file @ 468cb2ed
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePowerLinePlantEnt;
@Repository(value="pps.core.base.mapper.BasePowerLinePlantMapper")
/**
* 输电线路光伏配置
*
* @author ZWT
* @date 2023/08/28
*/
@Repository(value = "pps.core.base.mapper.BasePowerLinePlantMapper")
public interface BasePowerLinePlantMapper extends BaseMapper<BasePowerLinePlantEnt> {
}
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineStorageMapper.java
View file @ 468cb2ed
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePowerLineStorageEnt;
@Repository(value="pps.core.base.mapper.BasePowerLineStorageMapper")
/**
* 输电线路储能配置
*
* @author ZWT
* @date 2023/08/28
*/
@Repository(value = "pps.core.base.mapper.BasePowerLineStorageMapper")
public interface BasePowerLineStorageMapper extends BaseMapper<BasePowerLineStorageEnt> {
}
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePowerLineWellheadMapper.java
View file @ 468cb2ed
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BasePowerLineWellheadEnt;
@Repository(value="pps.core.base.mapper.BasePowerLineWellheadMapper")
/**
* 输电线路井口配置
*
* @author ZWT
* @date 2023/08/28
*/
@Repository(value = "pps.core.base.mapper.BasePowerLineWellheadMapper")
public interface BasePowerLineWellheadMapper extends BaseMapper<BasePowerLineWellheadEnt> {
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 468cb2ed
......@@ -75,8 +75,7 @@ public class BasePriceStrategyService {
if (!inputMonths.isEmpty()) {
List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
this.saveStrategyMonthDetail(monthMapper, monthList, strategyId, session);
}
return XServiceResult.OK;
});
......@@ -126,7 +125,7 @@ public class BasePriceStrategyService {
.eq(BasePriceStrategyDetailEnt::getStrategyId, strategyId)
.in(BasePriceStrategyDetailEnt::getStrategyMonth, collect)
);
this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
this.saveStrategyMonthDetail(monthMapper, monthList, strategyId, session);
}
XCopyUtils.copyObject(input, entity);
BaseEntUtils.setBaseEntDefault(entity, session);
......@@ -280,13 +279,12 @@ public class BasePriceStrategyService {
/**
* 保存策略明细
*
* @param monthMapper 月映射器
* @param detailMapper 细节映射器
* @param monthList 月清单
* @param strategyId 战略id
* @param session 会话
* @param monthMapper 月映射器
* @param monthList 月清单
* @param strategyId 战略id
* @param session 会话
*/
private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, BasePriceStrategyDetailMapper detailMapper, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
private void saveStrategyMonthDetail(BasePriceStrategyMonthMapper monthMapper, List<BasePriceStrategyMonthEnt> monthList, String strategyId, PpsUserSession session) {
Integer strategyMonth;
List<BasePriceStrategyDetailEnt> detailList;
for (BasePriceStrategyMonthEnt monthEnt : monthList) {
......@@ -303,4 +301,4 @@ public class BasePriceStrategyService {
BaseEntUtils.batchInsert(BasePriceStrategyDetailMapper.class, BasePriceStrategyDetailEnt.class, detailList);
}
}
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/DeleteBasePowerLineInput.java
View file @ 468cb2ed
package pps.core.base.service.data.base_power_line;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 输电线路配置
*
* @author ZWT
* @date 2023/08/28
*/
@Data
public class DeleteBasePowerLineInput {
@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")
private String ouId;
......@@ -52,133 +40,4 @@ public class DeleteBasePowerLineInput {
@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;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_power_line/UpdateBasePowerLineInput.java
View file @ 468cb2ed
......@@ -12,7 +12,6 @@ import xstartup.annotation.XText;
import java.util.List;
/**
* 更新基础电力线路输入
* 输电线路配置
*
* @author ZWT
......
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