Merge remote-tracking branch 'origin/master'

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SysOrganizationCloudService.java

@@ -81,5 +81,8 @@ public interface SysOrganizationCloudService {
     @XText("根据组织机构名称获取组织机构id")
     XListResult<GetSysOrganizationViewOutput> selectOrganizationAllByOrganizationName(XContext context, GetSysOrganizationViewInput input);
 
+    @XText("根据组织机构id获取所有的子级组织机构列表")
+    XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input);
+
 }
 

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationCloudServiceImpl.java

@@ -385,4 +385,15 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         List<GetSysOrganizationViewOutput> viewList = XCopyUtils.copyNewList(list , GetSysOrganizationViewOutput.class);
         return XListResult.success(viewList);
     }
+
+    @Override
+    public XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input) {
+        SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
+        SysOrganizationView view = new SysOrganizationView();
+        view.setIsDeleted(1);
+        view.setId(input.getOuId());
+        List<SysOrganizationView> list = mapper.selectAllListByOuId(view);
+        List<GetSysOrganizationViewOutput> viewList = XCopyUtils.copyNewList(list , GetSysOrganizationViewOutput.class);
+        return XListResult.success(viewList);
+    }
 }

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

@@ -6,6 +6,7 @@ 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.entity.BaseWellheadEnt;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
 import pps.core.base.service.data.base_diesel_generator.*;
 import pps.core.base.utils.SessionSimulation;
@@ -32,7 +33,7 @@ import java.util.List;
  * @Date 2023/8/25
  **/
 @XService
-public class BaseDieselGeneratorService {
+public class BaseDieselGeneratorService extends BaseService {
     //todo 模拟登陆
     private final PpsUserSession session = SessionSimulation.getSession();
 
@@ -124,11 +125,12 @@ public class BaseDieselGeneratorService {
         String deviceName = input.getDeviceName();
         String excludeIdFlag = input.getExcludeIdFlag();
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
+        List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .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)
+                .in(CollUtil.isNotEmpty(allListByOuId), BaseDieselGeneratorEnt::getOuId, allListByOuId)
                 .like(StrUtil.isNotEmpty(ouName), BaseDieselGeneratorEnt::getOuName, ouName)
                 .like(StrUtil.isNotEmpty(deviceName), BaseDieselGeneratorEnt::getDeviceName, deviceName)
                 .orderByDesc(BaseDieselGeneratorEnt::getModifyTime);

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.QueryWrapper;
 import pps.core.base.constant.ScadaConstant;
+import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.entity.BaseEnergyStorageDeviceEnt;
 import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.mapper.BaseEnergyStorageDeviceMapper;
@@ -32,7 +33,7 @@ import java.util.List;
  * @Date 2023/8/25
  **/
 @XService
-public class BaseEnergyStorageDeviceService {
+public class BaseEnergyStorageDeviceService extends BaseService {
     //todo 模拟登陆
     private final PpsUserSession session = SessionSimulation.getSession();
 
@@ -124,11 +125,12 @@ public class BaseEnergyStorageDeviceService {
         String deviceName = input.getDeviceName();
         String excludeIdFlag = input.getExcludeIdFlag();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
+        List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .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)
+                .in(CollUtil.isNotEmpty(allListByOuId), BaseEnergyStorageDeviceEnt::getOuId, allListByOuId)
                 .like(StrUtil.isNotEmpty(ouName),BaseEnergyStorageDeviceEnt::getOuName, ouName)
                 .like(StrUtil.isNotEmpty(deviceName),BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
                 .orderByDesc(BaseEnergyStorageDeviceEnt::getModifyTime);

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import pps.core.base.constant.ScadaConstant;
+import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.entity.BasePhotovoltaicPlantView;
 import pps.core.base.entity.BaseWellheadEnt;
@@ -37,7 +38,7 @@ import java.util.List;
  * @Date 2023/8/24
  **/
 @XService
-public class BasePhotovoltaicPlantService {
+public class BasePhotovoltaicPlantService extends BaseService{
     //todo 模拟登陆
     private final PpsUserSession session = SessionSimulation.getSession();
 
@@ -125,11 +126,12 @@ public class BasePhotovoltaicPlantService {
         String stationName = input.getStationName();
         String ouId = input.getOuId();
         String excludeIdFlag = input.getExcludeIdFlag();
+        List<String> allListByOuId = this.getAllListByOuId(context, ouId);
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .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)
+                .in(CollUtil.isNotEmpty(allListByOuId), BasePhotovoltaicPlantEnt::getOuId, allListByOuId)
                 .like(StrUtil.isNotEmpty(stationName),BasePhotovoltaicPlantEnt::getStationName,stationName )
                 .orderByDesc(BasePhotovoltaicPlantEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);

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

+package pps.core.base.service;
+
+import pps.cloud.system.service.SysOrganizationCloudService;
+import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import xstartup.base.XContext;
+import xstartup.data.XListResult;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description
+ * @Author luoxiangyang
+ * @Date 2023/8/31 14:13
+ **/
+public class BaseService {
+    /**
+     * 根据ouid获取所有子集的ouid
+     * @param context
+     * @param ouId
+     * @return
+     */
+    public  List<String> getAllListByOuId(XContext context,String ouId){
+        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
+        GetAllOuListByOuIdInput ouIdInput=new GetAllOuListByOuIdInput();
+        ouIdInput.setOuId(ouId);
+        XListResult<GetSysOrganizationViewOutput> allListByOuId = organizationCloudService.getAllListByOuId(context, ouIdInput);
+        allListByOuId.throwIfFail();
+        List<GetSysOrganizationViewOutput> listByOuIdResult = allListByOuId.getResult();
+        return listByOuIdResult.stream().map(GetSysOrganizationViewOutput::getId).collect(Collectors.toList());
+    }
+}

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

@@ -2,6 +2,9 @@ package pps.core.base.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import pps.cloud.system.service.SysOrganizationCloudService;
+import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
 import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseWellheadEnt;
 import pps.core.base.mapper.BaseWellheadMapper;
@@ -12,6 +15,7 @@ import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
@@ -23,6 +27,7 @@ import xstartup.feature.mybatis.helper.XMapperHelper;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author luoxiangyang
@@ -30,7 +35,7 @@ import java.util.List;
  * @Date 2023/8/24
  **/
 @XService
-public class BaseWellheadService {
+public class BaseWellheadService extends BaseService {
     //todo 模拟登陆
     private final PpsUserSession session = SessionSimulation.getSession();
 
@@ -119,10 +124,11 @@ public class BaseWellheadService {
         String excludeIdFlag = input.getExcludeIdFlag();
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
+        List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
         queryWrapper.lambda()
                 .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())
+                .in(CollUtil.isNotEmpty(allListByOuId),BaseWellheadEnt::getOuId, allListByOuId)
                 .orderByDesc(BaseWellheadEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseWellheadOutput.class);
     }