柴发设备配置,储能设备配置 增加排除已绑定路线标识

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

@@ -122,11 +122,11 @@ public class BaseDieselGeneratorService {
         String ouId = input.getOuId();
         String ouName = input.getOuName();
         String deviceName = input.getDeviceName();
-        List<String> excludeIds = input.getExcludeIds();
+        String excludeIdFlag = input.getExcludeIdFlag();
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
-                .notIn(CollUtil.isNotEmpty(excludeIds), BaseDieselGeneratorEnt::getId,excludeIds)
+                .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_diesel w WHERE w.ou_id = {0} AND base_diesel_generator.id = w.diesel_id", input.getOuId())
                 .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
                 .eq(StrUtil.isNotEmpty(ouId), BaseDieselGeneratorEnt::getOuId, ouId)
                 .like(StrUtil.isNotEmpty(ouName), BaseDieselGeneratorEnt::getOuName, ouName)

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

@@ -122,11 +122,11 @@ public class BaseEnergyStorageDeviceService {
         String ouId = input.getOuId();
         String ouName = input.getOuName();
         String deviceName = input.getDeviceName();
-        List<String> excludeIds = input.getExcludeIds();
+        String excludeIdFlag = input.getExcludeIdFlag();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
-                .notIn(CollUtil.isNotEmpty(excludeIds), BaseEnergyStorageDeviceEnt::getId,excludeIds)
+                .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_storage w WHERE w.ou_id = {0} AND base_energy_storage_device.id = w.storage_id", input.getOuId())
                 .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
                 .eq(StrUtil.isNotEmpty(ouId),BaseEnergyStorageDeviceEnt::getOuId, ouId)
                 .like(StrUtil.isNotEmpty(ouName),BaseEnergyStorageDeviceEnt::getOuName, ouName)

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

@@ -124,10 +124,10 @@ public class BasePhotovoltaicPlantService {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         String stationName = input.getStationName();
         String ouId = input.getOuId();
-        List<String> excludeIds = input.getExcludeIds();
+        String excludeIdFlag = input.getExcludeIdFlag();
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
-                .notIn(CollUtil.isNotEmpty(excludeIds),BasePhotovoltaicPlantEnt::getId,excludeIds)
+                .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_plant w WHERE w.ou_id = {0} AND base_photovoltaic_plant.id = w.plant_id", input.getOuId())
                 .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
                 .eq(StrUtil.isNotEmpty(ouId),BasePhotovoltaicPlantEnt::getOuId, ouId)
                 .like(StrUtil.isNotEmpty(stationName),BasePhotovoltaicPlantEnt::getStationName,stationName )

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

@@ -116,11 +116,11 @@ public class BaseWellheadService {
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
-        List<String> excludeIds = input.getExcludeIds();
+        String excludeIdFlag = input.getExcludeIdFlag();
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
-                .notIn(CollUtil.isNotEmpty(excludeIds),BaseWellheadEnt::getId,excludeIds)
+                .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_wellhead w WHERE w.ou_id = {0} AND base_wellhead.id = w.wellhead_id", input.getOuId())
                 .eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
                 .eq(BaseWellheadEnt::getOuId, input.getOuId())
                 .orderByDesc(BaseWellheadEnt::getModifyTime);

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/QueryBaseDieselGeneratorInput.java

@@ -2,11 +2,13 @@ package pps.core.base.service.data.base_diesel_generator;
 
 import lombok.Data;
 import xstartup.annotation.XText;
+
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
 
 import xstartup.base.data.XPageInput;
+
 @Data
 public class QueryBaseDieselGeneratorInput extends XPageInput {
 
@@ -34,7 +36,7 @@ public class QueryBaseDieselGeneratorInput extends XPageInput {
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    @XText("排除id集合")
-    private List<String> excludeIds;
+    @XText("排除已绑定线路标识")
+    private String excludeIdFlag;
 
 }

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

@@ -2,11 +2,13 @@ package pps.core.base.service.data.base_energy_storage_device;
 
 import lombok.Data;
 import xstartup.annotation.XText;
+
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
 
 import xstartup.base.data.XPageInput;
+
 @Data
 public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
 
@@ -36,8 +38,8 @@ public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
 
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
-    @XText("排除id集合")
-    private List<String> excludeIds;
+    @XText("排除已绑定线路标识")
+    private String excludeIdFlag;
 
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantInput.java

@@ -35,7 +35,7 @@ public class QueryBasePhotovoltaicPlantInput extends XPageInput {
     private String ouName;
     @XText("光伏设备规格型号name(字典获取)")
     private String photovoltaicModelName;
-    @XText("排除id集合")
-    private List<String> excludeIds;
+    @XText("排除已绑定线路标识")
+    private String excludeIdFlag;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadInput.java

@@ -27,7 +27,7 @@ public class QueryBaseWellheadInput extends XPageInput {
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
 
-    @XText("排除id集合")
-    private List<String> excludeIds;
+    @XText("排除已绑定线路标识")
+    private String excludeIdFlag;
 
 }