Commit 1098903e authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;
4.开发井口配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
5.开发第三方有功功率历史数据导入接口,增加模板配置类,添加线上接口文档并完成接口冒烟测试;
6.开发给长庆使用的获取第三方认证token接口,验证获取token后是否能正常跳转指定页面,创建长庆用演示用户及角色;
7.开发柴发设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
8.开发储能设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7fc4b9eb
...@@ -7,8 +7,6 @@ import com.alibaba.excel.EasyExcel; ...@@ -7,8 +7,6 @@ import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.sys_area.QuerySysAreaInput;
import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput; import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput;
import pps.core.base.entity.BasePhotovoltaicPlantEnt; import pps.core.base.entity.BasePhotovoltaicPlantEnt;
import pps.core.base.entity.BasePhotovoltaicPlantView; import pps.core.base.entity.BasePhotovoltaicPlantView;
...@@ -19,6 +17,7 @@ import pps.core.base.service.data.base_excel.ExcelEnergyStorageDeviceTemplate; ...@@ -19,6 +17,7 @@ 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.ExcelPhotovoltaicPlantTemplate;
import pps.core.base.service.data.base_excel.ExcelWellheadTemplate; import pps.core.base.service.data.base_excel.ExcelWellheadTemplate;
import pps.core.base.service.data.excel.ImportExcelInput; import pps.core.base.service.data.excel.ImportExcelInput;
import pps.core.base.utils.ServiceUtil;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import pps.core.common.excel.config.CascadeWriteHandler; import pps.core.common.excel.config.CascadeWriteHandler;
import pps.core.common.excel.listener.ExcelListener; import pps.core.common.excel.listener.ExcelListener;
...@@ -30,7 +29,10 @@ import xstartup.annotation.XText; ...@@ -30,7 +29,10 @@ import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.exception.XServiceException; import xstartup.base.exception.XServiceException;
import xstartup.base.tool.XStorageTool; import xstartup.base.tool.XStorageTool;
import xstartup.data.*; import xstartup.data.XFileResult;
import xstartup.data.XFileType;
import xstartup.data.XServiceResult;
import xstartup.data.XUploadFile;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiUpload; import xstartup.feature.api.annotation.XApiUpload;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
...@@ -59,12 +61,8 @@ public class ExcelService { ...@@ -59,12 +61,8 @@ public class ExcelService {
@XApiGet(anonymous = true) @XApiGet(anonymous = true)
public XFileResult templatePhotovoltaicPlant(XContext context) { public XFileResult templatePhotovoltaicPlant(XContext context) {
//查地区列表 //查地区列表
SystemAreaService bean = context.getBean(SystemAreaService.class); Map<String, List<QuerySysAreaOutput>> collect = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃")
XListResult<QuerySysAreaOutput> result = bean.getProvinceAndCity(context, QuerySysAreaInput.builder() .stream()
.provinceList(CollUtil.toList("陕西", "甘肃"))
.build());
result.throwIfFail();
Map<String, List<QuerySysAreaOutput>> collect = result.getResult().stream()
.collect(Collectors.groupingBy(QuerySysAreaOutput::getProvince)); .collect(Collectors.groupingBy(QuerySysAreaOutput::getProvince));
//整理数据,放入一个Map中,key存放父地点,value 存放该地点下的子区域 //整理数据,放入一个Map中,key存放父地点,value 存放该地点下的子区域
Map<String, List<String>> siteMap = new HashMap<>(collect.size()); Map<String, List<String>> siteMap = new HashMap<>(collect.size());
......
package pps.core.base.utils; package pps.core.base.utils;
import cn.hutool.core.collection.CollUtil;
import pps.cloud.system.service.SysOrganizationCloudService; import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.SystemDictionaryService; import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput; import pps.cloud.system.service.data.sys_area.QuerySysAreaInput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput; import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput;
import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput; import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput; import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XListResult; import xstartup.data.XListResult;
...@@ -59,4 +63,20 @@ public class ServiceUtil { ...@@ -59,4 +63,20 @@ public class ServiceUtil {
.map(GetSysOrganizationViewOutput::getId) .map(GetSysOrganizationViewOutput::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
/**
* 获取省市列表
*
* @param context 上下文
* @param province 省份
* @return {@link List }<{@link QuerySysAreaOutput }>
*/
public static List<QuerySysAreaOutput> getProvinceAndCityList(XContext context, String... province) {
SystemAreaService bean = context.getBean(SystemAreaService.class);
XListResult<QuerySysAreaOutput> result = bean.getProvinceAndCity(context, QuerySysAreaInput.builder()
.provinceList(CollUtil.toList(province))
.build());
result.throwIfFail();
return result.getResult();
}
} }
\ No newline at end of file
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