Commit 71aa70a8 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 0c068c93
package pps.core.base.entity; package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -15,6 +18,9 @@ import java.math.BigDecimal; ...@@ -15,6 +18,9 @@ import java.math.BigDecimal;
* @date 2023/09/08 * @date 2023/09/08
*/ */
@Data @Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class BaseDieselGeneratorView extends BaseModel implements Serializable { public class BaseDieselGeneratorView extends BaseModel implements Serializable {
@XText("组织机构ID") @XText("组织机构ID")
......
...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.base.entity.BaseDieselGeneratorEnt; import pps.core.base.entity.BaseDieselGeneratorEnt;
/**
* 柴发设备
*
* @author ZWT
* @date 2024/05/11
*/
@Repository(value = "pps.core.base.mapper.BaseDieselGeneratorMapper") @Repository(value = "pps.core.base.mapper.BaseDieselGeneratorMapper")
public interface BaseDieselGeneratorMapper extends BaseMapper<BaseDieselGeneratorEnt> { public interface BaseDieselGeneratorMapper extends BaseMapper<BaseDieselGeneratorEnt> {
} }
...@@ -5,6 +5,12 @@ import pps.core.base.entity.BaseDieselGeneratorView; ...@@ -5,6 +5,12 @@ import pps.core.base.entity.BaseDieselGeneratorView;
import java.util.List; import java.util.List;
/**
* 柴发设备
*
* @author ZWT
* @date 2024/05/11
*/
@Repository(value = "pps.core.base.mapper.BaseDieselGeneratorViewMapper") @Repository(value = "pps.core.base.mapper.BaseDieselGeneratorViewMapper")
public interface BaseDieselGeneratorViewMapper { public interface BaseDieselGeneratorViewMapper {
BaseDieselGeneratorView selectOne(BaseDieselGeneratorView record); BaseDieselGeneratorView selectOne(BaseDieselGeneratorView record);
......
...@@ -10,15 +10,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -10,15 +10,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput; 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_dictionary.GetSysDictionaryViewOutput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput; import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
import pps.core.base.entity.BasePhotovoltaicPlantEnt; import pps.core.base.entity.*;
import pps.core.base.entity.BasePhotovoltaicPlantView;
import pps.core.base.entity.BaseWellheadEnt;
import pps.core.base.entity.BaseWellheadView;
import pps.core.base.enums.BusinessError; import pps.core.base.enums.BusinessError;
import pps.core.base.mapper.BasePhotovoltaicPlantMapper; import pps.core.base.mapper.*;
import pps.core.base.mapper.BasePhotovoltaicPlantViewMapper;
import pps.core.base.mapper.BaseWellheadMapper;
import pps.core.base.mapper.BaseWellheadViewMapper;
import pps.core.base.service.data.base_excel.ExcelDieselGeneratorTemplate; 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.ExcelEnergyStorageDeviceTemplate;
import pps.core.base.service.data.base_excel.ExcelPhotovoltaicPlantTemplate; import pps.core.base.service.data.base_excel.ExcelPhotovoltaicPlantTemplate;
...@@ -304,8 +298,49 @@ public class ExcelService { ...@@ -304,8 +298,49 @@ public class ExcelService {
@XText("柴发设备配置导入") @XText("柴发设备配置导入")
@XApiUpload(anonymous = true) @XApiUpload(anonymous = true)
public XServiceResult importDieselGenerator(XContext context, ImportExcelInput input) { public XServiceResult importDieselGenerator(XContext context, ImportExcelInput input) {
// List<ExcelDieselGeneratorTemplate> list = this.getExcelDataAndCheck(input.getFile(), ExcelDieselGeneratorTemplate.class); List<ExcelDieselGeneratorTemplate> list = this.getExcelDataAndCheck(input.getFile(), ExcelDieselGeneratorTemplate.class,
"设备名称", ExcelDieselGeneratorTemplate::getDeviceName);
//整理各种字典数据
Map<String, String> ouMap = this.getPlantMap(context);
//封装并校验设备名称(校验设备名称是否重复,重复不导入),并插入数据
Set<String> collect = context.getBean(BaseDieselGeneratorMapper.class)
.selectList(new LambdaQueryWrapper<BaseDieselGeneratorEnt>()
.eq(BaseModel::getIsDeleted, 1)
).stream()
.map(BaseDieselGeneratorEnt::getDeviceName)
.collect(Collectors.toSet());
StringBuilder stringBuilder = new StringBuilder();
List<BaseDieselGeneratorView> insertList = new ArrayList<>(list.size());
int rowNum = 2;
for (ExcelDieselGeneratorTemplate ent : list) {
//检查名称是否重复
if (collect.contains(ent.getDeviceName())) {
if (0 == stringBuilder.length()) {
stringBuilder.append("数据导入成功: ");
}
stringBuilder.append("第").append(rowNum).append("行,[设备名称重复]");
} else {
//数据封装
BaseDieselGeneratorView build = BaseDieselGeneratorView.builder()
.ouName(ent.getOuName())
.ouId(ouMap.get(ent.getOuName()))
.build();
BaseUtils.createBaseModelDefault(build, context.getSession(PpsUserSession.class));
insertList.add(build);
}
rowNum++;
}
return XTransactionHelper.begin(context, () -> {
if (CollUtil.isNotEmpty(insertList)) {
BaseDieselGeneratorViewMapper viewMapper = context.getBean(BaseDieselGeneratorViewMapper.class);
// viewMapper.batchInsertList(insertList);
}
if (stringBuilder.length() > 0) {
return XServiceResult.error(-1, stringBuilder.toString());
}
return XServiceResult.OK; return XServiceResult.OK;
});
} }
/** /**
......
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