Skip to content

G
gf_back
Commit e28b3ecc authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 测试问题修复 

1.修改运维管理-组织机构管理模块,查询组织和线路列表接口sql查询逻辑,解决出现重复组织问题;
2.修改运维管理-组织机构管理模块,查询组织机构分页列表接口sql查询逻辑,解决出现重复组织问题;
3.修改运维管理-基础信息配置-井口配置模块,查询井口分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;
4.修改运维管理-基础信息配置-柴发设备配置模块,查询柴发设备分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;
5.修改运维管理-基础信息配置-储能设备配置模块,查询储能设备分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;
6.修改运维管理-基础信息配置-光伏电站配置模块,查询光伏电站分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 3ba8cf37
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 31 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java
View file @ e28b3ecc
......@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import pps.core.base.entity.BasePhotovoltaicPlantEnt;
import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.entity.BasePowerLinePlantEnt;
......@@ -126,20 +127,35 @@ public class BasePhotovoltaicPlantService {
return XSingleResult.success(output);
}
/**
* 分页查询
* GET /base/base-photovoltaic-plant/query-base-photovoltaic-plant
* 接口ID：105466277
* 接口地址：https://app.apifox.com/project/3196988/apis/api-105466277
*
* @param context 上下文
* @param input 输入
* @return {@link XPageResult}<{@link QueryBasePhotovoltaicPlantOutput}>
*/
@XText("分页查询")
@XApiAnonymous
@XApiGet
public XPageResult<QueryBasePhotovoltaicPlantOutput> queryBasePhotovoltaicPlant(XContext context, QueryBasePhotovoltaicPlantInput input) {
BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
String stationName = input.getStationName();
String excludeIdFlag = input.getExcludeIdFlag();
List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
if (StringUtils.equals(BusinessConstant.STRING_ONE, input.getExcludeIdFlag())) {
queryWrapper.lambda()
.notExists("SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1")
.eq(BasePhotovoltaicPlantEnt::getOuId, input.getOuId());
} else {
List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
queryWrapper.lambda()
.in(CollUtil.isNotEmpty(allListByOuId), BasePhotovoltaicPlantEnt::getOuId, allListByOuId);
}
queryWrapper.lambda()
.notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1")
.eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
.in(CollUtil.isNotEmpty(allListByOuId), BasePhotovoltaicPlantEnt::getOuId, allListByOuId)
.like(StrUtil.isNotEmpty(stationName), BasePhotovoltaicPlantEnt::getStationName, stationName)
.eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
.orderByDesc(BasePhotovoltaicPlantEnt::getModifyTime);
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);
}
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceInput.java
View file @ e28b3ecc
package pps.core.base.service.data.base_energy_storage_device;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
......@@ -16,6 +17,7 @@ import java.math.BigDecimal;
public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("组织机构name")
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantInput.java
View file @ e28b3ecc
package pps.core.base.service.data.base_photovoltaic_plant;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
/**
* 光伏电站
*
* @author ZWT
* @date 2023/09/25
*/
@Data
public class QueryBasePhotovoltaicPlantInput extends XPageInput {
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("电站名称")
......@@ -31,9 +40,10 @@ public class QueryBasePhotovoltaicPlantInput extends XPageInput {
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
@XText("排除已绑定线路标识")
private String excludeIdFlag;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantOutput.java
View file @ e28b3ecc
......@@ -2,36 +2,21 @@ package pps.core.base.service.data.base_photovoltaic_plant;
import lombok.Data;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
/**
* 光伏电站
*
* @author ZWT
* @date 2023/09/25
*/
@Data
public class QueryBasePhotovoltaicPlantOutput extends XPageInput {
public class QueryBasePhotovoltaicPlantOutput {
@XText("ID")
private String id;
@XText("是否删除(0_是;1_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("组织机构ID")
private String ouId;
......@@ -52,9 +37,10 @@ public class QueryBasePhotovoltaicPlantOutput extends XPageInput {
@XText("阵列朝向")
private BigDecimal arrayOrientation;
@XText("组织机构name")
private String ouName;
@XText("光伏设备规格型号name(字典获取)")
private String photovoltaicModelName;
}
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