Commit 4198d8e1 authored by ZWT's avatar ZWT

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

1.开发基础信息配置-市电峰谷配置模块删除功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-市电峰谷配置模块详情功能,完成接口冒烟测试并生成接口文档;
3.开发基础信息配置-市电峰谷配置模块分页列表功能,完成接口冒烟测试并生成接口文档;
4.开发基础信息配置-输电线路配置模块新增功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d3c626f2
...@@ -8,6 +8,7 @@ import pps.core.base.entity.BasePowerLineView; ...@@ -8,6 +8,7 @@ import pps.core.base.entity.BasePowerLineView;
import pps.core.base.mapper.BasePowerLineMapper; import pps.core.base.mapper.BasePowerLineMapper;
import pps.core.base.mapper.BasePowerLineViewMapper; import pps.core.base.mapper.BasePowerLineViewMapper;
import pps.core.base.service.data.base_power_line.*; import pps.core.base.service.data.base_power_line.*;
import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -21,6 +22,7 @@ import xstartup.feature.api.annotation.XApiAnonymous; ...@@ -21,6 +22,7 @@ import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper; import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.util.List; import java.util.List;
...@@ -45,11 +47,17 @@ public class BasePowerLineService { ...@@ -45,11 +47,17 @@ public class BasePowerLineService {
@XApiPost @XApiPost
@XText("输电线路配置模块--新增") @XText("输电线路配置模块--新增")
public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) { public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class); // PpsUserSession session = context.getSession(PpsUserSession.class);
BasePowerLineEnt entity = new BasePowerLineEnt(); PpsUserSession session = new PpsUserSession();
XCopyUtils.copyObject(input, entity); session.setId("123");
mapper.insert(entity); session.setUserName("ceshi");
return XServiceResult.OK; return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = new BasePowerLineEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
});
} }
@XApiAnonymous @XApiAnonymous
......
...@@ -6,7 +6,6 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat ...@@ -6,7 +6,6 @@ import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrat
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -18,30 +17,6 @@ import java.util.List; ...@@ -18,30 +17,6 @@ import java.util.List;
@Data @Data
public class CreateBasePriceStrategyInput { public class CreateBasePriceStrategyInput {
@XText("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;
...@@ -60,6 +35,7 @@ public class CreateBasePriceStrategyInput { ...@@ -60,6 +35,7 @@ public class CreateBasePriceStrategyInput {
/** /**
* 月份入参 * 月份入参
*/ */
@XText("月份入参")
@Valid @Valid
private List<CreateBasePriceStrategyMonthInput> months; private List<CreateBasePriceStrategyMonthInput> months;
} }
...@@ -16,35 +16,9 @@ import java.util.Date; ...@@ -16,35 +16,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CreateBasePriceStrategyDetailInput { public class CreateBasePriceStrategyDetailInput {
@XText("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 strategyId;
@XText("市电峰谷月") @XText("市电峰谷月")
private Integer strategyMonth;; private Integer strategyMonth;
@XText("时段类型key(字典获取)") @XText("时段类型key(字典获取)")
@NotBlank(message = "时段类型不能为空") @NotBlank(message = "时段类型不能为空")
......
...@@ -6,7 +6,6 @@ import lombok.Data; ...@@ -6,7 +6,6 @@ import lombok.Data;
import pps.core.base.service.data.base_price_strategy_detail.CreateBasePriceStrategyDetailInput; import pps.core.base.service.data.base_price_strategy_detail.CreateBasePriceStrategyDetailInput;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -17,32 +16,6 @@ import java.util.List; ...@@ -17,32 +16,6 @@ import java.util.List;
*/ */
@Data @Data
public class CreateBasePriceStrategyMonthInput { public class CreateBasePriceStrategyMonthInput {
@XText("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 strategyId;
@XText("市电峰谷月(1-12)") @XText("市电峰谷月(1-12)")
@NotNull(message = "月份不能为空") @NotNull(message = "月份不能为空")
...@@ -51,6 +24,7 @@ public class CreateBasePriceStrategyMonthInput { ...@@ -51,6 +24,7 @@ public class CreateBasePriceStrategyMonthInput {
/** /**
* 策略明细入参 * 策略明细入参
*/ */
@XText("策略明细入参")
@Valid @Valid
private List<CreateBasePriceStrategyDetailInput> details; private List<CreateBasePriceStrategyDetailInput> details;
} }
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