Commit dd63e807 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.系统管理模块,查询线路及组织机构树接口修改,增加查询逻辑,通过线路名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
2.系统管理模块,查询光伏电站及组织机构树接口修改,增加查询逻辑,通过电站名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
3.基础信息配置模块,新增市电峰谷导入模板下载接口,完成接口冒烟测试并同步线上接口文档;
4.基础信息配置模块,市电峰谷模板下载接口修改,增加多选月份导出配置数据逻辑,修改线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 8675448d
package pps.core.base.service.data.base_excel; package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
...@@ -23,6 +24,7 @@ import java.io.Serializable; ...@@ -23,6 +24,7 @@ import java.io.Serializable;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ExcelIgnoreUnannotated
public class ExcelPriceStrategyTemplate implements Serializable { public class ExcelPriceStrategyTemplate implements Serializable {
private static final long serialVersionUID = -2929661573381767982L; private static final long serialVersionUID = -2929661573381767982L;
...@@ -30,6 +32,7 @@ public class ExcelPriceStrategyTemplate implements Serializable { ...@@ -30,6 +32,7 @@ public class ExcelPriceStrategyTemplate implements Serializable {
/** /**
* 时段类型 * 时段类型
*/ */
@Min(value = 1, message = "月份需大于0")
@NotBlank(message = "缺少月份") @NotBlank(message = "缺少月份")
@ExcelSelected(source = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"}) @ExcelSelected(source = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"})
@ExcelProperty(index = 0, value = "月份") @ExcelProperty(index = 0, value = "月份")
...@@ -65,4 +68,9 @@ public class ExcelPriceStrategyTemplate implements Serializable { ...@@ -65,4 +68,9 @@ public class ExcelPriceStrategyTemplate implements Serializable {
@Min(value = 0, message = "电价需大于0") @Min(value = 0, message = "电价需大于0")
@ExcelProperty(index = 4, value = "电价") @ExcelProperty(index = 4, value = "电价")
private String electrovalence; private String electrovalence;
/**
* 行号
*/
private Integer rowNum;
} }
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