Commit ecebde5d authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取;
2.修改统计分析-间开效果评价新页面累节电能接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
3.修改统计分析-能耗分析新页面峰谷能耗对比分析接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
4.吉林首页井场用能分析模块开放井场用能分析双坐标轴接口,备用;
5.修改首页光伏实时监控接口,解决选择查看部分采油厂接口报错提示异常问题;
6.修改统计分析能耗分析新页面今日昨日同期电量信息统计接口,增加添加默认值逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6c3b2597
......@@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.EasyExcelFactory;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput;
import pps.cloud.system.service.data.sys_dictionary.GetSysDictionaryViewOutput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
......@@ -38,6 +40,7 @@ import xstartup.base.tool.XStorageTool;
import xstartup.data.XFileResult;
import xstartup.data.XFileType;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiUpload;
import xstartup.helper.XTransactionHelper;
......@@ -67,7 +70,7 @@ public class ExcelService {
@XText("光伏电站配置导出")
@XApiGet
public XFileResult exportPhotovoltaicPlant(XContext context, QueryBasePhotovoltaicPlantInput input) {
List<QuerySysAreaOutput> provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃");
List<QuerySysAreaOutput> provinceAndCityList = this.getProvinceAndCityList(context);
this.setPageDefault(input);
//分页条件查询光伏电站列表
List<ExcelPhotovoltaicPlantTemplate> list;
......@@ -342,7 +345,7 @@ public class ExcelService {
}
//整理各种字典数据
Map<String, String> ouMap = this.getPlantMap(context);
Map<String, Integer> city = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃").stream()
Map<String, Integer> city = this.getProvinceAndCityList(context).stream()
.collect(Collectors.toMap(QuerySysAreaOutput::getCity, QuerySysAreaOutput::getId));
//封装并校验电站名称(校验电站名称是否重复,重复不导入),并插入数据
Set<String> collect = context.getBean(BasePhotovoltaicPlantMapper.class)
......@@ -723,4 +726,27 @@ public class ExcelService {
return ServiceUtil.getPlantList(context).stream()
.collect(Collectors.toMap(GetSysOrganizationViewOutput::getOuName, GetSysOrganizationViewOutput::getId));
}
/**
* 获取省份和城市列表
*
* @param context 上下文
* @return {@link List }<{@link QuerySysAreaOutput }>
*/
private List<QuerySysAreaOutput> getProvinceAndCityList(XContext context) {
List<QuerySysAreaOutput> provinceAndCityList;
//区分环境
ConfigOilFieldCloudServiceImpl service = context.getBean(ConfigOilFieldCloudServiceImpl.class);
XSingleResult<GetConfigOilFieldOutput> currentConfig = service.getCurrentConfig(context);
currentConfig.throwIfFail();
String envValue = ObjectUtil.defaultIfNull(currentConfig.getResult().getOilFieldCode(), BusinessConstant.DEFAULT_VALUE);
switch (envValue) {
case BusinessConstant.ENV_SY:
provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "吉林");
break;
default:
provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃");
}
return provinceAndCityList;
}
}
\ 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