Skip to content

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

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 62d1bba4
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 150 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineDieselEnt.java
View file @ fe1d3f8d
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路柴发设备配置
......@@ -18,38 +15,7 @@ import java.util.Date;
*/
@Data
@TableName("base_power_line_diesel")
public class BasePowerLineDieselEnt 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;
public class BasePowerLineDieselEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLinePlantEnt.java
View file @ fe1d3f8d
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路光伏配置
......@@ -18,38 +15,7 @@ import java.util.Date;
*/
@Data
@TableName("base_power_line_plant")
public class BasePowerLinePlantEnt 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;
public class BasePowerLinePlantEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineStorageEnt.java
View file @ fe1d3f8d
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路储能配置
......@@ -18,38 +15,7 @@ import java.util.Date;
*/
@Data
@TableName("base_power_line_storage")
public class BasePowerLineStorageEnt 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;
public class BasePowerLineStorageEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadEnt.java
View file @ fe1d3f8d
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
/**
* 输电线路井口配置
......@@ -18,38 +15,7 @@ import java.util.Date;
*/
@Data
@TableName("base_power_line_wellhead")
public class BasePowerLineWellheadEnt 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;
public class BasePowerLineWellheadEnt extends BaseEnt implements Serializable {
@XText("线路ID")
@TableField
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ fe1d3f8d
......@@ -3,10 +3,8 @@ package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.entity.BasePowerLineView;
import pps.core.base.mapper.BasePowerLineMapper;
import pps.core.base.mapper.BasePowerLineViewMapper;
import pps.core.base.entity.*;
import pps.core.base.mapper.*;
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;
......@@ -42,7 +40,7 @@ import java.util.List;
public class BasePowerLineService {
/**
* 输电线路配置模块--新增
* 输电线路配置--新增
*
* @param context 上下文
* @param input 输入
......@@ -50,7 +48,7 @@ public class BasePowerLineService {
*/
@XApiAnonymous
@XApiPost
@XText("输电线路配置模块--新增")
@XText("输电线路配置--新增")
public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = new PpsUserSession();
......@@ -66,22 +64,42 @@ public class BasePowerLineService {
//新增井口配置
List<CreateBasePowerLineWellheadInput> wellheadInputs = input.getWellheadInputs();
if (!wellheadInputs.isEmpty()) {
List<BasePowerLineWellheadEnt> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadEnt.class);
for (BasePowerLineWellheadEnt wellhead : wellheads) {
wellhead.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(wellhead, session);
}
BaseEntUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellheadEnt.class, wellheads);
}
//新增光伏配置
List<CreateBasePowerLinePlantInput> plantInputs = input.getPlantInputs();
if (!plantInputs.isEmpty()) {
List<BasePowerLinePlantEnt> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantEnt.class);
for (BasePowerLinePlantEnt plant : plants) {
plant.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(plant, session);
}
BaseEntUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlantEnt.class, plants);
}
//新增储能配置
List<CreateBasePowerLineStorageInput> storageInputs = input.getStorageInputs();
if (!storageInputs.isEmpty()) {
List<BasePowerLineStorageEnt> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageEnt.class);
for (BasePowerLineStorageEnt storage : storages) {
storage.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(storage, session);
}
BaseEntUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorageEnt.class, storages);
}
//新增柴发配置
List<CreateBasePowerLineDieselInput> dieselInputs = input.getDieselInputs();
if (!dieselInputs.isEmpty()) {
List<BasePowerLineDieselEnt> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselEnt.class);
for (BasePowerLineDieselEnt diesel : diesels) {
diesel.setLineId(lineId);
BaseEntUtils.setBaseEntDefault(diesel, session);
}
BaseEntUtils.batchInsert(BasePowerLineDieselMapper.class, BasePowerLineDieselEnt.class, diesels);
}
return XServiceResult.OK;
});
......
C09-base/pps-core-base/src/main/java/pps/core/base/utils/BaseEntUtils.java
View file @ fe1d3f8d
package pps.core.base.utils;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.apache.commons.lang3.StringUtils;
import pps.core.base.entity.BaseEnt;
import pps.core.common.session.PpsUserSession;
import java.util.Collection;
import java.util.Date;
/**
......@@ -34,4 +37,18 @@ public class BaseEntUtils {
entity.setModifyByName(userName);
entity.setModifyTime(now);
}
/**
* 批量插入
*
* @param mapper 映射器
* @param entityClass 实体类
* @param list 列表
*/
public static <E> void batchInsert(Class<?> mapper, Class<?> entityClass, Collection<E> list) {
String sqlStatement = SqlHelper.getSqlStatement(mapper, SqlMethod.INSERT_ONE);
SqlHelper.executeBatch(entityClass, null, list, 1000, (sqlSession, ent) -> {
sqlSession.insert(sqlStatement, ent);
});
}
}
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