Commit 4c992e79 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent b429fdbc
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 基础
*
* @author ZWT
* @date 2023/08/25 15:46
*/
@Data
public class BaseEnt {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
}
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 输电线路配置 * 输电线路配置
...@@ -18,39 +15,7 @@ import java.util.Date; ...@@ -18,39 +15,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("base_power_line") @TableName("base_power_line")
public class BasePowerLineEnt implements Serializable { public class BasePowerLineEnt extends BaseEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
@XText("组织机构ID") @XText("组织机构ID")
@TableField @TableField
private String ouId; private String ouId;
......
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -19,38 +17,7 @@ import java.util.Date; ...@@ -19,38 +17,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("base_price_strategy_detail") @TableName("base_price_strategy_detail")
public class BasePriceStrategyDetailEnt implements Serializable { public class BasePriceStrategyDetailEnt extends BaseEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
@XText("市电峰谷配置ID") @XText("市电峰谷配置ID")
@TableField @TableField
...@@ -59,7 +26,6 @@ public class BasePriceStrategyDetailEnt implements Serializable { ...@@ -59,7 +26,6 @@ public class BasePriceStrategyDetailEnt implements Serializable {
@XText("市电峰谷月") @XText("市电峰谷月")
@TableField @TableField
private Integer strategyMonth; private Integer strategyMonth;
;
@XText("时段类型key(字典获取)") @XText("时段类型key(字典获取)")
@TableField @TableField
......
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* 市电峰谷策略 * 市电峰谷策略
...@@ -19,39 +16,7 @@ import java.util.Date; ...@@ -19,39 +16,7 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("base_price_strategy") @TableName("base_price_strategy")
public class BasePriceStrategyEnt implements Serializable { public class BasePriceStrategyEnt extends BaseEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
@XText("策略名称") @XText("策略名称")
@TableField @TableField
......
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -20,38 +17,7 @@ import java.util.List; ...@@ -20,38 +17,7 @@ import java.util.List;
*/ */
@Data @Data
@TableName("base_price_strategy_month") @TableName("base_price_strategy_month")
public class BasePriceStrategyMonthEnt implements Serializable { public class BasePriceStrategyMonthEnt extends BaseEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("是否删除(0_是;1_否)")
@TableField
private Integer isDeleted;
@XText("创建人ID")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("创建时间")
@TableField
private Date createTime;
@XText("修改人ID")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
@XText("市电峰谷配置ID") @XText("市电峰谷配置ID")
@TableField @TableField
......
...@@ -3,11 +3,16 @@ package pps.core.base.service; ...@@ -3,11 +3,16 @@ package pps.core.base.service;
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;
import org.apache.commons.lang3.StringUtils;
import pps.core.base.entity.BasePowerLineEnt; import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.entity.BasePowerLineView; 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.base.service.data.base_power_line_diesel.CreateBasePowerLineDieselInput;
import pps.core.base.service.data.base_power_line_plant.CreateBasePowerLinePlantInput;
import pps.core.base.service.data.base_power_line_storage.CreateBasePowerLineStorageInput;
import pps.core.base.service.data.base_power_line_wellhead.CreateBasePowerLineWellheadInput;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -24,6 +29,7 @@ import xstartup.feature.api.annotation.XApiPost; ...@@ -24,6 +29,7 @@ import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper; import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -53,13 +59,57 @@ public class BasePowerLineService { ...@@ -53,13 +59,57 @@ public class BasePowerLineService {
session.setUserName("ceshi"); session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class); BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
BasePowerLineEnt entity = new BasePowerLineEnt(); BasePowerLineEnt entity = XCopyUtils.copyNewObject(input, BasePowerLineEnt.class);
XCopyUtils.copyObject(input, entity); //新增输电线路
this.setBasePowerLineEntDefault(entity, session);
mapper.insert(entity); mapper.insert(entity);
String lineId = entity.getId();
//新增井口配置
List<CreateBasePowerLineWellheadInput> wellheadInputs = input.getWellheadInputs();
if (!wellheadInputs.isEmpty()) {
}
//新增光伏配置
List<CreateBasePowerLinePlantInput> plantInputs = input.getPlantInputs();
if (!plantInputs.isEmpty()) {
}
//新增储能配置
List<CreateBasePowerLineStorageInput> storageInputs = input.getStorageInputs();
if (!storageInputs.isEmpty()) {
}
//新增柴发配置
List<CreateBasePowerLineDieselInput> dieselInputs = input.getDieselInputs();
if (!dieselInputs.isEmpty()) {
}
return XServiceResult.OK; return XServiceResult.OK;
}); });
} }
/**
* 设置输电线路配置默认值
*
* @param entity 实体
* @param session 会话
*/
private void setBasePowerLineEntDefault(BasePowerLineEnt entity, PpsUserSession session) {
String id = entity.getId();
Date now = new Date();
String userId = session.getId();
String userName = session.getUserName();
if (StringUtils.isEmpty(id)) {
entity.setCreateById(userId);
entity.setCreateByName(userName);
entity.setCreateTime(now);
}
entity.setModifyById(userId);
entity.setModifyByName(userName);
entity.setModifyTime(now);
}
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult updateBasePowerLine(XContext context, UpdateBasePowerLineInput input) { public XServiceResult updateBasePowerLine(XContext context, UpdateBasePowerLineInput input) {
......
...@@ -7,10 +7,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -7,10 +7,7 @@ import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemAreaService; import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.GetSysAreaInput; import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput; import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.core.base.entity.BasePriceStrategyDetailEnt; import pps.core.base.entity.*;
import pps.core.base.entity.BasePriceStrategyEnt;
import pps.core.base.entity.BasePriceStrategyMonthEnt;
import pps.core.base.entity.BasePriceStrategyView;
import pps.core.base.mapper.BasePriceStrategyDetailMapper; import pps.core.base.mapper.BasePriceStrategyDetailMapper;
import pps.core.base.mapper.BasePriceStrategyMapper; import pps.core.base.mapper.BasePriceStrategyMapper;
import pps.core.base.mapper.BasePriceStrategyMonthMapper; import pps.core.base.mapper.BasePriceStrategyMonthMapper;
...@@ -34,7 +31,10 @@ import xstartup.feature.api.annotation.XApiGet; ...@@ -34,7 +31,10 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
import java.util.*; import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -64,15 +64,13 @@ public class BasePriceStrategyService { ...@@ -64,15 +64,13 @@ public class BasePriceStrategyService {
session.setUserName("ceshi"); session.setUserName("ceshi");
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class); BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
BasePriceStrategyEnt entity = new BasePriceStrategyEnt(); BasePriceStrategyEnt entity = XCopyUtils.copyNewObject(input, BasePriceStrategyEnt.class);
XCopyUtils.copyObject(input, entity);
this.setBasePriceStrategyEntDefault(entity, session); this.setBasePriceStrategyEntDefault(entity, session);
mapper.insert(entity); mapper.insert(entity);
String strategyId = entity.getId(); String strategyId = entity.getId();
List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths(); List<CreateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
if (!inputMonths.isEmpty()) { if (!inputMonths.isEmpty()) {
List<BasePriceStrategyMonthEnt> monthList = new ArrayList<>(16); List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
XCopyUtils.copyList(inputMonths, monthList, BasePriceStrategyMonthEnt.class);
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class); BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class); BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session); this.saveStrategyMonthDetail(monthMapper, detailMapper, monthList, strategyId, session);
...@@ -107,8 +105,7 @@ public class BasePriceStrategyService { ...@@ -107,8 +105,7 @@ public class BasePriceStrategyService {
} }
List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths(); List<UpdateBasePriceStrategyMonthInput> inputMonths = input.getMonths();
if (!inputMonths.isEmpty()) { if (!inputMonths.isEmpty()) {
List<BasePriceStrategyMonthEnt> monthList = new ArrayList<>(16); List<BasePriceStrategyMonthEnt> monthList = XCopyUtils.copyNewList(inputMonths, BasePriceStrategyMonthEnt.class);
XCopyUtils.copyList(inputMonths, monthList, BasePriceStrategyMonthEnt.class);
List<Integer> collect = monthList.stream() List<Integer> collect = monthList.stream()
.map(BasePriceStrategyMonthEnt::getStrategyMonth) .map(BasePriceStrategyMonthEnt::getStrategyMonth)
.collect(Collectors.toList()); .collect(Collectors.toList());
...@@ -202,8 +199,7 @@ public class BasePriceStrategyService { ...@@ -202,8 +199,7 @@ public class BasePriceStrategyService {
if (entity == null) { if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
} }
GetBasePriceStrategyOutput output = new GetBasePriceStrategyOutput(); GetBasePriceStrategyOutput output = XCopyUtils.copyNewObject(entity, GetBasePriceStrategyOutput.class);
XCopyUtils.copyObject(entity, output);
//查月份 //查月份
BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class); BasePriceStrategyMonthMapper monthMapper = context.getBean(BasePriceStrategyMonthMapper.class);
List<BasePriceStrategyMonthEnt> monthEntList = monthMapper.selectList(new QueryWrapper<BasePriceStrategyMonthEnt>() List<BasePriceStrategyMonthEnt> monthEntList = monthMapper.selectList(new QueryWrapper<BasePriceStrategyMonthEnt>()
...@@ -229,8 +225,7 @@ public class BasePriceStrategyService { ...@@ -229,8 +225,7 @@ public class BasePriceStrategyService {
monthEnt.setDetails(collect.get(monthEnt.getStrategyMonth())); monthEnt.setDetails(collect.get(monthEnt.getStrategyMonth()));
} }
} }
List<GetBasePriceStrategyMonthOutput> months = new ArrayList<>(16); List<GetBasePriceStrategyMonthOutput> months = XCopyUtils.copyNewList(monthEntList, GetBasePriceStrategyMonthOutput.class);
XCopyUtils.copyList(monthEntList, months, GetBasePriceStrategyMonthOutput.class);
output.setMonths(months); output.setMonths(months);
} }
return XSingleResult.success(output); return XSingleResult.success(output);
...@@ -248,8 +243,7 @@ public class BasePriceStrategyService { ...@@ -248,8 +243,7 @@ public class BasePriceStrategyService {
@XText("市电峰谷策略--分页列表") @XText("市电峰谷策略--分页列表")
public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) { public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) {
BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class); BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class);
BasePriceStrategyView record = new BasePriceStrategyView(); BasePriceStrategyView record = XCopyUtils.copyNewObject(input, BasePriceStrategyView.class);
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit()); PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePriceStrategyView> list = mapper.selectList(record); List<BasePriceStrategyView> list = mapper.selectList(record);
PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list); PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
...@@ -293,62 +287,27 @@ public class BasePriceStrategyService { ...@@ -293,62 +287,27 @@ public class BasePriceStrategyService {
Integer strategyMonth; Integer strategyMonth;
List<BasePriceStrategyDetailEnt> detailList; List<BasePriceStrategyDetailEnt> detailList;
for (BasePriceStrategyMonthEnt monthEnt : monthList) { for (BasePriceStrategyMonthEnt monthEnt : monthList) {
this.setBasePriceStrategyMonthEntDefault(monthEnt, strategyId, session); monthEnt.setStrategyId(strategyId);
this.setBasePriceStrategyEntDefault(monthEnt, session);
monthMapper.insert(monthEnt); monthMapper.insert(monthEnt);
strategyMonth = monthEnt.getStrategyMonth(); strategyMonth = monthEnt.getStrategyMonth();
detailList = monthEnt.getDetails(); detailList = monthEnt.getDetails();
for (BasePriceStrategyDetailEnt detailEnt : detailList) { for (BasePriceStrategyDetailEnt detailEnt : detailList) {
this.setBasePriceStrategyDetailEntDefault(detailEnt, strategyId, strategyMonth, session); detailEnt.setStrategyId(strategyId);
detailEnt.setStrategyMonth(strategyMonth);
this.setBasePriceStrategyEntDefault(detailEnt, session);
detailMapper.insert(detailEnt); detailMapper.insert(detailEnt);
} }
} }
} }
/**
* 设置市电峰谷当月明细配置默认值
*
* @param entity 实体
* @param strategyId 战略id
* @param strategyMonth 战略月
* @param session 会话
*/
private void setBasePriceStrategyDetailEntDefault(BasePriceStrategyDetailEnt entity, String strategyId, Integer strategyMonth, PpsUserSession session) {
Date now = new Date();
entity.setStrategyId(strategyId);
entity.setStrategyMonth(strategyMonth);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(now);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
}
/**
* 设置市电峰谷月配置默认值
*
* @param entity 实体
* @param strategyId 战略id
* @param session 会话
*/
private void setBasePriceStrategyMonthEntDefault(BasePriceStrategyMonthEnt entity, String strategyId, PpsUserSession session) {
Date now = new Date();
entity.setStrategyId(strategyId);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(now);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
}
/** /**
* 设置市电峰谷策略默认值 * 设置市电峰谷策略默认值
* *
* @param entity 实体 * @param entity 实体
* @param session 会话 * @param session 会话
*/ */
private void setBasePriceStrategyEntDefault(BasePriceStrategyEnt entity, PpsUserSession session) { private void setBasePriceStrategyEntDefault(BaseEnt entity, PpsUserSession session) {
String id = entity.getId(); String id = entity.getId();
Date now = new Date(); Date now = new Date();
String userId = session.getId(); String userId = session.getId();
......
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