Merge remote-tracking branch 'origin/master'

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

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseDieselGeneratorEnt;
+import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
 import pps.core.base.service.data.base_diesel_generator.*;
 import pps.core.base.utils.SessionSimulation;
@@ -22,6 +24,7 @@ import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author luoxiangyang
@@ -119,9 +122,11 @@ public class BaseDieselGeneratorService {
         String ouId = input.getOuId();
         String ouName = input.getOuName();
         String deviceName = input.getDeviceName();
+        List<String> excludeIds = input.getExcludeIds();
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
+                .notIn(CollUtil.isNotEmpty(excludeIds), BaseDieselGeneratorEnt::getId,excludeIds)
                 .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

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseEnergyStorageDeviceEnt;
+import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.mapper.BaseEnergyStorageDeviceMapper;
 import pps.core.base.service.data.base_energy_storage_device.*;
 import pps.core.base.utils.SessionSimulation;
@@ -22,6 +24,7 @@ import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author luoxiangyang
@@ -119,9 +122,11 @@ public class BaseEnergyStorageDeviceService {
         String ouId = input.getOuId();
         String ouName = input.getOuName();
         String deviceName = input.getDeviceName();
+        List<String> excludeIds = input.getExcludeIds();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
+                .notIn(CollUtil.isNotEmpty(excludeIds), BaseEnergyStorageDeviceEnt::getId,excludeIds)
                 .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

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -123,8 +124,10 @@ public class BasePhotovoltaicPlantService {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         String stationName = input.getStationName();
         String ouId = input.getOuId();
+        List<String> excludeIds = input.getExcludeIds();
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
+                .notIn(CollUtil.isNotEmpty(excludeIds),BasePhotovoltaicPlantEnt::getId,excludeIds)
                 .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

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseWellheadEnt;
@@ -21,6 +22,7 @@ import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author luoxiangyang
@@ -114,9 +116,11 @@ public class BaseWellheadService {
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
+        List<String> excludeIds = input.getExcludeIds();
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
+                .notIn(CollUtil.isNotEmpty(excludeIds),BaseWellheadEnt::getId,excludeIds)
                 .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

@@ -4,6 +4,8 @@ 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 {
@@ -32,4 +34,7 @@ public class QueryBaseDieselGeneratorInput extends XPageInput {
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
+    @XText("排除id集合")
+    private List<String> excludeIds;
+
 }

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

@@ -4,6 +4,8 @@ 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 {
@@ -34,6 +36,8 @@ public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
 
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
+    @XText("排除id集合")
+    private List<String> excludeIds;
 
 
 }

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

@@ -4,6 +4,8 @@ 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 QueryBasePhotovoltaicPlantInput extends XPageInput {
@@ -33,5 +35,7 @@ public class QueryBasePhotovoltaicPlantInput extends XPageInput {
     private String ouName;
     @XText("光伏设备规格型号name(字典获取)")
     private String photovoltaicModelName;
+    @XText("排除id集合")
+    private List<String> excludeIds;
 
 }

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

 package pps.core.base.service.data.base_wellhead;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-import xstartup.base.data.XPageInput;
+import java.util.List;
 
+import xstartup.base.data.XPageInput;
+@Data
 public class QueryBaseWellheadInput extends XPageInput {
 
 
@@ -24,52 +27,7 @@ public class QueryBaseWellheadInput extends XPageInput {
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
 
+    @XText("排除id集合")
+    private List<String> excludeIds;
 
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public String getRunTypeKey() {
-        return this.runTypeKey;
-    }
-
-    public void setRunTypeKey(String value) {
-        this.runTypeKey = value;
-    }
-
-    public BigDecimal getServiceRating() {
-        return this.serviceRating;
-    }
-
-    public void setServiceRating(BigDecimal value) {
-        this.serviceRating = value;
-    }
-
-    public String getOuName() {
-        return ouName;
-    }
-
-    public void setOuName(String ouName) {
-        this.ouName = ouName;
-    }
-
-    public String getRunTypeName() {
-        return runTypeName;
-    }
-
-    public void setRunTypeName(String runTypeName) {
-        this.runTypeName = runTypeName;
-    }
 }