Skip to content

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

feat(零碳): 长庆 

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;
4.开发井口配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
5.开发第三方有功功率历史数据导入接口,增加模板配置类,添加线上接口文档并完成接口冒烟测试;
6.开发给长庆使用的获取第三方认证token接口,验证获取token后是否能正常跳转指定页面,创建长庆用演示用户及角色;
7.开发柴发设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
8.开发储能设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
9.开发柴发设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
10.开发井口设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
11.开发光伏电站设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
12.开发储能设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
13.基础信息配置模块,修改光伏电站分页查询列表接口,增加排序逻辑,按照组织机构名称和电站名称升序排序;
14.基础信息配置模块,修改光伏电站模板导出接口,修改导出逻辑,不只是导出模板,增加查询条件,按条件及模板格式导出当前页电站数据;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 08112388
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 19 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/ExcelService.java
View file @ 2336764c
......@@ -17,6 +17,8 @@ import pps.core.base.service.data.base_excel.ExcelDieselGeneratorTemplate;
import pps.core.base.service.data.base_excel.ExcelEnergyStorageDeviceTemplate;
import pps.core.base.service.data.base_excel.ExcelPhotovoltaicPlantTemplate;
import pps.core.base.service.data.base_excel.ExcelWellheadTemplate;
import pps.core.base.service.data.base_photovoltaic_plant.QueryBasePhotovoltaicPlantInput;
import pps.core.base.service.data.base_photovoltaic_plant.QueryBasePhotovoltaicPlantOutput;
import pps.core.base.service.data.excel.ImportExcelInput;
import pps.core.base.utils.ServiceUtil;
import pps.core.common.constant.BusinessConstant;
......@@ -33,10 +35,7 @@ import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.base.tool.XStorageTool;
import xstartup.data.XFileResult;
import xstartup.data.XFileType;
import xstartup.data.XServiceResult;
import xstartup.data.XUploadFile;
import xstartup.data.*;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiUpload;
import xstartup.helper.XTransactionHelper;
......@@ -57,17 +56,49 @@ import java.util.stream.Collectors;
public class ExcelService {
/**
* 光伏电站配置模板导出
* 光伏电站配置导出
*
* @param context 上下文
* @return {@link XFileResult}
*/
@XText("光伏电站配置模板导出")
@XText("光伏电站配置导出")
@XApiGet(anonymous = true)
public XFileResult templatePhotovoltaicPlant(XContext context) {
public XFileResult exportPhotovoltaicPlant(XContext context, QueryBasePhotovoltaicPlantInput input) {
List<QuerySysAreaOutput> provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃");
//分页条件查询光伏电站列表
BasePhotovoltaicPlantService bean = context.getBean(BasePhotovoltaicPlantService.class);
XPageResult<QueryBasePhotovoltaicPlantOutput> result = bean.queryBasePhotovoltaicPlant(context, input);
List<ExcelPhotovoltaicPlantTemplate> list;
List<QueryBasePhotovoltaicPlantOutput> items = result.getResult().getItems();
if (CollUtil.isNotEmpty(items)) {
Map<Integer, QuerySysAreaOutput> collect = provinceAndCityList.stream()
.collect(Collectors.toMap(QuerySysAreaOutput::getId, Function.identity()));
list = new ArrayList<>(items.size());
//封装并填充数据
for (QueryBasePhotovoltaicPlantOutput item : items) {
QuerySysAreaOutput area = collect.get(item.getAreaCode());
list.add(
ExcelPhotovoltaicPlantTemplate.builder()
.province(area.getProvince())
.city(area.getCity())
.ouName(item.getOuName())
.stationName(item.getStationName())
.makerNumber(item.getMakerNumber())
.photovoltaicModelName(item.getPhotovoltaicModelName())
.mountingAngle(item.getMountingAngle().toString())
.totalPower(item.getTotalPower().toString())
.arrayOrientation(item.getArrayOrientation().toString())
.longitude(item.getLongitude().toString())
.latitude(item.getLatitude().toString())
.elevation(item.getElevation().toString())
.build()
);
}
} else {
list = Collections.emptyList();
}
//查地区列表
Map<String, List<QuerySysAreaOutput>> collect = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃")
.stream()
Map<String, List<QuerySysAreaOutput>> collect = provinceAndCityList.stream()
.collect(Collectors.groupingBy(QuerySysAreaOutput::getProvince));
//整理数据，放入一个Map中，key存放父地点，value 存放该地点下的子区域
Map<String, List<String>> siteMap = new HashMap<>(collect.size());
......@@ -87,21 +118,21 @@ public class ExcelService {
.registerWriteHandler(new CascadeWriteHandler(provNameList, siteMap))
.autoCloseStream(Boolean.TRUE)
.build()
.write(Collections.emptyList(),
.write(list,
EasyExcelUtil.writeSelectedSheet(ExcelPhotovoltaicPlantTemplate.class, 0, "光伏电站配置")
).finish();
return XFileResult.success(XFileType.APPLICATION_XLSX, fileSavePath);
}
/**
* 井口配置模板导出
* 井口配置导出
*
* @param context 上下文
* @return {@link XFileResult}
*/
@XText("井口配置模板导出")
@XText("井口配置导出")
@XApiGet(anonymous = true)
public XFileResult templateWellhead(XContext context) {
public XFileResult exportWellhead(XContext context) {
String fileSavePath = XStorageTool.getAbsolutePath("/temp/excel/井口配置模板.xlsx");
//生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath))
......@@ -116,14 +147,14 @@ public class ExcelService {
}
/**
* 柴发设备配置模板导出
* 柴发设备配置导出
*
* @param context 上下文
* @return {@link XFileResult}
*/
@XText("柴发设备配置模板导出")
@XText("柴发设备配置导出")
@XApiGet(anonymous = true)
public XFileResult templateDieselGenerator(XContext context) {
public XFileResult exportDieselGenerator(XContext context) {
String fileSavePath = XStorageTool.getAbsolutePath("/temp/excel/柴发设备配置模板.xlsx");
//生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath))
......@@ -138,14 +169,14 @@ public class ExcelService {
}
/**
* 储能设备配置模板导出
* 储能设备配置导出
*
* @param context 上下文
* @return {@link XFileResult}
*/
@XText("储能设备配置模板导出")
@XText("储能设备配置导出")
@XApiGet(anonymous = true)
public XFileResult templateEnergyStorageDevice(XContext context) {
public XFileResult exportEnergyStorageDevice(XContext context) {
String fileSavePath = XStorageTool.getAbsolutePath("/temp/excel/储能设备配置模板.xlsx");
//生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath))
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_excel/ExcelDieselGeneratorTemplate.java
View file @ 2336764c
......@@ -3,7 +3,10 @@ package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.common.excel.config.ExcelSelected;
......@@ -16,6 +19,9 @@ import java.io.Serializable;
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ExcelDieselGeneratorTemplate implements Serializable {
private static final long serialVersionUID = -6773651457799858074L;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_excel/ExcelEnergyStorageDeviceTemplate.java
View file @ 2336764c
......@@ -3,7 +3,10 @@ package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.common.excel.config.ExcelSelected;
......@@ -16,6 +19,9 @@ import java.io.Serializable;
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ExcelEnergyStorageDeviceTemplate implements Serializable {
private static final long serialVersionUID = -6239358694782042550L;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_excel/ExcelPhotovoltaicPlantTemplate.java
View file @ 2336764c
......@@ -3,7 +3,10 @@ package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.common.excel.config.ExcelSelected;
......@@ -16,6 +19,9 @@ import java.io.Serializable;
* @date 2024/05/07
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ExcelPhotovoltaicPlantTemplate implements Serializable {
private static final long serialVersionUID = -9069694443646671657L;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_excel/ExcelWellheadTemplate.java
View file @ 2336764c
......@@ -3,7 +3,10 @@ package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.base.excel.RunTypeImpl;
import pps.core.common.excel.config.ExcelSelected;
......@@ -17,6 +20,9 @@ import java.io.Serializable;
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ExcelWellheadTemplate implements Serializable {
private static final long serialVersionUID = -6773651457799858074L;
......
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