Skip to content

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

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

1.开发基础信息配置-输电线路配置模块列表功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-市电峰谷策略模块列表功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2ee65554
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 271 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 82619607
package pps.core.base.service; package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -20,6 +21,7 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat ...@@ -20,6 +21,7 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat
import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput; import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput; import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput;
import pps.core.base.utils.DictUtils; import pps.core.base.utils.DictUtils;
import pps.core.common.entity.BaseEnt;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseEntUtils; import pps.core.common.utils.BaseEntUtils;
import xstartup.annotation.XService; import xstartup.annotation.XService;
...@@ -255,6 +257,36 @@ public class BasePriceStrategyService { ...@@ -255,6 +257,36 @@ public class BasePriceStrategyService {
return XPageResult.success(outputs, input, pageInfo.getTotal()); return XPageResult.success(outputs, input, pageInfo.getTotal());
} }
/**
* 市电峰谷策略--列表
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult}<{@link DynamicQueryBasePriceStrategyOutput}>
*/
@XApiAnonymous
@XApiGet
@XText("市电峰谷策略--列表")
public XListResult<DynamicQueryBasePriceStrategyOutput> queryBasePriceStrategyList(XContext context, DynamicQueryBasePriceStrategyInput input) {
String id = input.getId();
String policyName = input.getPolicyName();
String areaCode = input.getAreaCode();
Integer strategyYear = input.getStrategyYear();
Integer isFixedPrice = input.getIsFixedPrice();
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
List<BasePriceStrategyEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePriceStrategyEnt>()
.select(BaseEnt::getId, BasePriceStrategyEnt::getPolicyName)
.eq(StringUtils.isNotBlank(id), BaseEnt::getId, id)
.like(StringUtils.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
.eq(StringUtils.isNotBlank(areaCode), BasePriceStrategyEnt::getAreaCode, areaCode)
.eq(Objects.nonNull(strategyYear), BasePriceStrategyEnt::getStrategyYear, strategyYear)
.eq(Objects.nonNull(isFixedPrice), BasePriceStrategyEnt::getIsFixedPrice, isFixedPrice)
.orderByDesc(BaseEnt::getModifyTime)
);
List<DynamicQueryBasePriceStrategyOutput> strategyOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePriceStrategyOutput.class);
return XListResult.success(strategyOutputList);
}
/*-----------------------------------private-----------------------------------*/ /*-----------------------------------private-----------------------------------*/
/** /**
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DynamicQueryBasePriceStrategyInput.java
View file @ 82619607
package pps.core.base.service.data.base_price_strategy; package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/29
*/
@Data
public class DynamicQueryBasePriceStrategyInput { public class DynamicQueryBasePriceStrategyInput {
@XText("ID") @XText("ID")
private String 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("策略名称") @XText("策略名称")
private String policyName; private String policyName;
...@@ -40,112 +26,4 @@ public class DynamicQueryBasePriceStrategyInput { ...@@ -40,112 +26,4 @@ public class DynamicQueryBasePriceStrategyInput {
@XText("是否固定电价(0_是;1_否)") @XText("是否固定电价(0_是;1_否)")
private Integer isFixedPrice; private Integer isFixedPrice;
@XText("固定电价")
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = value;
}
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_price_strategy/DynamicQueryBasePriceStrategyOutput.java
View file @ 82619607
package pps.core.base.service.data.base_price_strategy; package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 市电峰谷策略
*
* @author ZWT
* @date 2023/08/29
*/
@Data
public class DynamicQueryBasePriceStrategyOutput { public class DynamicQueryBasePriceStrategyOutput {
@XText("ID") @XText("ID")
private String 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("策略名称") @XText("策略名称")
private String policyName; private String policyName;
@XText("适用地区编码")
private String areaCode;
@XText("年份")
private Integer strategyYear;
@XText("是否固定电价(0_是;1_否)")
private Integer isFixedPrice;
@XText("固定电价")
private BigDecimal fixedElectricityPrice;
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 getPolicyName() {
return this.policyName;
}
public void setPolicyName(String value) {
this.policyName = value;
}
public String getAreaCode() {
return this.areaCode;
}
public void setAreaCode(String value) {
this.areaCode = value;
}
public Integer getStrategyYear() {
return this.strategyYear;
}
public void setStrategyYear(Integer value) {
this.strategyYear = value;
}
public Integer getIsFixedPrice() {
return this.isFixedPrice;
}
public void setIsFixedPrice(Integer value) {
this.isFixedPrice = value;
}
public BigDecimal getFixedElectricityPrice() {
return this.fixedElectricityPrice;
}
public void setFixedElectricityPrice(BigDecimal value) {
this.fixedElectricityPrice = 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