Commit 9b89b4ac authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a22a6a71
...@@ -59,12 +59,14 @@ public class BasePowerLineService { ...@@ -59,12 +59,14 @@ public class BasePowerLineService {
BaseEntUtils.setBaseEntDefault(entity, session); BaseEntUtils.setBaseEntDefault(entity, session);
mapper.insert(entity); mapper.insert(entity);
String lineId = entity.getId(); String lineId = entity.getId();
String ouId = entity.getOuId();
//新增井口配置 //新增井口配置
List<CreateBasePowerLineWellheadInput> wellheadInputs = input.getWellheadInputs(); List<CreateBasePowerLineWellheadInput> wellheadInputs = input.getWellheadInputs();
if (!wellheadInputs.isEmpty()) { if (!wellheadInputs.isEmpty()) {
List<BasePowerLineWellheadEnt> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadEnt.class); List<BasePowerLineWellheadEnt> wellheads = XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadEnt.class);
for (BasePowerLineWellheadEnt wellhead : wellheads) { for (BasePowerLineWellheadEnt wellhead : wellheads) {
wellhead.setLineId(lineId); wellhead.setLineId(lineId);
wellhead.setOuId(ouId);
BaseEntUtils.setBaseEntDefault(wellhead, session); BaseEntUtils.setBaseEntDefault(wellhead, session);
} }
BaseEntUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellheadEnt.class, wellheads); BaseEntUtils.batchInsert(BasePowerLineWellheadMapper.class, BasePowerLineWellheadEnt.class, wellheads);
...@@ -75,6 +77,7 @@ public class BasePowerLineService { ...@@ -75,6 +77,7 @@ public class BasePowerLineService {
List<BasePowerLinePlantEnt> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantEnt.class); List<BasePowerLinePlantEnt> plants = XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantEnt.class);
for (BasePowerLinePlantEnt plant : plants) { for (BasePowerLinePlantEnt plant : plants) {
plant.setLineId(lineId); plant.setLineId(lineId);
plant.setOuId(ouId);
BaseEntUtils.setBaseEntDefault(plant, session); BaseEntUtils.setBaseEntDefault(plant, session);
} }
BaseEntUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlantEnt.class, plants); BaseEntUtils.batchInsert(BasePowerLinePlantMapper.class, BasePowerLinePlantEnt.class, plants);
...@@ -85,6 +88,7 @@ public class BasePowerLineService { ...@@ -85,6 +88,7 @@ public class BasePowerLineService {
List<BasePowerLineStorageEnt> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageEnt.class); List<BasePowerLineStorageEnt> storages = XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageEnt.class);
for (BasePowerLineStorageEnt storage : storages) { for (BasePowerLineStorageEnt storage : storages) {
storage.setLineId(lineId); storage.setLineId(lineId);
storage.setOuId(ouId);
BaseEntUtils.setBaseEntDefault(storage, session); BaseEntUtils.setBaseEntDefault(storage, session);
} }
BaseEntUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorageEnt.class, storages); BaseEntUtils.batchInsert(BasePowerLineStorageMapper.class, BasePowerLineStorageEnt.class, storages);
...@@ -95,6 +99,7 @@ public class BasePowerLineService { ...@@ -95,6 +99,7 @@ public class BasePowerLineService {
List<BasePowerLineDieselEnt> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselEnt.class); List<BasePowerLineDieselEnt> diesels = XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselEnt.class);
for (BasePowerLineDieselEnt diesel : diesels) { for (BasePowerLineDieselEnt diesel : diesels) {
diesel.setLineId(lineId); diesel.setLineId(lineId);
diesel.setOuId(ouId);
BaseEntUtils.setBaseEntDefault(diesel, session); BaseEntUtils.setBaseEntDefault(diesel, session);
} }
BaseEntUtils.batchInsert(BasePowerLineDieselMapper.class, BasePowerLineDieselEnt.class, diesels); BaseEntUtils.batchInsert(BasePowerLineDieselMapper.class, BasePowerLineDieselEnt.class, diesels);
......
...@@ -14,7 +14,4 @@ public class CreateBasePowerLineDieselInput { ...@@ -14,7 +14,4 @@ public class CreateBasePowerLineDieselInput {
@XText("柴发设备ID") @XText("柴发设备ID")
private String dieselId; private String dieselId;
@XText("组织机构ID")
private String ouId;
} }
...@@ -14,7 +14,4 @@ public class CreateBasePowerLinePlantInput { ...@@ -14,7 +14,4 @@ public class CreateBasePowerLinePlantInput {
@XText("光伏电站ID") @XText("光伏电站ID")
private String plantId; private String plantId;
@XText("组织机构ID")
private String ouId;
} }
...@@ -14,7 +14,4 @@ public class CreateBasePowerLineStorageInput { ...@@ -14,7 +14,4 @@ public class CreateBasePowerLineStorageInput {
@XText("储能设备ID") @XText("储能设备ID")
private String storageId; private String storageId;
@XText("组织机构ID")
private String ouId;
} }
...@@ -14,7 +14,4 @@ public class CreateBasePowerLineWellheadInput { ...@@ -14,7 +14,4 @@ public class CreateBasePowerLineWellheadInput {
@XText("井口ID") @XText("井口ID")
private String wellheadId; private String wellheadId;
@XText("组织机构ID")
private String ouId;
} }
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