Commit c2900fce 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 e35bff65
...@@ -175,7 +175,7 @@ public class ExcelService { ...@@ -175,7 +175,7 @@ public class ExcelService {
@XText("井口配置导入") @XText("井口配置导入")
@XApiUpload(anonymous = true) @XApiUpload(anonymous = true)
public XServiceResult importWellhead(XContext context, ImportExcelInput input) { public XServiceResult importWellhead(XContext context, ImportExcelInput input) {
XUploadFile file = input.getFile(); List<ExcelWellheadTemplate> list = this.getExcelDataAndCheck(input.getFile(), ExcelWellheadTemplate.class);
return XServiceResult.OK; return XServiceResult.OK;
} }
...@@ -189,7 +189,7 @@ public class ExcelService { ...@@ -189,7 +189,7 @@ 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) {
XUploadFile file = input.getFile(); List<ExcelDieselGeneratorTemplate> list = this.getExcelDataAndCheck(input.getFile(), ExcelDieselGeneratorTemplate.class);
return XServiceResult.OK; return XServiceResult.OK;
} }
...@@ -203,7 +203,7 @@ public class ExcelService { ...@@ -203,7 +203,7 @@ public class ExcelService {
@XText("储能设备配置导入") @XText("储能设备配置导入")
@XApiUpload(anonymous = true) @XApiUpload(anonymous = true)
public XServiceResult importEnergyStorageDevice(XContext context, ImportExcelInput input) { public XServiceResult importEnergyStorageDevice(XContext context, ImportExcelInput input) {
XUploadFile file = input.getFile(); List<ExcelEnergyStorageDeviceTemplate> list = this.getExcelDataAndCheck(input.getFile(), ExcelEnergyStorageDeviceTemplate.class);
return XServiceResult.OK; return XServiceResult.OK;
} }
......
package pps.core.base.service.data.base_excel; package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import pps.core.base.excel.OilExtractionPlantImpl; import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.common.excel.config.ExcelSelected; import pps.core.common.excel.config.ExcelSelected;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
/** /**
* excel柴发设备模板 * excel柴发设备模板
...@@ -22,6 +23,7 @@ public class ExcelDieselGeneratorTemplate implements Serializable { ...@@ -22,6 +23,7 @@ public class ExcelDieselGeneratorTemplate implements Serializable {
/** /**
* 采油厂名称 * 采油厂名称
*/ */
@NotBlank(message = "缺少采油厂")
@ExcelSelected(sourceClass = OilExtractionPlantImpl.class) @ExcelSelected(sourceClass = OilExtractionPlantImpl.class)
@ExcelProperty(index = 0, value = "采油厂名称") @ExcelProperty(index = 0, value = "采油厂名称")
private String ouName; private String ouName;
...@@ -29,30 +31,37 @@ public class ExcelDieselGeneratorTemplate implements Serializable { ...@@ -29,30 +31,37 @@ public class ExcelDieselGeneratorTemplate implements Serializable {
/** /**
* 设备名称 * 设备名称
*/ */
@NotBlank(message = "缺少设备名称")
@ExcelProperty(index = 1, value = "设备名称") @ExcelProperty(index = 1, value = "设备名称")
private String deviceName; private String deviceName;
/** /**
* 出厂编号 * 出厂编号
*/ */
@NotBlank(message = "缺少出厂编号")
@ExcelProperty(index = 2, value = "出厂编号") @ExcelProperty(index = 2, value = "出厂编号")
private String makerNumber; private String makerNumber;
/** /**
* 机组型号 * 机组型号
*/ */
@NotBlank(message = "缺少机组型号")
@ExcelProperty(index = 3, value = "机组型号") @ExcelProperty(index = 3, value = "机组型号")
private String unitTypeName; private String unitTypeName;
/** /**
* 常用功率(KW) * 常用功率(KW)
*/ */
@NotBlank(message = "缺少常用功率")
@Min(value = 0, message = "常用功率为数字")
@ExcelProperty(index = 4, value = "常用功率(KW)") @ExcelProperty(index = 4, value = "常用功率(KW)")
private BigDecimal normalPower; private String normalPower;
/** /**
* 备用功率(KW) * 备用功率(KW)
*/ */
@NotBlank(message = "缺少备用功率")
@Min(value = 0, message = "备用功率为数字")
@ExcelProperty(index = 5, value = "备用功率(KW)") @ExcelProperty(index = 5, value = "备用功率(KW)")
private BigDecimal standbyPower; private String standbyPower;
} }
\ No newline at end of file
package pps.core.base.service.data.base_excel; package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import pps.core.base.excel.OilExtractionPlantImpl; import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.common.excel.config.ExcelSelected; import pps.core.common.excel.config.ExcelSelected;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
/** /**
* excel储能设备模板 * excel储能设备模板
...@@ -22,6 +23,7 @@ public class ExcelEnergyStorageDeviceTemplate implements Serializable { ...@@ -22,6 +23,7 @@ public class ExcelEnergyStorageDeviceTemplate implements Serializable {
/** /**
* 采油厂名称 * 采油厂名称
*/ */
@NotBlank(message = "缺少采油厂")
@ExcelSelected(sourceClass = OilExtractionPlantImpl.class) @ExcelSelected(sourceClass = OilExtractionPlantImpl.class)
@ExcelProperty(index = 0, value = "采油厂名称") @ExcelProperty(index = 0, value = "采油厂名称")
private String ouName; private String ouName;
...@@ -29,48 +31,61 @@ public class ExcelEnergyStorageDeviceTemplate implements Serializable { ...@@ -29,48 +31,61 @@ public class ExcelEnergyStorageDeviceTemplate implements Serializable {
/** /**
* 设备名称 * 设备名称
*/ */
@NotBlank(message = "缺少设备名称")
@ExcelProperty(index = 1, value = "设备名称") @ExcelProperty(index = 1, value = "设备名称")
private String deviceName; private String deviceName;
/** /**
* 出厂编号 * 出厂编号
*/ */
@NotBlank(message = "缺少出厂编号")
@ExcelProperty(index = 2, value = "出厂编号") @ExcelProperty(index = 2, value = "出厂编号")
private String makerNumber; private String makerNumber;
/** /**
* 规格型号 * 规格型号
*/ */
@NotBlank(message = "缺少规格型号")
@ExcelProperty(index = 3, value = "规格型号") @ExcelProperty(index = 3, value = "规格型号")
private String storageModelName; private String storageModelName;
/** /**
* 设备容量(KWh) * 设备容量(KWh)
*/ */
@NotBlank(message = "缺少设备容量")
@Min(value = 0, message = "设备容量为数字")
@ExcelProperty(index = 4, value = "设备容量(KWh)") @ExcelProperty(index = 4, value = "设备容量(KWh)")
private BigDecimal apparatusCapacity; private String apparatusCapacity;
/** /**
* 额定放电功率(KW) * 额定放电功率(KW)
*/ */
@NotBlank(message = "缺少额定放电功率")
@Min(value = 0, message = "额定放电功率为数字")
@ExcelProperty(index = 5, value = "额定放电功率(KW)") @ExcelProperty(index = 5, value = "额定放电功率(KW)")
private BigDecimal ratedDischargePower; private String ratedDischargePower;
/** /**
* 额定充电功率(KW) * 额定充电功率(KW)
*/ */
@NotBlank(message = "缺少额定充电功率")
@Min(value = 0, message = "额定充电功率为数字")
@ExcelProperty(index = 6, value = "额定充电功率(KW)") @ExcelProperty(index = 6, value = "额定充电功率(KW)")
private BigDecimal ratedChargingPower; private String ratedChargingPower;
/** /**
* 额定放电深度(%) * 额定放电深度(%)
*/ */
@NotBlank(message = "缺少额定放电深度")
@Min(value = 0, message = "额定放电深度为数字")
@ExcelProperty(index = 7, value = "额定放电深度(%)") @ExcelProperty(index = 7, value = "额定放电深度(%)")
private BigDecimal ratedDischargeDepth; private String ratedDischargeDepth;
/** /**
* 额定放电效率(%) * 额定放电效率(%)
*/ */
@NotBlank(message = "缺少额定放电效率")
@Min(value = 0, message = "额定放电效率为数字")
@ExcelProperty(index = 8, value = "额定放电效率(%)") @ExcelProperty(index = 8, value = "额定放电效率(%)")
private BigDecimal ratedDischargeEfficiency; private String ratedDischargeEfficiency;
} }
\ No newline at end of file
...@@ -64,42 +64,48 @@ public class ExcelPhotovoltaicPlantTemplate implements Serializable { ...@@ -64,42 +64,48 @@ public class ExcelPhotovoltaicPlantTemplate implements Serializable {
/** /**
* 安装倾角(°) * 安装倾角(°)
*/ */
@Min(value = 0, message = "缺少安装倾角") @NotBlank(message = "缺少安装倾角")
@Min(value = 0, message = "安装倾角为数字")
@ExcelProperty(index = 6, value = "安装倾角(°)") @ExcelProperty(index = 6, value = "安装倾角(°)")
private String mountingAngle; private String mountingAngle;
/** /**
* 装机总量(KWP) * 装机总量(KWP)
*/ */
@Min(value = 0, message = "缺少装机总量") @NotBlank(message = "缺少装机总量")
@Min(value = 0, message = "装机总量为数字")
@ExcelProperty(index = 7, value = "装机总量(KWP)") @ExcelProperty(index = 7, value = "装机总量(KWP)")
private String totalPower; private String totalPower;
/** /**
* 阵列朝向 * 阵列朝向
*/ */
@Min(value = 0, message = "缺少阵列朝向") @NotBlank(message = "缺少阵列朝向")
@Min(value = 0, message = "阵列朝向为数字")
@ExcelProperty(index = 8, value = "阵列朝向") @ExcelProperty(index = 8, value = "阵列朝向")
private String arrayOrientation; private String arrayOrientation;
/** /**
* 经度(°) * 经度(°)
*/ */
@Min(value = 0, message = "缺少经度") @NotBlank(message = "缺少经度")
@Min(value = 0, message = "经度为数字")
@ExcelProperty(index = 9, value = "经度(°)") @ExcelProperty(index = 9, value = "经度(°)")
private String longitude; private String longitude;
/** /**
* 纬度(°) * 纬度(°)
*/ */
@Min(value = 0, message = "缺少纬度") @NotBlank(message = "缺少纬度")
@Min(value = 0, message = "纬度为数字")
@ExcelProperty(index = 10, value = "纬度(°)") @ExcelProperty(index = 10, value = "纬度(°)")
private String latitude; private String latitude;
/** /**
* 高程(m) * 高程(m)
*/ */
@Min(value = 0, message = "缺少高程") @NotBlank(message = "缺少高程")
@Min(value = 0, message = "高程为数字")
@ExcelProperty(index = 11, value = "高程(m)") @ExcelProperty(index = 11, value = "高程(m)")
private String elevation; private String elevation;
} }
\ No newline at end of file
package pps.core.base.service.data.base_excel; package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import pps.core.base.excel.OilExtractionPlantImpl; import pps.core.base.excel.OilExtractionPlantImpl;
import pps.core.base.excel.RunTypeImpl; import pps.core.base.excel.RunTypeImpl;
import pps.core.common.excel.config.ExcelSelected; import pps.core.common.excel.config.ExcelSelected;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
/** /**
* excel井口模板 * excel井口模板
...@@ -23,6 +24,7 @@ public class ExcelWellheadTemplate implements Serializable { ...@@ -23,6 +24,7 @@ public class ExcelWellheadTemplate implements Serializable {
/** /**
* 采油厂名称 * 采油厂名称
*/ */
@NotBlank(message = "缺少采油厂名称")
@ExcelSelected(sourceClass = OilExtractionPlantImpl.class) @ExcelSelected(sourceClass = OilExtractionPlantImpl.class)
@ExcelProperty(index = 0, value = "采油厂名称") @ExcelProperty(index = 0, value = "采油厂名称")
private String ouName; private String ouName;
...@@ -30,12 +32,14 @@ public class ExcelWellheadTemplate implements Serializable { ...@@ -30,12 +32,14 @@ public class ExcelWellheadTemplate implements Serializable {
/** /**
* 井号 * 井号
*/ */
@NotBlank(message = "缺少井号")
@ExcelProperty(index = 1, value = "井号") @ExcelProperty(index = 1, value = "井号")
private String wellNumber; private String wellNumber;
/** /**
* 运行类型 * 运行类型
*/ */
@NotBlank(message = "缺少运行类型")
@ExcelSelected(sourceClass = RunTypeImpl.class) @ExcelSelected(sourceClass = RunTypeImpl.class)
@ExcelProperty(index = 2, value = "运行类型") @ExcelProperty(index = 2, value = "运行类型")
private String runTypeName; private String runTypeName;
...@@ -43,12 +47,16 @@ public class ExcelWellheadTemplate implements Serializable { ...@@ -43,12 +47,16 @@ public class ExcelWellheadTemplate implements Serializable {
/** /**
* 运行功率(KW) * 运行功率(KW)
*/ */
@NotBlank(message = "缺少运行功率")
@Min(value = 0, message = "运行功率为数字")
@ExcelProperty(index = 3, value = "运行功率(KW)") @ExcelProperty(index = 3, value = "运行功率(KW)")
private BigDecimal serviceRating; private String serviceRating;
/** /**
* 额定功率(KW) * 额定功率(KW)
*/ */
@NotBlank(message = "缺少额定功率")
@Min(value = 0, message = "额定功率为数字")
@ExcelProperty(index = 4, value = "额定功率(KW)") @ExcelProperty(index = 4, value = "额定功率(KW)")
private BigDecimal ratedPower; private String ratedPower;
} }
\ 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