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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEnergyStorageDeviceService.java

@@ -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.BaseEnergyStorageDeviceEnt;
 import pps.core.base.entity.BasePowerLineStorageEnt;
 import pps.core.base.enums.BusinessError;
@@ -110,22 +111,37 @@ public class BaseEnergyStorageDeviceService {
         return XSingleResult.success(output);
     }
 
+    /**
+     * 分页查询
+     * GET /base/base-energy-storage-device/query-base-energy-storage-device
+     * 接口ID：105602201
+     * 接口地址：https://app.apifox.com/project/3196988/apis/api-105602201
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XPageResult}<{@link QueryBaseEnergyStorageDeviceOutput}>
+     */
     @XText("分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseEnergyStorageDeviceOutput> queryBaseEnergyStorageDevice(XContext context, QueryBaseEnergyStorageDeviceInput input) {
         String ouName = input.getOuName();
         String deviceName = input.getDeviceName();
-        String excludeIdFlag = input.getExcludeIdFlag();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
-        List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.equals(BusinessConstant.STRING_ONE, input.getExcludeIdFlag())) {
+            queryWrapper.lambda()
+                    .notExists("SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1")
+                    .eq(BaseEnergyStorageDeviceEnt::getOuId, input.getOuId());
+        } else {
+            List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
+            queryWrapper.lambda()
+                    .in(CollUtil.isNotEmpty(allListByOuId), BaseEnergyStorageDeviceEnt::getOuId, allListByOuId);
+        }
         queryWrapper.lambda()
-                .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1")
-                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE)
-                .in(CollUtil.isNotEmpty(allListByOuId), BaseEnergyStorageDeviceEnt::getOuId, allListByOuId)
                 .like(StrUtil.isNotEmpty(ouName), BaseEnergyStorageDeviceEnt::getOuName, ouName)
                 .like(StrUtil.isNotEmpty(deviceName), BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, BusinessConstant.ONE)
                 .orderByDesc(BaseEnergyStorageDeviceEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEnergyStorageDeviceOutput.class);
     }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceInput.java

@@ -6,6 +6,12 @@ import xstartup.base.data.XPageInput;
 
 import java.math.BigDecimal;
 
+/**
+ * 储能设备
+ *
+ * @author ZWT
+ * @date 2023/09/25
+ */
 @Data
 public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
 
@@ -35,8 +41,7 @@ public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
 
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
+
     @XText("排除已绑定线路标识")
     private String excludeIdFlag;
-
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceOutput.java

@@ -3,36 +3,21 @@ package pps.core.base.service.data.base_energy_storage_device;
 import com.baomidou.mybatisplus.annotation.TableField;
 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 QueryBaseEnergyStorageDeviceOutput extends XPageInput {
+public class QueryBaseEnergyStorageDeviceOutput {
+
     @XText("ID")
     private String id;
 
-    @XText("是否删除(1_是;0_否)")
-    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;
 
@@ -67,5 +52,4 @@ public class QueryBaseEnergyStorageDeviceOutput extends XPageInput {
     @XText("额定放电效率")
     @TableField
     private BigDecimal ratedDischargeEfficiency;
-
 }