Commit a970feea authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent da7557c4
...@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime; ...@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.EasyExcelFactory;
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.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;
...@@ -118,7 +117,6 @@ public class ExcelService { ...@@ -118,7 +117,6 @@ public class ExcelService {
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
.registerWriteHandler(ExcelStyleTool.getStyleStrategy()) .registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.registerWriteHandler(new CascadeWriteHandler(provNameList, siteMap)) .registerWriteHandler(new CascadeWriteHandler(provNameList, siteMap))
.autoCloseStream(Boolean.TRUE) .autoCloseStream(Boolean.TRUE)
.build() .build()
...@@ -165,7 +163,6 @@ public class ExcelService { ...@@ -165,7 +163,6 @@ public class ExcelService {
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
.registerWriteHandler(ExcelStyleTool.getStyleStrategy()) .registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.autoCloseStream(Boolean.TRUE) .autoCloseStream(Boolean.TRUE)
.build() .build()
.write(list, .write(list,
...@@ -212,7 +209,6 @@ public class ExcelService { ...@@ -212,7 +209,6 @@ public class ExcelService {
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
.registerWriteHandler(ExcelStyleTool.getStyleStrategy()) .registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.autoCloseStream(Boolean.TRUE) .autoCloseStream(Boolean.TRUE)
.build() .build()
.write(list, .write(list,
...@@ -262,7 +258,6 @@ public class ExcelService { ...@@ -262,7 +258,6 @@ public class ExcelService {
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
.registerWriteHandler(ExcelStyleTool.getStyleStrategy()) .registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.autoCloseStream(Boolean.TRUE) .autoCloseStream(Boolean.TRUE)
.build() .build()
.write(list, .write(list,
...@@ -315,7 +310,6 @@ public class ExcelService { ...@@ -315,7 +310,6 @@ public class ExcelService {
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
.registerWriteHandler(ExcelStyleTool.getStyleStrategy()) .registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.autoCloseStream(Boolean.TRUE) .autoCloseStream(Boolean.TRUE)
.build() .build()
.write(list, .write(list,
......
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 com.alibaba.excel.annotation.write.style.ColumnWidth;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -22,6 +23,7 @@ import java.io.Serializable; ...@@ -22,6 +23,7 @@ import java.io.Serializable;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ColumnWidth(value = 25)
public class ExcelDieselGeneratorTemplate implements Serializable { public class ExcelDieselGeneratorTemplate implements Serializable {
private static final long serialVersionUID = -6773651457799858074L; private static final long serialVersionUID = -6773651457799858074L;
......
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 com.alibaba.excel.annotation.write.style.ColumnWidth;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -22,6 +23,7 @@ import java.io.Serializable; ...@@ -22,6 +23,7 @@ import java.io.Serializable;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ColumnWidth(value = 25)
public class ExcelEnergyStorageDeviceTemplate implements Serializable { public class ExcelEnergyStorageDeviceTemplate implements Serializable {
private static final long serialVersionUID = -6239358694782042550L; private static final long serialVersionUID = -6239358694782042550L;
......
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 com.alibaba.excel.annotation.write.style.ColumnWidth;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -22,6 +23,7 @@ import java.io.Serializable; ...@@ -22,6 +23,7 @@ import java.io.Serializable;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ColumnWidth(value = 25)
public class ExcelPhotovoltaicPlantTemplate implements Serializable { public class ExcelPhotovoltaicPlantTemplate implements Serializable {
private static final long serialVersionUID = -9069694443646671657L; private static final long serialVersionUID = -9069694443646671657L;
......
...@@ -3,6 +3,7 @@ package pps.core.base.service.data.base_excel; ...@@ -3,6 +3,7 @@ package pps.core.base.service.data.base_excel;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -26,6 +27,7 @@ import java.io.Serializable; ...@@ -26,6 +27,7 @@ import java.io.Serializable;
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ColumnWidth(value = 25)
public class ExcelPriceStrategyTemplate implements Serializable { public class ExcelPriceStrategyTemplate implements Serializable {
private static final long serialVersionUID = -2929661573381767982L; private static final long serialVersionUID = -2929661573381767982L;
......
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 com.alibaba.excel.annotation.write.style.ColumnWidth;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -23,6 +24,7 @@ import java.io.Serializable; ...@@ -23,6 +24,7 @@ import java.io.Serializable;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ColumnWidth(value = 25)
public class ExcelWellheadTemplate implements Serializable { public class ExcelWellheadTemplate implements Serializable {
private static final long serialVersionUID = -6773651457799858074L; private static final long serialVersionUID = -6773651457799858074L;
......
...@@ -7,7 +7,6 @@ import cn.hutool.core.date.DateUtil; ...@@ -7,7 +7,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.common.excel.util.EasyExcelUtil; import pps.core.common.excel.util.EasyExcelUtil;
import pps.core.common.excel.util.ExcelStyleTool; import pps.core.common.excel.util.ExcelStyleTool;
...@@ -58,7 +57,6 @@ public class ExcelService { ...@@ -58,7 +57,6 @@ public class ExcelService {
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
.registerWriteHandler(ExcelStyleTool.getStyleStrategy()) .registerWriteHandler(ExcelStyleTool.getStyleStrategy())
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.autoCloseStream(Boolean.TRUE) .autoCloseStream(Boolean.TRUE)
.build() .build()
.write(Collections.emptyList(), .write(Collections.emptyList(),
......
...@@ -3,6 +3,7 @@ package pps.core.space.service.data.base_excel; ...@@ -3,6 +3,7 @@ package pps.core.space.service.data.base_excel;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -24,6 +25,7 @@ import java.io.Serializable; ...@@ -24,6 +25,7 @@ import java.io.Serializable;
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ColumnWidth(value = 25)
public class ExcelSpaceOptimizeTemplate implements Serializable { public class ExcelSpaceOptimizeTemplate implements Serializable {
private static final long serialVersionUID = 2852207213902479260L; private static final long serialVersionUID = 2852207213902479260L;
......
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