Commit 7d8d0e9e authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 98203dca
...@@ -7,6 +7,7 @@ import xstartup.annotation.XText; ...@@ -7,6 +7,7 @@ import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* 市电峰谷当月明细配置 * 市电峰谷当月明细配置
...@@ -44,4 +45,8 @@ public class BasePriceStrategyDetailView extends BaseModel implements Serializab ...@@ -44,4 +45,8 @@ public class BasePriceStrategyDetailView extends BaseModel implements Serializab
@XText("内部结算价") @XText("内部结算价")
@TableField @TableField
private BigDecimal internalSettlementPrice; private BigDecimal internalSettlementPrice;
@XText("月份")
@TableField(exist = false)
private List<String> monthList;
} }
...@@ -25,4 +25,12 @@ public interface BasePriceStrategyDetailViewMapper { ...@@ -25,4 +25,12 @@ public interface BasePriceStrategyDetailViewMapper {
* @return int * @return int
*/ */
int batchInsertList(@Param(value = "list") List<BasePriceStrategyDetailView> list); int batchInsertList(@Param(value = "list") List<BasePriceStrategyDetailView> list);
/**
* 查询详情列表
*
* @param record 记录
* @return {@link List }<{@link BasePriceStrategyDetailView }>
*/
List<BasePriceStrategyDetailView> selectDetailList(BasePriceStrategyDetailView record);
} }
...@@ -20,6 +20,7 @@ import pps.core.base.service.data.base_energy_storage_device.QueryBaseEnergyStor ...@@ -20,6 +20,7 @@ import pps.core.base.service.data.base_energy_storage_device.QueryBaseEnergyStor
import pps.core.base.service.data.base_excel.*; import pps.core.base.service.data.base_excel.*;
import pps.core.base.service.data.base_photovoltaic_plant.QueryBasePhotovoltaicPlantInput; import pps.core.base.service.data.base_photovoltaic_plant.QueryBasePhotovoltaicPlantInput;
import pps.core.base.service.data.base_photovoltaic_plant.QueryBasePhotovoltaicPlantOutput; import pps.core.base.service.data.base_photovoltaic_plant.QueryBasePhotovoltaicPlantOutput;
import pps.core.base.service.data.base_price_strategy.GetBasePriceStrategyViewInput;
import pps.core.base.service.data.base_wellhead.QueryBaseWellheadInput; import pps.core.base.service.data.base_wellhead.QueryBaseWellheadInput;
import pps.core.base.service.data.base_wellhead.QueryBaseWellheadOutput; import pps.core.base.service.data.base_wellhead.QueryBaseWellheadOutput;
import pps.core.base.service.data.excel.ImportExcelInput; import pps.core.base.service.data.excel.ImportExcelInput;
...@@ -282,8 +283,19 @@ public class ExcelService { ...@@ -282,8 +283,19 @@ public class ExcelService {
* @return {@link XFileResult } * @return {@link XFileResult }
*/ */
@XText("市电峰谷配置导出") @XText("市电峰谷配置导出")
@XApiGet @XApiGet(anonymous = true)
public XFileResult exportPriceStrategy(XContext context) { public XFileResult exportPriceStrategy(XContext context, GetBasePriceStrategyViewInput input) {
String strategyId = input.getId();
if (CharSequenceUtil.isNotBlank(strategyId)) {
BasePriceStrategyDetailView view = new BasePriceStrategyDetailView();
view.setStrategyId(strategyId);
String month = input.getMonth();
if (CharSequenceUtil.isNotBlank(month)) {
view.setMonthList(CharSequenceUtil.splitTrim(month, ","));
}
BasePriceStrategyDetailViewMapper mapper = context.getBean(BasePriceStrategyDetailViewMapper.class);
List<BasePriceStrategyDetailView> list = mapper.selectDetailList(view);
}
String fileSavePath = XStorageTool.getAbsolutePath("/temp/excel/市电峰谷配置模板.xlsx"); String fileSavePath = XStorageTool.getAbsolutePath("/temp/excel/市电峰谷配置模板.xlsx");
//生成模板 //生成模板
EasyExcelFactory.write(FileUtil.touch(fileSavePath)) EasyExcelFactory.write(FileUtil.touch(fileSavePath))
......
package pps.core.base.service.data.base_price_strategy;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 市电峰谷配置入参
*
* @author ZWT
* @date 2024/05/13
*/
@Data
public class GetBasePriceStrategyViewInput {
@XText("ID")
private String id;
@XText("月份(多选','拼接)")
private String month;
}
...@@ -88,4 +88,27 @@ ...@@ -88,4 +88,27 @@
) )
</foreach> </foreach>
</insert> </insert>
<select id="selectDetailList" parameterType="pps.core.base.entity.BasePriceStrategyDetailView"
resultMap="BaseResultMap">
SELECT d.strategy_month,
d.period_type_key,
d.start_time,
d.end_time,
d.electrovalence
FROM base_price_strategy_month m
LEFT JOIN base_price_strategy_detail d ON m.strategy_month = d.strategy_month
AND m.strategy_id = d.strategy_id
WHERE m.is_deleted = 1
AND d.is_deleted = 1
AND m.strategy_id = #{strategyId}
<if test="monthList != null and monthList.size() > 0">
AND m.strategy_month IN
<foreach collection="monthList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
ORDER BY CAST(m.strategy_month AS SIGNED INTEGER),
d.start_time
</select>
</mapper> </mapper>
\ 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