Commit 24d64cbb authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;
4.开发井口配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
5.开发第三方有功功率历史数据导入接口,增加模板配置类,添加线上接口文档并完成接口冒烟测试;
6.开发给长庆使用的获取第三方认证token接口,验证获取token后是否能正常跳转指定页面,创建长庆用演示用户及角色;
7.开发柴发设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
8.开发储能设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
9.开发柴发设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
10.开发井口设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
11.开发光伏电站设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
12.开发储能设备配置导入接口,增加字段校验功能,并完成接口冒烟测试及接口文档;
13.基础信息配置模块,修改光伏电站分页查询列表接口,增加排序逻辑,按照组织机构名称和电站名称升序排序;
14.基础信息配置模块,修改光伏电站模板导出接口,修改导出逻辑,不只是导出模板,增加查询条件,按条件及模板格式导出当前页电站数据;
15.基础信息配置模块,修改井口配置分页查询列表接口,增加按井号模糊搜索逻辑,增加排序逻辑,按照组织机构名称和井号升序排序;
16.基础信息配置模块,修改井口模板导出接口,修改导出逻辑,不只是导出模板,增加查询条件,按条件及模板格式导出当前页井口数据;
17.基础信息配置模块,修改柴发设备分页查询列表接口,增加排序逻辑,按照组织机构名称和设备名称升序排序;
18.基础信息配置模块,修改柴发设备模板导出接口,修改导出逻辑,不只是导出模板,增加查询条件,按条件及模板格式导出当前页柴发设备数据;
19.基础信息配置模块,修改储能设备分页查询列表接口,增加排序逻辑,按照组织机构名称和设备名称升序排序;
20.基础信息配置模块,修改储能设备模板导出接口,修改导出逻辑,不只是导出模板,增加查询条件,按条件及模板格式导出当前页储能设备数据;
21.基础信息配置模块,修改基础线路分页查询列表接口,增加排序逻辑,按照组织机构名称和线路类型及线路名称升序排序;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 22c478df
...@@ -77,6 +77,13 @@ public class BasePowerLineView extends BaseModel implements Serializable { ...@@ -77,6 +77,13 @@ public class BasePowerLineView extends BaseModel implements Serializable {
@XText("井口数") @XText("井口数")
private Integer wellheadCount; private Integer wellheadCount;
/**
* 组织名称
*/
@XText("组织名称")
@TableField(exist = false)
private String ouName;
/** /**
* 组织ID集合 * 组织ID集合
*/ */
......
...@@ -259,7 +259,7 @@ public class BasePowerLineService { ...@@ -259,7 +259,7 @@ public class BasePowerLineService {
* @param input 输入 * @param input 输入
* @return {@link XPageResult}<{@link QueryBasePowerLineViewOutput}> * @return {@link XPageResult}<{@link QueryBasePowerLineViewOutput}>
*/ */
@XApiGet @XApiGet(anonymous = true)
@XText("输电线路配置--分页列表") @XText("输电线路配置--分页列表")
public XPageResult<QueryBasePowerLineViewOutput> queryBasePowerLineView(XContext context, QueryBasePowerLineViewInput input) { public XPageResult<QueryBasePowerLineViewOutput> queryBasePowerLineView(XContext context, QueryBasePowerLineViewInput input) {
BasePowerLineViewMapper mapper = context.getBean(BasePowerLineViewMapper.class); BasePowerLineViewMapper mapper = context.getBean(BasePowerLineViewMapper.class);
...@@ -270,19 +270,9 @@ public class BasePowerLineService { ...@@ -270,19 +270,9 @@ public class BasePowerLineService {
PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list); PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class); List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
if (CollUtil.isNotEmpty(outputs)) { if (CollUtil.isNotEmpty(outputs)) {
Map<String, String> ouMap = this.getOuMapByOuIds(
context,
outputs.stream()
.map(QueryBasePowerLineViewOutput::getOuId)
.distinct()
.collect(Collectors.toList())
);
Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE); Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE);
Map<String, String> lineTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.LINE_TYPE); Map<String, String> lineTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.LINE_TYPE);
for (QueryBasePowerLineViewOutput output : outputs) { for (QueryBasePowerLineViewOutput output : outputs) {
output.setOuName(
ouMap.get(output.getOuId())
);
output.setGridTypeName( output.setGridTypeName(
gridTypeMap.get(output.getGridTypeKey()) gridTypeMap.get(output.getGridTypeKey())
); );
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<result column="upper_line_name" property="upperLineName" jdbcType="VARCHAR"/> <result column="upper_line_name" property="upperLineName" jdbcType="VARCHAR"/>
<result column="policy_name" property="policyName" jdbcType="VARCHAR"/> <result column="policy_name" property="policyName" jdbcType="VARCHAR"/>
<result column="wellhead_count" property="wellheadCount" jdbcType="INTEGER"/> <result column="wellhead_count" property="wellheadCount" jdbcType="INTEGER"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="ExtendsResultMap"> <select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="ExtendsResultMap">
...@@ -57,24 +58,36 @@ ...@@ -57,24 +58,36 @@
id=#{id} id=#{id}
</select> </select>
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="BaseResultMap"> <select id="selectList" parameterType="pps.core.base.entity.BasePowerLineView" resultMap="ExtendsResultMap">
select select
<include refid="Base_Column_List"/> b.id,
, ( SELECT line_name FROM base_power_line l WHERE l.id = base_power_line.upper_line_id ) AS upper_line_name b.ou_id,
, ( SELECT COUNT( 1 ) FROM base_power_line_wellhead w WHERE base_power_line.id = w.line_id ) AS wellhead_count b.upper_line_id,
from base_power_line b.line_name,
b.grid_type_key,
b.line_type_key,
b.strategy_id,
b.is_share_dispatch,
b.is_reverse_dispatch,
b.start_interval,
( SELECT line_name FROM base_power_line l WHERE l.id = b.upper_line_id ) AS upper_line_name,
( SELECT COUNT( 1 ) FROM base_power_line_wellhead w WHERE b.id = w.line_id ) AS wellhead_count,
o.ou_name
from base_power_line b
LEFT JOIN sys_organization o ON b.ou_id = o.id
where where
is_deleted = 1 b.is_deleted = 1
AND ou_id in AND o.is_deleted = 1
AND b.ou_id in
<foreach collection="ouList" open="(" close=")" separator="," item="item"> <foreach collection="ouList" open="(" close=")" separator="," item="item">
#{item} #{item}
</foreach> </foreach>
<if test="lineName != null and lineName != ''"> <if test="lineName != null and lineName != ''">
AND line_name LIKE CONCAT( '%', #{lineName}, '%' ) AND b.line_name LIKE CONCAT( '%', #{lineName}, '%' )
</if> </if>
ORDER BY ORDER BY
ou_id DESC, o.ou_name ASC,
line_type_key ASC, b.line_type_key ASC,
line_name ASC b.line_name ASC
</select> </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